diff --git a/data/presets.yaml b/data/presets.yaml
index 850192a27..bfd737edf 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5000,13 +5000,18 @@ en:
       highway/cycleway/crossing:
         # cycleway=crossing
         name: Cycle Crossing
+      highway/cycleway/crossing/bicycle_foot:
+        # 'highway=cycleway, cycleway=crossing, foot=designated'
+        name: Cycle & Foot Crossing
+        # 'terms: bicycle and foot crosswalk,bike and pedestrian crossing,cycleway,cycling,cyclist'
+        terms: '<translate with synonyms or related terms for ''Cycle & Foot Crossing'', separated by commas>'
       highway/cycleway/crossing/marked:
-        # 'cycleway=crossing, crossing=marked'
+        # 'highway=cycleway, cycleway=crossing, crossing=marked'
         name: Marked Cycle Crossing
         # 'terms: cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
         terms: '<translate with synonyms or related terms for ''Marked Cycle Crossing'', separated by commas>'
       highway/cycleway/crossing/unmarked:
-        # 'cycleway=crossing, crossing=unmarked'
+        # 'highway=cycleway, cycleway=crossing, crossing=unmarked'
         name: Unmarked Cycle Crossing
         # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
         terms: '<translate with synonyms or related terms for ''Unmarked Cycle Crossing'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4357d3894..be991f4b5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -506,9 +506,10 @@
   "highway/crossing/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "crossing", "crossing": "unmarked"}, "reference": {"key": "crossing", "value": "unmarked"}, "terms": [], "name": "Unmarked Crossing"},
   "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bicyle path", "bike path", "cycling path"], "name": "Cycle Path"},
   "highway/cycleway/crossing": {"icon": "temaki-cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing"}, "addTags": {"highway": "cycleway", "cycleway": "crossing"}, "reference": {"key": "cycleway", "value": "crossing"}, "searchable": false, "matchScore": 0.95, "name": "Cycle Crossing"},
-  "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr", "lt", "pl"], "icon": "temaki-pedestrian_and_cyclist", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "fields": ["name", "segregated", "oneway", "surface", "width", "structure", "access", "incline"], "matchScore": 0.9, "name": "Cycle & Foot Path"},
-  "highway/cycleway/crossing/marked": {"icon": "temaki-cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "matchScore": 0.95, "name": "Marked Cycle Crossing"},
-  "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "matchScore": 0.95, "name": "Unmarked Cycle Crossing"},
+  "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr", "lt", "pl"], "icon": "temaki-pedestrian_and_cyclist", "fields": ["name", "segregated", "oneway", "surface", "width", "structure", "access", "incline"], "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.9, "name": "Cycle & Foot Path"},
+  "highway/cycleway/crossing/bicycle_foot": {"notCountryCodes": ["fr", "lt", "pl"], "icon": "temaki-ped_cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "cycleway", "cycleway": "crossing", "foot": "designated"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "foot": "designated", "bicycle": "designated"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["bicycle and foot crosswalk", "bike and pedestrian crossing", "cycleway", "cycling", "cyclist"], "matchScore": 0.9, "name": "Cycle & Foot Crossing"},
+  "highway/cycleway/crossing/marked": {"icon": "temaki-cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "matchScore": 0.95, "name": "Marked Cycle Crossing"},
+  "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "matchScore": 0.95, "name": "Unmarked Cycle Crossing"},
   "highway/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi", "access_simple", "wheelchair", "maxweight"], "moreFields": ["maxheight", "opening_hours"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
   "highway/emergency_bay": {"icon": "maki-car", "geometry": ["vertex"], "tags": {"highway": "emergency_bay"}, "terms": ["Highway Emergency Bay"], "name": "Emergency Stopping Place"},
   "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "not/name", "smoothness", "stroller", "tactile_paving", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"},
diff --git a/data/presets/presets/highway/cycleway/bicycle_foot.json b/data/presets/presets/highway/cycleway/bicycle_foot.json
index ef51d5b21..b13779430 100644
--- a/data/presets/presets/highway/cycleway/bicycle_foot.json
+++ b/data/presets/presets/highway/cycleway/bicycle_foot.json
@@ -3,6 +3,16 @@
         "fr", "lt", "pl"
     ],
     "icon": "temaki-pedestrian_and_cyclist",
