diff --git a/data/presets.yaml b/data/presets.yaml
index 55fa6579c..a16761a27 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1934,13 +1934,13 @@ en:
         terms: "<translate with synonyms or related terms for 'Entrance/Exit', separated by commas>"
       footway/crossing:
         # 'highway=footway, footway=crossing'
-        name: Crossing
-        terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
+        name: Street Crossing
+        terms: "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
       footway/crosswalk:
         # 'highway=footway, footway=crossing, crossing=zebra'
-        name: Crosswalk
+        name: Pedestrian Crosswalk
         # 'terms: zebra crossing'
-        terms: "<translate with synonyms or related terms for 'Crosswalk', separated by commas>"
+        terms: "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
       footway/sidewalk:
         # 'highway=footway, footway=sidewalk'
         name: Sidewalk
@@ -2003,13 +2003,13 @@ en:
         terms: "<translate with synonyms or related terms for 'Indoor Corridor', separated by commas>"
       highway/crossing:
         # highway=crossing
-        name: Crossing
-        terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
+        name: Street Crossing
+        terms: "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
       highway/crosswalk:
         # 'highway=crossing, crossing=zebra'
-        name: Crosswalk
+        name: Pedestrian Crosswalk
         # 'terms: zebra crossing'
-        terms: "<translate with synonyms or related terms for 'Crosswalk', separated by commas>"
+        terms: "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
       highway/cycleway:
         # highway=cycleway
         name: Cycle Path
@@ -2048,8 +2048,8 @@ en:
         terms: "<translate with synonyms or related terms for 'Path', separated by commas>"
       highway/pedestrian:
         # highway=pedestrian
-        name: Pedestrian
-        terms: "<translate with synonyms or related terms for 'Pedestrian', separated by commas>"
+        name: Pedestrian Street
+        terms: "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
       highway/primary:
         # highway=primary
         name: Primary Road
@@ -2833,9 +2833,9 @@ en:
         terms: "<translate with synonyms or related terms for 'Railway Halt', separated by commas>"
       railway/level_crossing:
         # railway=level_crossing
-        name: Level Crossing
-        # 'terms: crossing,railroad crossing,railway crossing,grade crossing,road through railroad,train crossing'
-        terms: "<translate with synonyms or related terms for 'Level Crossing', separated by commas>"
+        name: Railway Crossing
+        # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
+        terms: "<translate with synonyms or related terms for 'Railway Crossing', separated by commas>"
       railway/monorail:
         # railway=monorail
         name: Monorail
diff --git a/data/presets/categories.json b/data/presets/categories.json
index cc8e3d7b6..84954b11f 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -48,6 +48,7 @@
         "name": "Path",
         "icon": "category-path",
         "members": [
+            "highway/pedestrian",
             "highway/footway",
             "highway/cycleway",
             "highway/bridleway",
diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json
index b8c07c390..a1b30297d 100644
--- a/data/presets/categories/path.json
+++ b/data/presets/categories/path.json
@@ -3,10 +3,11 @@
     "name": "Path",
     "icon": "category-path",
     "members": [
+        "highway/pedestrian",
         "highway/footway",
         "highway/cycleway",
         "highway/bridleway",
         "highway/path",
         "highway/steps"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index 5954b3db1..10267672a 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -32,6 +32,7 @@
     ],
     "vertex": [
         "highway/crosswalk",
+        "highway/crossing",
         "railway/level_crossing",
         "highway/traffic_signals",
         "highway/turning_circle",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a249ca310..e7b72bce9 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3645,9 +3645,10 @@
             "footway": "crossing"
         },
         "terms": [],
-        "name": "Crossing"
+        "name": "Street Crossing"
     },
     "footway/crosswalk": {
+        "icon": "highway-footway",
         "fields": [
             "crossing",
             "access",
@@ -3666,7 +3667,7 @@
         "terms": [
             "zebra crossing"
         ],
-        "name": "Crosswalk"
+        "name": "Pedestrian Crosswalk"
     },
     "footway/sidewalk": {
         "fields": [
@@ -3884,7 +3885,7 @@
             "highway": "crossing"
         },
         "terms": [],
-        "name": "Crossing"
+        "name": "Street Crossing"
     },
     "highway/crosswalk": {
         "fields": [
@@ -3902,7 +3903,7 @@
         "terms": [
             "zebra crossing"
         ],
-        "name": "Crosswalk"
+        "name": "Pedestrian Crosswalk"
     },
     "highway/cycleway": {
         "icon": "highway-cycleway",
@@ -4091,7 +4092,7 @@
             "highway": "pedestrian"
         },
         "terms": [],
-        "name": "Pedestrian"
+        "name": "Pedestrian Street"
     },
     "highway/primary": {
         "icon": "highway-primary",
@@ -6939,12 +6940,12 @@
         "terms": [
             "crossing",
             "railroad crossing",
-            "railway crossing",
+            "level crossing",
             "grade crossing",
             "road through railroad",
             "train crossing"
         ],
-        "name": "Level Crossing"
+        "name": "Railway Crossing"
     },
     "railway/monorail": {
         "icon": "railway-monorail",
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json
index fa24d94e3..6c5175e8b 100644
--- a/data/presets/presets/footway/crossing.json
+++ b/data/presets/presets/footway/crossing.json
@@ -14,5 +14,5 @@
         "footway": "crossing"
     },
     "terms": [],
-    "name": "Crossing"
+    "name": "Street Crossing"
 }
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index 6ab330cb0..5f0a348b3 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -1,4 +1,5 @@
 {
+    "icon": "highway-footway",
     "fields": [
         "crossing",
         "access",
@@ -17,5 +18,5 @@
     "terms": [
         "zebra crossing"
     ],
-    "name": "Crosswalk"
+    "name": "Pedestrian Crosswalk"
 }
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index f25e507e8..cd72f6eba 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -11,5 +11,5 @@
         "highway": "crossing"
     },
     "terms": [],
