diff --git a/data/presets.yaml b/data/presets.yaml
index f638064b2..b1e1cf338 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1,6 +1,8 @@
 en:
   presets:
     categories:
+      category-barrier:
+        name: Barrier Features
       category-building:
         name: Building Features
       category-golf:
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 85a1a74c0..6387343fd 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -1,12 +1,13 @@
 {
     "category-barrier": {
         "geometry": "line",
-        "name": "Barrier",
-        "icon": "barrier",
+        "name": "Barrier Features",
+        "icon": "roadblock",
         "members": [
             "barrier/fence",
             "barrier/wall",
             "barrier/ditch",
+            "barrier/gate",
             "barrier"
         ]
     },
@@ -161,4 +162,4 @@
             "waterway/drain"
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/data/presets/categories/barrier.json b/data/presets/categories/barrier.json
new file mode 100644
index 000000000..67ea2a0f1
--- /dev/null
+++ b/data/presets/categories/barrier.json
@@ -0,0 +1,12 @@
+{
+    "geometry": "line",
+    "name": "Barrier Features",
+    "icon": "roadblock",
+    "members": [
+        "barrier/fence",
+        "barrier/wall",
+        "barrier/ditch",
+        "barrier/gate",
+        "barrier"
+    ]
+}
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index 906641933..6478e1c54 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -15,6 +15,7 @@
         "category-rail",
         "category-path",
         "category-water-line",
+        "category-barrier",
         "power/line",
         "line"
     ],
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b8ac2ee82..ef3d6338e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2288,6 +2288,7 @@
         "name": "Road Surface"
     },
     "barrier": {
+        "icon": "roadblock",
         "geometry": [
             "point",
             "vertex",
@@ -2303,6 +2304,7 @@
         "name": "Barrier"
     },
     "barrier/block": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2316,6 +2318,7 @@
         "name": "Block"
     },
     "barrier/bollard": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2330,6 +2333,7 @@
         "name": "Bollard"
     },
     "barrier/cattle_grid": {
+        "icon": "roadblock",
         "geometry": [
             "vertex"
         ],
@@ -2349,6 +2353,7 @@
         "name": "City Wall"
     },
     "barrier/cycle_barrier": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2382,6 +2387,7 @@
         "searchable": false
     },
     "barrier/fence": {
+        "icon": "roadblock",
         "geometry": [
             "line"
         ],
@@ -2391,6 +2397,7 @@
         "name": "Fence"
     },
     "barrier/gate": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2415,6 +2422,7 @@
         "name": "Hedge"
     },
     "barrier/kissing_gate": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2427,6 +2435,7 @@
         "name": "Kissing Gate"
     },
     "barrier/lift_gate": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2450,6 +2459,7 @@
         "name": "Retaining Wall"
     },
     "barrier/stile": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2463,6 +2473,7 @@
         "name": "Stile"
     },
     "barrier/toll_booth": {
+        "icon": "roadblock",
         "fields": [
             "access"
         ],
@@ -2475,6 +2486,7 @@
         "name": "Toll Booth"
     },
     "barrier/wall": {
+        "icon": "roadblock",
         "geometry": [
             "line",
             "area"
diff --git a/data/presets/presets/barrier.json b/data/presets/presets/barrier.json
index 88814b890..cb71097de 100644
--- a/data/presets/presets/barrier.json
+++ b/data/presets/presets/barrier.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "geometry": [
         "point",
         "vertex",
@@ -12,4 +13,4 @@
         "barrier"
     ],
     "name": "Barrier"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/block.json b/data/presets/presets/barrier/block.json
index d43f4ca99..e38245da4 100644
--- a/data/presets/presets/barrier/block.json
+++ b/data/presets/presets/barrier/block.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -10,4 +11,4 @@
         "barrier": "block"
     },
     "name": "Block"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/bollard.json b/data/presets/presets/barrier/bollard.json
index fd748c832..abef38e97 100644
--- a/data/presets/presets/barrier/bollard.json
+++ b/data/presets/presets/barrier/bollard.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -11,4 +12,4 @@
         "barrier": "bollard"
     },
     "name": "Bollard"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/cattle_grid.json b/data/presets/presets/barrier/cattle_grid.json
