diff --git a/data/fields/crossing/markings_zebra.json b/data/fields/crossing/markings_zebra.json
new file mode 100644
index 00000000..229feefd
--- /dev/null
+++ b/data/fields/crossing/markings_zebra.json
@@ -0,0 +1,15 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "zebra",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "zebra:double",
+        "zebra:paired",
+        "zebra:bicolour"
+    ]
+}
diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
deleted file mode 100644
index ed71daa0..00000000
--- a/data/presets/highway/crossing/_zebra.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "icon": "temaki-pedestrian_crosswalk",
-    "fields": [
-        "crossing",
-        "{@templates/crossing/markings}",
-        "{@templates/crossing/defaults}",
-        "tactile_paving"
-    ],
-    "moreFields": [
-        "kerb",
-        "flashing_lights"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "highway": "crossing",
-        "crossing": "zebra"
-    },
-    "reference": {
-        "key": "crossing",
-        "value": "zebra"
-    },
-    "name": "{highway/crossing/uncontrolled}",
-    "searchable": false
-}
diff --git a/data/presets/highway/crossing/zebra.json b/data/presets/highway/crossing/zebra.json
new file mode 100644
index 00000000..f4459bf0
--- /dev/null
+++ b/data/presets/highway/crossing/zebra.json
@@ -0,0 +1,87 @@
+{
+    "icon": "temaki-pedestrian_crosswalk",
+    "fields": [
+        "crossing/markings_zebra",
+        "{@templates/crossing/defaults}",
+        "tactile_paving"
+    ],
+    "moreFields": [
+        "kerb",
+        "flashing_lights"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "crossing",
+        "crossing": "uncontrolled",
+        "crossing_ref": "zebra"
+    },
+    "addTags": {
+        "highway": "crossing",
+        "crossing": "uncontrolled",
+        "crossing_ref": "zebra",
+        "crossing:markings": "zebra"
+    },
+    "reference": {
+        "key": "crossing_ref",
+        "value": "zebra"
+    },
+    "name": "Zebra Crossing",
+    "locationSet": {
+        "include": [
+            "AD",
+            "AL",
+            "AT",
+            "AU",
+            "BA",
+            "BE",
+            "BG",
+            "BY",
+            "CH",
+            "CY",
+            "CZ",
+            "DE",
+            "DK",
+            "EE",
+            "ES",
+            "FI",
+            "FR",
+            "GR",
+            "HK",
+            "HR",
+            "HU",
+            "IE",
+            "IS",
+            "IT",
+            "JP",
+            "LI",
+            "LT",
+            "LU",
+            "LV",
+            "MC",
+            "MD",
+            "ME",
+            "MK",
+            "MT",
+            "NL",
+            "NO",
+            "NZ",
+            "PL",
+            "PT",
+            "RO",
+            "RS",
+            "RU",
+            "SE",
+            "SG",
+            "SI",
+            "SK",
+            "SM",
+            "TR",
+            "UA",
+            "UK",
+            "VA"
+        ]
+    },
+    "matchScore": 1.01
+}
diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
deleted file mode 100644
index 7ac1a29d..00000000
--- a/data/presets/highway/footway/crossing/_zebra.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "icon": "temaki-pedestrian_crosswalk",
-    "fields": [
-        "crossing",
-        "{@templates/crossing/markings}",
-        "{@templates/crossing/defaults}",
-        "surface"
-    ],
-    "moreFields": [
-        "{@templates/crossing/geometry_way_more}",
-        "flashing_lights"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "footway",
-        "footway": "crossing",
-        "crossing": "zebra"
-    },
-    "reference": {
-        "key": "crossing",
-        "value": "zebra"
-    },
-    "name": "{highway/footway/crossing/uncontrolled}",
-    "searchable": false
-}
diff --git a/data/presets/highway/footway/crossing/zebra.json b/data/presets/highway/footway/crossing/zebra.json
new file mode 100644
index 00000000..3b0b0617
--- /dev/null
+++ b/data/presets/highway/footway/crossing/zebra.json
@@ -0,0 +1,45 @@
+{
+    "icon": "temaki-pedestrian_crosswalk",
+    "fields": [
+        "crossing/markings_zebra",
+        "{@templates/crossing/defaults}",
+        "surface"
+    ],
+    "moreFields": [
+        "{@templates/crossing/geometry_way_more}",
+        "flashing_lights"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "uncontrolled",
+        "crossing_ref": "zebra"
+    },
+    "addTags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "uncontrolled",
+        "crossing_ref": "zebra",
+        "crossing:markings": "zebra"
+    },
+    "reference": {
+        "key": "crossing_ref",
+        "value": "zebra"
+    },
+    "name": "{highway/crossing/zebra}",
+    "locationSet": {
+        "include": [
+            "AU",
+            "HK",
+            "JP",
+            "NZ",
+            "Q46",
+            "RU",
+            "SG"
+        ]
+    },
+    "matchScore": 1.01
+}