-    "name": "Crossing"
+    "name": "Street Crossing"
 }
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 2ac45ff82..1ab1960e5 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -14,5 +14,5 @@
     "terms": [
         "zebra crossing"
     ],
-    "name": "Crosswalk"
+    "name": "Pedestrian Crosswalk"
 }
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian.json
index 8b2a6c5e8..3fd75fda8 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian.json
@@ -16,5 +16,5 @@
         "highway": "pedestrian"
     },
     "terms": [],
-    "name": "Pedestrian"
+    "name": "Pedestrian Street"
 }
diff --git a/data/presets/presets/railway/level_crossing.json b/data/presets/presets/railway/level_crossing.json
index 983cb2efe..34bb11149 100644
--- a/data/presets/presets/railway/level_crossing.json
+++ b/data/presets/presets/railway/level_crossing.json
@@ -9,10 +9,10 @@
     "terms": [
         "crossing",
         "railroad crossing",
-        "railway crossing",
+        "level crossing",
         "grade crossing",
         "road through railroad",
         "train crossing"
     ],
-    "name": "Level Crossing"
-}
\ No newline at end of file
+    "name": "Railway Crossing"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fd668ee9c..a1825326a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2256,11 +2256,11 @@
                 "terms": ""
             },
             "footway/crossing": {
-                "name": "Crossing",
+                "name": "Street Crossing",
                 "terms": ""
             },
             "footway/crosswalk": {
-                "name": "Crosswalk",
+                "name": "Pedestrian Crosswalk",
                 "terms": "zebra crossing"
             },
             "footway/sidewalk": {
@@ -2320,11 +2320,11 @@
                 "terms": "indoor"
             },
             "highway/crossing": {
-                "name": "Crossing",
+                "name": "Street Crossing",
                 "terms": ""
             },
             "highway/crosswalk": {
-                "name": "Crosswalk",
+                "name": "Pedestrian Crosswalk",
                 "terms": "zebra crossing"
             },
             "highway/cycleway": {
@@ -2360,7 +2360,7 @@
                 "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/pedestrian": {
-                "name": "Pedestrian",
+                "name": "Pedestrian Street",
                 "terms": ""
             },
             "highway/primary": {
@@ -3096,8 +3096,8 @@
                 "terms": "break,interrupt,rest,wait,interruption"
             },
             "railway/level_crossing": {
-                "name": "Level Crossing",
-                "terms": "crossing,railroad crossing,railway crossing,grade crossing,road through railroad,train crossing"
+                "name": "Railway Crossing",
+                "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
             },
             "railway/monorail": {
                 "name": "Monorail",