index 613fc7182..0781d4964 100644
--- a/data/presets/presets/barrier/cattle_grid.json
+++ b/data/presets/presets/barrier/cattle_grid.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "geometry": [
         "vertex"
     ],
@@ -6,4 +7,4 @@
         "barrier": "cattle_grid"
     },
     "name": "Cattle Grid"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/cycle_barrier.json b/data/presets/presets/barrier/cycle_barrier.json
index 19b3a429d..4566f8403 100644
--- a/data/presets/presets/barrier/cycle_barrier.json
+++ b/data/presets/presets/barrier/cycle_barrier.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -9,4 +10,4 @@
         "barrier": "cycle_barrier"
     },
     "name": "Cycle Barrier"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/fence.json b/data/presets/presets/barrier/fence.json
index 086f2f14d..d73447bf9 100644
--- a/data/presets/presets/barrier/fence.json
+++ b/data/presets/presets/barrier/fence.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "geometry": [
         "line"
     ],
@@ -6,4 +7,4 @@
         "barrier": "fence"
     },
     "name": "Fence"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/gate.json b/data/presets/presets/barrier/gate.json
index b1d869352..e3d1b7c69 100644
--- a/data/presets/presets/barrier/gate.json
+++ b/data/presets/presets/barrier/gate.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -11,4 +12,4 @@
         "barrier": "gate"
     },
     "name": "Gate"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/hedge.json b/data/presets/presets/barrier/hedge.json
index 9f10068af..69c4ec9da 100644
--- a/data/presets/presets/barrier/hedge.json
+++ b/data/presets/presets/barrier/hedge.json
@@ -7,4 +7,4 @@
         "barrier": "hedge"
     },
     "name": "Hedge"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/kissing_gate.json b/data/presets/presets/barrier/kissing_gate.json
index 6689ae90c..fb7a4525f 100644
--- a/data/presets/presets/barrier/kissing_gate.json
+++ b/data/presets/presets/barrier/kissing_gate.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -9,4 +10,4 @@
         "barrier": "kissing_gate"
     },
     "name": "Kissing Gate"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/lift_gate.json b/data/presets/presets/barrier/lift_gate.json
index f436bf508..dde413e47 100644
--- a/data/presets/presets/barrier/lift_gate.json
+++ b/data/presets/presets/barrier/lift_gate.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -10,4 +11,4 @@
         "barrier": "lift_gate"
     },
     "name": "Lift Gate"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/stile.json b/data/presets/presets/barrier/stile.json
index 596a51118..94429eb4b 100644
--- a/data/presets/presets/barrier/stile.json
+++ b/data/presets/presets/barrier/stile.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -10,4 +11,4 @@
         "barrier": "stile"
     },
     "name": "Stile"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/toll_booth.json b/data/presets/presets/barrier/toll_booth.json
index 7ab9e1a06..83059fcb9 100644
--- a/data/presets/presets/barrier/toll_booth.json
+++ b/data/presets/presets/barrier/toll_booth.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "fields": [
         "access"
     ],
@@ -9,4 +10,4 @@
         "barrier": "toll_booth"
     },
     "name": "Toll Booth"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/wall.json b/data/presets/presets/barrier/wall.json
index 5508b5d9e..5f43bf19a 100644
--- a/data/presets/presets/barrier/wall.json
+++ b/data/presets/presets/barrier/wall.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "geometry": [
         "line",
         "area"
@@ -7,4 +8,4 @@
         "barrier": "wall"
     },
     "name": "Wall"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9adfa707b..6c68e8c29 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -613,6 +613,9 @@
     },
     "presets": {
         "categories": {
+            "category-barrier": {
+                "name": "Barrier Features"
+            },
             "category-building": {
                 "name": "Building Features"
             },