diff --git a/data/fields/kerb.json b/data/fields/kerb.json
index ae26fe1f..d03f2ea3 100644
--- a/data/fields/kerb.json
+++ b/data/fields/kerb.json
@@ -29,5 +29,11 @@
                 "description": "Some sort of curb is present at this location, unknown whether it is raised, lowered, flush etc."
             }
         }
+    },
+    "icons": {
+        "raised": "temaki-kerb-raised",
+        "lowered": "temaki-kerb-lowered",
+        "flush": "temaki-kerb-flush",
+        "rolled": "temaki-kerb-rolled"
     }
 }
diff --git a/data/fields/kerb/kerb_barrier.json b/data/fields/kerb/kerb_barrier.json
index 2142436b..81149f0b 100644
--- a/data/fields/kerb/kerb_barrier.json
+++ b/data/fields/kerb/kerb_barrier.json
@@ -1,25 +1,14 @@
 {
     "key": "kerb",
     "type": "combo",
-    "label": "Curb",
-    "strings": {
-        "options": {
-            "flush": {
-                "title": "Flush",
-                "description": "A dropped curb which is level with the surrounding area."
-            },
-            "lowered": {
-                "title": "Lowered",
-                "description": "A dropped curb which can be used by wheelchair users, not higher than a few centimeters."
-            },
-            "raised": {
-                "title": "Raised",
-                "description": "A raised curb which can't easily be used by wheelchair users, higher than a few centimeters."
-            },
-            "rolled": {
-                "title": "Rolled",
-                "description": "A raised curb with a rounded edge which makes it easier to use for cars or bicycles, but not for wheelchairs."
-            }
-        }
-    }
+    "label": "Type",
+    "stringsCrossReference": "{kerb}",
+    "options": [
+        "flush",
+        "lowered",
+        "raised",
+        "rolled"
+    ],
+    "autoSuggestions": false,
+    "iconsCrossReference": "{kerb}"
 }
diff --git a/data/presets/barrier/kerb/flush.json b/data/presets/barrier/kerb/flush.json
index a063c188..08f69abf 100644
--- a/data/presets/barrier/kerb/flush.json
+++ b/data/presets/barrier/kerb/flush.json
@@ -1,9 +1,5 @@
 {
     "icon": "temaki-kerb-flush",
-    "fields": [
-        "kerb/kerb_barrier",
-        "{barrier/kerb}"
-    ],
     "geometry": [
         "vertex",
         "line"
diff --git a/data/presets/barrier/kerb/lowered.json b/data/presets/barrier/kerb/lowered.json
index 89c99be2..d54803e1 100644
--- a/data/presets/barrier/kerb/lowered.json
+++ b/data/presets/barrier/kerb/lowered.json
@@ -1,7 +1,6 @@
 {
     "icon": "temaki-kerb-lowered",
     "fields": [
-        "kerb/kerb_barrier",
         "{barrier/kerb}",
         "kerb/height"
     ],
diff --git a/data/presets/barrier/kerb/raised.json b/data/presets/barrier/kerb/raised.json
index 7ba793a5..dbcff019 100644
--- a/data/presets/barrier/kerb/raised.json
+++ b/data/presets/barrier/kerb/raised.json
@@ -1,7 +1,6 @@
 {
     "icon": "temaki-kerb-raised",
     "fields": [
-        "kerb/kerb_barrier",
         "{barrier/kerb}",
         "kerb/height"
     ],
diff --git a/data/presets/barrier/kerb/rolled.json b/data/presets/barrier/kerb/rolled.json
index 376fad6e..04fc18a0 100644
--- a/data/presets/barrier/kerb/rolled.json
+++ b/data/presets/barrier/kerb/rolled.json
@@ -1,7 +1,6 @@
 {
     "icon": "temaki-kerb-rolled",
     "fields": [
-        "kerb/kerb_barrier",
         "{barrier/kerb}",
         "kerb/height"
     ],