diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4d39b7245..8c83aeb4a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1214,7 +1214,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1234,7 +1235,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1254,7 +1256,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1274,7 +1277,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1294,7 +1298,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1325,7 +1330,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1345,7 +1351,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1365,7 +1372,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1632,7 +1640,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
@@ -1671,7 +1680,11 @@
                 "highway": "footway"
             }
         },
-        "icon": "highway-footway"
+        "icon": "highway-footway",
+        "form": [
+            "access",
+            "surface"
+        ]
     },
     {
         "name": "cycle path",
@@ -1690,7 +1703,8 @@
             "bridge",
             "tunnel",
             "access",
-            "maxspeed"
+            "maxspeed",
+            "surface"
         ]
     },
     {
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index abb24dfe3..b13fc577c 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 6de986292..780485ad0 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -34,5 +34,9 @@
             "highway": "footway"
         }
     },
-    "icon": "highway-footway"
+    "icon": "highway-footway",
+    "form": [
+        "access",
+        "surface"
+    ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index a3a946122..79bbf8158 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index c0ae439e6..bb209404a 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index 6b97512ca..a1d93f3f5 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index 678029e98..4194fd4d2 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
index 77996d64d..04d698dec 100644
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 2a4f26bd4..279e0101c 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -20,6 +20,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
index ead60bb48..8105129c9 100644
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index 53450f873..d5073aa85 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index d6bfbadac..5da52aae0 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -15,6 +15,7 @@
         "bridge",
         "tunnel",
         "access",
-        "maxspeed"
+        "maxspeed",
+        "surface"
     ]
 }
\ No newline at end of file