diff --git a/data/presets/presets.json b/data/presets/presets.json
index 176ccdb8e..ffd845c62 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7637,6 +7637,7 @@
             "name": "Lighthouse"
         },
         "man_made/mast": {
+            "icon": "poi-mast",
             "fields": [
                 "tower/type",
                 "tower/construction",
@@ -9034,6 +9035,7 @@
             "searchable": false
         },
         "power/generator": {
+            "icon": "poi-power",
             "fields": [
                 "operator",
                 "generator/source",
@@ -9110,6 +9112,7 @@
             "name": "Power Pole"
         },
         "power/substation": {
+            "icon": "poi-power",
             "fields": [
                 "substation",
                 "operator",
@@ -9134,6 +9137,7 @@
             "name": "High-Voltage Tower"
         },
         "power/transformer": {
+            "icon": "poi-power",
             "geometry": [
                 "point",
                 "vertex",
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index 5bbde6a85..b9e215870 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-mast",
     "fields": [
         "tower/type",
         "tower/construction",
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index 22c9dbf02..e9d569229 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-power",
     "fields": [
         "operator",
         "generator/source",
diff --git a/data/presets/presets/power/substation.json b/data/presets/presets/power/substation.json
index 6cf9593ef..451a9b4c6 100644
--- a/data/presets/presets/power/substation.json
+++ b/data/presets/presets/power/substation.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-power",
     "fields": [
         "substation",
         "operator",
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index 68df65f9f..aa1bb5104 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-power",
     "geometry": [
         "point",
         "vertex",
@@ -8,4 +9,4 @@
         "power": "transformer"
     },
     "name": "Transformer"
-}
\ No newline at end of file
+}
diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index c6df34105..5d12aac3f 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -74,7 +74,7 @@ export function uiPresetIcon() {
 
         icon.selectAll('svg')
             .attr('class', function() {
-                return 'icon ' + picon + (isMaki ? '' : tag_classes(p));
+                return 'icon ' + picon + (isMaki || isPoi ? '' : tag_classes(p));
             });
 
         icon.selectAll('use')
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index af964581c..f5ecb36c3 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -262,6 +262,8 @@
     "poi-stop":                 { "viewBox": "445 320 15 15" },
     "poi-warning":              { "viewBox": "460 320 15 15" },
     "poi-fire-hydrant":         { "viewBox": "475 320 15 15" },
+    "poi-power":                { "viewBox": "490 320 15 15" },
+    "poi-mast":                 { "viewBox": "505 320 15 15" },
 
     "poi-foot-shape":              { "fill": "currentColor" },
     "poi-traffic-signals-shape":   { "fill": "currentColor" },
@@ -269,6 +271,8 @@
     "poi-stop-shape":              { "fill": "currentColor" },
     "poi-warning-shape":           { "fill": "currentColor" },
     "poi-fire-hydrant-shape":      { "fill": "currentColor" },
+    "poi-power-shape":             { "fill": "currentColor" },
+    "poi-mast-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 edb245666..8e52027dc 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 2caaf54bf..2d2c49251 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -232,6 +232,12 @@
     </g>
   </g>
   <g id="poi">
+    <g id="poi-mast">
+      <path d="M512.5,324 C513.052,324 513.5,324.448 513.5,325 L513.5,333 L514,333 C514.552,333 515,333.448 515,334 C515,334.552 514.552,335 514,335 L511,335 C510.448,335 510,334.552 510,334 C510,333.448 510.448,333 511,333 L511.5,333 L511.5,325 C511.5,324.448 511.948,324 512.5,324 z M509.705,322.529 C509.478,322.562 509.581,322.521 509.396,322.646 C508.201,323.842 508.201,326.158 509.396,327.354 C509.592,327.549 509.908,327.549 510.103,327.354 C510.299,327.158 510.299,326.842 510.103,326.646 C509.299,325.842 509.299,324.158 510.103,323.354 C510.299,323.158 510.299,322.842 510.103,322.646 L509.938,322.537 L509.705,322.529 z M514.955,322.529 C514.728,322.562 514.831,322.521 514.646,322.646 C514.451,322.842 514.451,323.158 514.646,323.354 C515.451,324.158 515.451,325.842 514.646,326.646 C514.451,326.842 514.451,327.158 514.646,327.354 C514.842,327.549 515.158,327.549 515.354,327.354 C516.549,326.158 516.549,323.842 515.354,322.646 L515.188,322.537 L514.955,322.529 z M517.16,320.526 C516.718,320.553 516.884,320.473 516.625,320.669 C516.443,320.875 516.462,321.191 516.669,321.374 C518.703,323.175 518.703,326.825 516.669,328.625 C516.462,328.809 516.443,329.125 516.625,329.331 C516.809,329.538 517.125,329.557 517.331,329.374 C519.816,327.175 519.816,322.825 517.331,320.625 L517.16,320.526 z M507.84,320.526 L507.669,320.625 C505.184,322.825 505.184,327.175 507.669,329.374 C507.875,329.557 508.191,329.538 508.374,329.331 C508.557,329.125 508.538,328.809 508.331,328.625 C506.297,326.825 506.297,323.175 508.331,321.374 C508.538,321.191 508.557,320.875 508.374,320.669 C508.116,320.473 508.282,320.553 507.84,320.526 z" fill="#000000" id="poi-mast-shape"/>
+    </g>
+    <g id="poi-power">
+      <path d="M497,321 C497,321 495,328 495,328 C495,328 497,328 497,328 C497,328 496,334 496,334 C496,334 500,326 500,326 C500,326 498,326 498,326 C498,326 500,321 500,321 C500,321 497,321 497,321 z" fill="#000000" id="poi-power-shape"/>
+    </g>
     <g id="poi-fire-hydrant">
       <path d="M482.5,320.5 C482.888,320.5 483.203,320.82 483.203,321.214 L483.203,321.178 C484.382,321.407 484.872,322.149 485.265,323.214 L485.453,323.214 C485.686,323.214 485.875,323.47 485.875,323.786 C485.875,324.101 485.686,324.357 485.453,324.357 L484.75,324.357 L484.75,326.357 L486.438,326.357 C486.748,326.357 487,326.613 487,326.929 L487,328.643 C487,328.958 486.748,329.214 486.438,329.214 L484.75,329.214 L484.75,333.071 L485.312,333.071 C485.701,333.071 486.016,333.391 486.016,333.786 C486.016,334.18 485.701,334.5 485.312,334.5 L479.687,334.5 C479.299,334.5 478.984,334.18 478.984,333.786 C478.984,333.391 479.299,333.071 479.688,333.071 L480.25,333.071 L480.25,329.214 L478.562,329.214 C478.252,329.214 478,328.958 478,328.643 L478,326.928 C478,326.613 478.252,326.357 478.562,326.357 L480.25,326.357 L480.25,324.357 L479.547,324.357 C479.314,324.357 479.125,324.101 479.125,323.786 C479.125,323.47 479.314,323.214 479.547,323.214 L479.698,323.214 C480.08,321.92 480.63,321.613 481.797,321.178 L481.797,321.214 C481.797,320.82 482.112,320.5 482.5,320.5 z" fill="#000000" id="poi-fire-hydrant-shape"/>
     </g>