diff --git a/data/presets.yaml b/data/presets.yaml
index 39a28bf27a..84f3da72bd 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -292,6 +292,9 @@ en:
       board_type:
         # board_type=*
         label: Type
+      bollard:
+        # bollard=*
+        label: Type
       booth:
         # booth=*
         label: Booth
@@ -3765,6 +3768,10 @@ en:
         # barrier=bollard
         name: Bollard
         terms: '<translate with synonyms or related terms for ''Bollard'', separated by commas>'
+      barrier/bollard_line:
+        # barrier=bollard
+        name: Bollard Row
+        terms: '<translate with synonyms or related terms for ''Bollard Row'', separated by commas>'
       barrier/border_control:
         # barrier=border_control
         name: Border Control
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 5e1472a883..ebb3a8bfa4 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -40,6 +40,7 @@
     "bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
     "blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}},
     "board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"},
+    "bollard": {"key": "bollard", "type": "combo", "label": "Type"},
     "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true},
     "boules": {"key": "boules", "type": "typeCombo", "label": "Type"},
     "boundary": {"key": "boundary", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/bollard.json b/data/presets/fields/bollard.json
new file mode 100644
index 0000000000..d610d379ae
--- /dev/null
+++ b/data/presets/fields/bollard.json
@@ -0,0 +1,5 @@
+{
+    "key": "bollard",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 45795caeca..fb0f84283b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -280,7 +280,8 @@
     "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "moreFields": ["level"], "name": "Barrier", "matchScore": 0.4},
     "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false},
     "barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
-    "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
+    "barrier/bollard_line": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"},
+    "barrier/bollard": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
     "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
     "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"},
     "barrier/chain": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"},
diff --git a/data/presets/presets/barrier/bollard.json b/data/presets/presets/barrier/bollard.json
index 2cabf08e0e..db295b4d46 100644
--- a/data/presets/presets/barrier/bollard.json
+++ b/data/presets/presets/barrier/bollard.json
@@ -1,13 +1,16 @@
 {
-    "icon": "maki-roadblock",
+    "icon": "temaki-silo",
     "fields": [
         "access",
-        "material"
+        "bollard",
+        "height",
+        "width",
+        "material",
+        "colour"
     ],
     "geometry": [
         "point",
-        "vertex",
-        "line"
+        "vertex"
     ],
     "tags": {
         "barrier": "bollard"
diff --git a/data/presets/presets/barrier/bollard_line.json b/data/presets/presets/barrier/bollard_line.json
new file mode 100644
index 0000000000..7a8bfac7ed
--- /dev/null
+++ b/data/presets/presets/barrier/bollard_line.json
@@ -0,0 +1,17 @@
+{
+    "icon": "temaki-silo",
+    "fields": [
+        "access",
+        "bollard",
+        "height",
+        "material",
+        "colour"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "barrier": "bollard"
+    },
+    "name": "Bollard Row"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index fd164e23cc..f46ca02483 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -277,7 +277,7 @@
     {"key": "barrier", "description": "🄿 Barrier, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
-    {"key": "barrier", "value": "bollard", "description": "🄿 Bollard", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
+    {"key": "barrier", "value": "bollard", "description": "🄿 Bollard Row, 🄿 Bollard", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
     {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
     {"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
@@ -1280,6 +1280,7 @@
     {"key": "blood:", "value": "platelets", "description": "🄵 Blood Components"},
     {"key": "blood:", "value": "stemcells", "description": "🄵 Blood Components"},
     {"key": "board_type", "description": "🄵 Type"},
+    {"key": "bollard", "description": "🄵 Type"},
     {"key": "booth", "description": "🄵 Booth"},
     {"key": "boules", "description": "🄵 Type"},
     {"key": "brand", "description": "🄵 Brand"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8b8ed6c268..62fcb68bf2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2705,6 +2705,10 @@
                     "label": "Type",
                     "terms": ""
                 },
+                "bollard": {
+                    "label": "Type",
+                    "terms": ""
+                },
                 "booth": {
                     "label": "Booth",
                     "terms": ""
@@ -5969,6 +5973,10 @@
                     "name": "Block",
                     "terms": ""
                 },
+                "barrier/bollard_line": {
+                    "name": "Bollard Row",
+                    "terms": ""
+                },
                 "barrier/bollard": {
                     "name": "Bollard",
                     "terms": ""