+    "fields": [
+        "name",
+        "segregated",
+        "oneway",
+        "surface",
+        "width",
+        "structure",
+        "access",
+        "incline"
+    ],
     "geometry": [
         "line"
     ],
@@ -25,16 +35,6 @@
         "segregated trail",
         "rail trail"
     ],
-    "fields": [
-        "name",
-        "segregated",
-        "oneway",
-        "surface",
-        "width",
-        "structure",
-        "access",
-        "incline"
-    ],
     "matchScore": 0.9,
     "name": "Cycle & Foot Path"
 }
diff --git a/data/presets/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/presets/highway/cycleway/crossing/bicycle_foot.json
new file mode 100644
index 000000000..b26af35c2
--- /dev/null
+++ b/data/presets/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -0,0 +1,40 @@
+{
+    "notCountryCodes": [
+        "fr", "lt", "pl"
+    ],
+    "icon": "temaki-ped_cyclist_crosswalk",
+    "fields": [
+        "crossing",
+        "access",
+        "surface",
+        "tactile_paving",
+        "crossing/island"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "cycleway",
+        "cycleway": "crossing",
+        "foot": "designated"
+    },
+    "addTags": {
+        "highway": "cycleway",
+        "cycleway": "crossing",
+        "foot": "designated",
+        "bicycle": "designated"
+    },
+    "reference": {
+        "key": "cycleway",
+        "value": "crossing"
+    },
+    "terms": [
+        "bicycle and foot crosswalk",
+        "bike and pedestrian crossing",
+        "cycleway",
+        "cycling",
+        "cyclist"
+    ],
+    "matchScore": 0.9,
+    "name": "Cycle & Foot Crossing"
+}
diff --git a/data/presets/presets/highway/cycleway/crossing/marked.json b/data/presets/presets/highway/cycleway/crossing/marked.json
index 15c697863..31a4e8383 100644
--- a/data/presets/presets/highway/cycleway/crossing/marked.json
+++ b/data/presets/presets/highway/cycleway/crossing/marked.json
@@ -11,10 +11,6 @@
         "line"
     ],
     "tags": {
-        "cycleway": "crossing",
-        "crossing": "marked"
-    },
-    "addTags": {
         "highway": "cycleway",
         "cycleway": "crossing",
         "crossing": "marked"
diff --git a/data/presets/presets/highway/cycleway/crossing/unmarked.json b/data/presets/presets/highway/cycleway/crossing/unmarked.json
index 38b256588..cce9e9f1c 100644
--- a/data/presets/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/presets/highway/cycleway/crossing/unmarked.json
@@ -11,10 +11,6 @@
         "line"
     ],
     "tags": {
-        "cycleway": "crossing",
-        "crossing": "unmarked"
-    },
-    "addTags": {
         "highway": "cycleway",
         "cycleway": "crossing",
         "crossing": "unmarked"
diff --git a/data/taginfo.json b/data/taginfo.json
index fe40c6e01..1ac3aec65 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -500,7 +500,7 @@
     {"key": "crossing", "value": "unmarked", "description": "🄿 Unmarked Crossing, 🄿 Unmarked Cycle Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"},
     {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-biking.svg"},
     {"key": "cycleway", "value": "crossing", "description": "🄿 Cycle Crossing (unsearchable)", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cyclist_crosswalk.svg"},
-    {"key": "foot", "value": "designated", "description": "🄿 Cycle & Foot Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian_and_cyclist.svg"},
+    {"key": "foot", "value": "designated", "description": "🄿 Cycle & Foot Path, 🄿 Cycle & Foot Crossing, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian_and_cyclist.svg"},
     {"key": "highway", "value": "elevator", "description": "🄿 Elevator", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/elevator.svg"},
     {"key": "highway", "value": "emergency_bay", "description": "🄿 Emergency Stopping Place", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 883855f66..eb6fd1890 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6889,6 +6889,10 @@
                     "name": "Cycle & Foot Path",
                     "terms": "bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail,rail trail"
                 },
+                "highway/cycleway/crossing/bicycle_foot": {
+                    "name": "Cycle & Foot Crossing",
+                    "terms": "bicycle and foot crosswalk,bike and pedestrian crossing,cycleway,cycling,cyclist"
+                },
                 "highway/cycleway/crossing/marked": {
                     "name": "Marked Cycle Crossing",
                     "terms": "cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing"