diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7c214f1a2..86d757cd1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6851,6 +6851,7 @@
             "name": "Dog Park"
         },
         "leisure/firepit": {
+            "icon": "fire-station",
             "geometry": [
                 "point",
                 "area"
@@ -7529,6 +7530,7 @@
             "matchScore": 0.1
         },
         "man_made": {
+            "icon": "poi-storage-tank",
             "fields": [
                 "man_made"
             ],
@@ -7622,6 +7624,7 @@
             "name": "Flagpole"
         },
         "man_made/gasometer": {
+            "icon": "poi-storage-tank",
             "geometry": [
                 "point",
                 "area"
@@ -7781,6 +7784,7 @@
             "name": "Silo"
         },
         "man_made/storage_tank": {
+            "icon": "poi-storage-tank",
             "fields": [
                 "building_area",
                 "content"
diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json
index 373f837bd..09df7cdf8 100644
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-storage-tank",
     "fields": [
         "man_made"
     ],
diff --git a/data/presets/presets/man_made/gasometer.json b/data/presets/presets/man_made/gasometer.json
index 70f3fca85..5fb4786b8 100644
--- a/data/presets/presets/man_made/gasometer.json
+++ b/data/presets/presets/man_made/gasometer.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-storage-tank",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
index 36f91bea8..df0c549bc 100644
--- a/data/presets/presets/man_made/storage_tank.json
+++ b/data/presets/presets/man_made/storage_tank.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-storage-tank",
     "fields": [
         "building_area",
         "content"
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index b3c95cef3..5d865f5df 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -282,11 +282,13 @@
     "poi-dice":                 { "viewBox": "415 335 15 15" },
     "poi-beach":                { "viewBox": "430 335 15 15" },
     "poi-fountain":             { "viewBox": "445 335 15 15" },
+    "poi-storage-tank":         { "viewBox": "460 335 15 15" },
 
     "poi-vending-machine-shape":   { "fill": "currentColor" },
     "poi-dice-shape":              { "fill": "currentColor" },
     "poi-beach-shape":             { "fill": "currentColor" },
     "poi-fountain-shape":          { "fill": "currentColor" },
+    "poi-storage-tank-shape":      { "fill": "currentColor" },
 
     "turn-yes":                 { "viewBox": "200 320 44 24" },
     "turn-no":                  { "viewBox": "244 320 44 24" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index 13a9fef1e..8a71de3ab 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index ceb62703a..18d3a5069 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -232,6 +232,9 @@
     </g>
   </g>
   <g id="poi">
+    <g id="poi-storage-tank">
+      <path d="M463,338.5 C463,340.5 472,340.5 472,338.5 C472,336.5 472,346.5 472,347.5 C472,349.5 463,349.5 463,347.5 C463,346.5 463,336.5 463,338.5 z M463.25,337.5 C463.25,339.5 471.75,339.5 471.75,337.5 C471.75,335.5 463.25,335.5 463.25,337.5 z" fill="#000000" id="poi-storage-tank-shape"/>
+    </g>
     <g id="poi-fountain">
       <path d="M451,347 L454,347 C454,347 453.966,349 452.966,349 C451.966,349 453,349 452,349 C451,349 451,347 451,347 z M448.5,337 C447.75,337 446.887,337.363 446.25,338 C445.5,338.75 445.25,340 445.25,341.75 C445.25,342.5 445.75,342.75 446,342.75 C446.25,342.75 446.75,342.5 446.75,341.75 C446.75,339.168 447.5,338.5 448.5,338.5 C450.5,338.5 451.479,342.928 451.479,342.928 C451.479,342.928 451.469,342.75 450.5,342.75 C449,342.75 448,343.866 448,346 C448,346.5 448.25,346.75 448.5,346.75 C448.75,346.75 449,346.5 449,346 C449,344.533 450,344 450.5,344 C451,344 451.75,344 451.75,345.5 C451.75,346.25 452.25,346.5 452.5,346.5 C452.75,346.5 453.25,346.25 453.25,345.5 C453.25,343.5 453.925,343.25 454.425,343.25 C454.75,343.25 455.5,343.75 455.5,345 C455.5,345.5 455.75,345.75 456,345.75 C456.25,345.75 456.5,345.5 456.5,345 C456.5,343.5 455.5,342.25 454.5,342.25 C453.75,342.25 453.5,342.5 453.5,342.5 C453.75,341.5 454.25,339.5 456,339.5 C457.25,339.5 458.25,341.25 458.25,343.75 C458.25,344.5 458.75,344.75 459,344.75 C459.25,344.75 459.75,344.5 459.75,343.75 C459.75,342 459.25,340 458.25,339 C457.75,338.5 457,338 456,338 C453.75,338 453,339.75 452.5,341.25 C452.25,339.5 450.75,337 448.5,337 z" fill="#000000" id="poi-fountain-shape"/>
     </g>