diff --git a/data/presets.yaml b/data/presets.yaml
index bfedba689..d73563c0a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -386,6 +386,9 @@ en:
       fee:
         # fee=*
         label: Fee
+      fence_type:
+        # fence=*
+        label: Type
       fire_hydrant/type:
         # 'fire_hydrant:type=*'
         label: Type
@@ -1159,6 +1162,9 @@ en:
           house: Up to 5m (16ft)
           # visibility=street
           street: 5 to 20m (16 to 65ft)
+      wall:
+        # wall=*
+        label: Type
       water:
         # water=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d307cfdb0..20d70f5e2 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -537,6 +537,11 @@
             "type": "check",
             "label": "Fee"
         },
+        "fence_type": {
+            "key": "fence",
+            "type": "combo",
+            "label": "Type"
+        },
         "fire_hydrant/type": {
             "key": "fire_hydrant:type",
             "type": "combo",
@@ -1561,6 +1566,11 @@
                 }
             }
         },
+        "wall": {
+            "key": "wall",
+            "type": "combo",
+            "label": "Type"
+        },
         "water_point": {
             "key": "water_point",
             "type": "check",
diff --git a/data/presets/fields/fence_type.json b/data/presets/fields/fence_type.json
new file mode 100644
index 000000000..63d43bab5
--- /dev/null
+++ b/data/presets/fields/fence_type.json
@@ -0,0 +1,5 @@
+{
+    "key": "fence",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/wall.json b/data/presets/fields/wall.json
new file mode 100644
index 000000000..fcb1ecc1c
--- /dev/null
+++ b/data/presets/fields/wall.json
@@ -0,0 +1,5 @@
+{
+    "key": "wall",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 17564363a..186cf7adb 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2669,6 +2669,9 @@
         },
         "barrier/city_wall": {
             "icon": "prison",
+            "fields": [
+                "height"
+            ],
             "geometry": [
                 "line",
                 "area"
@@ -2704,6 +2707,10 @@
         },
         "barrier/fence": {
             "icon": "prison",
+            "fields": [
+                "fence_type",
+                "height"
+            ],
             "geometry": [
                 "line"
             ],
@@ -2728,6 +2735,9 @@
             "name": "Gate"
         },
         "barrier/hedge": {
+            "fields": [
+                "height"
+            ],
             "geometry": [
                 "line",
                 "area"
@@ -2803,6 +2813,10 @@
         },
         "barrier/wall": {
             "icon": "prison",
+            "fields": [
+                "wall",
+                "height"
+            ],
             "geometry": [
                 "line",
                 "area"
diff --git a/data/presets/presets/barrier/city_wall.json b/data/presets/presets/barrier/city_wall.json
index 512be00fd..6d69be4de 100644
--- a/data/presets/presets/barrier/city_wall.json
+++ b/data/presets/presets/barrier/city_wall.json
@@ -1,5 +1,8 @@
 {
     "icon": "prison",
+    "fields": [
+        "height"
+    ],
     "geometry": [
         "line",
         "area"
diff --git a/data/presets/presets/barrier/fence.json b/data/presets/presets/barrier/fence.json
index 169cfd46f..0497a4aba 100644
--- a/data/presets/presets/barrier/fence.json
+++ b/data/presets/presets/barrier/fence.json
@@ -1,5 +1,9 @@
 {
     "icon": "prison",
+    "fields": [
+        "fence_type",
+        "height"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/barrier/hedge.json b/data/presets/presets/barrier/hedge.json
index 69c4ec9da..97991c874 100644
--- a/data/presets/presets/barrier/hedge.json
+++ b/data/presets/presets/barrier/hedge.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "height"
+    ],
     "geometry": [
         "line",
         "area"
diff --git a/data/presets/presets/barrier/wall.json b/data/presets/presets/barrier/wall.json
index f102102d9..3fa7171cb 100644
--- a/data/presets/presets/barrier/wall.json
+++ b/data/presets/presets/barrier/wall.json
@@ -1,5 +1,9 @@
 {
     "icon": "prison",
+    "fields": [
+        "wall",
+        "height"
+    ],
     "geometry": [
         "line",
         "area"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9a706a2b8..227dc647c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -979,6 +979,9 @@
                 "fee": {
                     "label": "Fee"
                 },
+                "fence_type": {
+                    "label": "Type"
+                },
                 "fire_hydrant/type": {
                     "label": "Type",
                     "options": {
@@ -1606,6 +1609,9 @@
                         "area": "Over 20m (65ft)"
                     }
                 },
+                "wall": {
+                    "label": "Type"
+                },
                 "water_point": {
                     "label": "Water Point"
                 },