diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4b06a254d..24d47a41b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2748,7 +2748,7 @@
             "name": "Shelter"
         },
         "amenity/shower": {
-            "icon": "water",
+            "icon": "poi-shower",
             "fields": [
                 "operator",
                 "opening_hours",
@@ -7550,7 +7550,7 @@
             "name": "Stop Sign"
         },
         "highway/street_lamp": {
-            "icon": "poi-street-lamp",
+            "icon": "poi-bulb",
             "geometry": [
                 "point",
                 "vertex"
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
index 1d5fcbe89..44eeee07b 100644
--- a/data/presets/presets/amenity/shower.json
+++ b/data/presets/presets/amenity/shower.json
@@ -1,5 +1,5 @@
 {
-    "icon": "water",
+    "icon": "poi-shower",
     "fields": [
         "operator",
         "opening_hours",
diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json
index 8c48d005f..e5531b076 100644
--- a/data/presets/presets/highway/street_lamp.json
+++ b/data/presets/presets/highway/street_lamp.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-street-lamp",
+    "icon": "poi-bulb",
     "geometry": [
         "point",
         "vertex"
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index e7a182af0..d0e9e8cd3 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -326,7 +326,7 @@
     "poi-fountain":             { "viewBox": "445 335 15 15" },
     "poi-storage-tank":         { "viewBox": "460 335 15 15" },
     "poi-silo":                 { "viewBox": "475 335 15 15" },
-    "poi-street-lamp":          { "viewBox": "490 335 15 15" },
+    "poi-shower":               { "viewBox": "490 335 15 15" },
     "poi-tool":                 { "viewBox": "505 335 15 15" },
     "poi-tower":                { "viewBox": "520 335 15 15" },
     "poi-military":             { "viewBox": "535 335 15 15" },
@@ -339,6 +339,7 @@
     "poi-taoist":               { "viewBox": "640 335 15 15" },
     "poi-milestone":            { "viewBox": "655 335 15 15" },
     "poi-crane":                { "viewBox": "670 335 15 15" },
+    "poi-bulb":                 { "viewBox": "685 335 15 15" },
 
     "poi-vending-machine-shape":   { "fill": "currentColor" },
     "poi-dice-shape":              { "fill": "currentColor" },
@@ -346,7 +347,7 @@
     "poi-fountain-shape":          { "fill": "currentColor" },
     "poi-storage-tank-shape":      { "fill": "currentColor" },
     "poi-silo-shape":              { "fill": "currentColor" },
-    "poi-street-lamp-shape":       { "fill": "currentColor" },
+    "poi-shower-shape":            { "fill": "currentColor" },
     "poi-tool-shape":              { "fill": "currentColor" },
     "poi-tower-shape":             { "fill": "currentColor" },
     "poi-military-shape":          { "fill": "currentColor" },
@@ -359,6 +360,7 @@
     "poi-taoist-shape":            { "fill": "currentColor" },
     "poi-milestone-shape":         { "fill": "currentColor" },
     "poi-crane-shape":             { "fill": "currentColor" },
+    "poi-bulb-shape":              { "fill": "currentColor" },
 
     "poi-vertex":               { "viewBox": "400 350 15 15" },
 
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index d51f02054..f05167f87 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 1fffde658..59a6a71a7 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -315,6 +315,9 @@
     <g id="poi-vertex">
       <path d="M407.5,354.5 C409.157,354.5 410.5,355.843 410.5,357.5 C410.5,359.157 409.157,360.5 407.5,360.5 C405.843,360.5 404.5,359.157 404.5,357.5 C404.5,355.843 405.843,354.5 407.5,354.5 z" fill="#000000" id="poi-vertex-shape"/>
     </g>
+    <g id="poi-bulb">
+      <path d="M693.5,346.5 C693.25,346.5 691.66,346.5 691.5,346.5 C691,346.5 691,344.5 690,343.5 C688.924,342.424 688,341.016 688,339.5 C688,336.5 690.5,335.5 692.5,335.5 C694.5,335.5 697,336.5 697,339.5 C697,341.024 696.077,342.423 695,343.5 C694,344.5 694,346.5 693.5,346.5 z M693.5,348 L691.5,348 C691.224,348 691,348.224 691,348.5 C691,348.776 691.224,349 691.5,349 L693.5,349 C693.776,349 694,348.776 694,348.5 C694,348.224 693.776,348 693.5,348 z M692.5,349.5 C692.914,349.5 693.25,349.276 693.25,349 C693.25,348.724 692.914,348.5 692.5,348.5 C692.086,348.5 691.75,348.724 691.75,349 C691.75,349.276 692.086,349.5 692.5,349.5 z M693.5,346.75 L691.5,346.75 C691.224,346.75 691,346.974 691,347.25 C691,347.526 691.224,347.75 691.5,347.75 L693.5,347.75 C693.776,347.75 694,347.526 694,347.25 C694,346.974 693.776,346.75 693.5,346.75 z" fill="#000000" id="poi-bulb-shape"/>
+    </g>
     <g id="poi-crane">
       <path d="M684.5,336 L684.5,338 L683.5,338 L683.5,342 C683.5,342.276 683.276,342.5 683,342.5 C682.724,342.5 682.5,342.276 682.5,342 L682.5,338 L677.844,338 L678.685,347.25 L680,347.25 L680,348.75 L672,348.75 L672,347.25 L673.315,347.25 L674.156,338 L672.5,338 L672.5,336 L684.5,336 z M676.997,345.25 L675.003,345.25 L674.821,347.25 L677.179,347.25 L676.997,345.25 z M676.679,341.75 L675.321,341.75 L675.139,343.75 L676.86,343.75 L676.679,341.75 z M676.338,338 L675.662,338 L675.458,340.25 L676.542,340.25 L676.338,338 z" fill="#000000" id="poi-crane-shape"/>
     </g>
@@ -351,8 +354,8 @@
     <g id="poi-tool">
       <path d="M510.547,336.671 C510.801,336.986 510.989,337.328 511.109,337.697 C511.23,338.066 511.267,338.811 511.267,338.811 C511.267,338.811 511.173,339.548 511.027,339.9 C510.877,340.251 510.662,340.57 510.377,340.854 C510.191,341.041 509.5,341.5 509,341.5 C509,341.5 509,347 509,348.5 C509,350 507,350 507,348.5 C507,347.5 507,341.5 507,341.5 C506.5,341.5 506.11,340.999 505.932,340.828 C505.629,340.525 505.399,340.178 505.241,339.787 C505.083,339.395 505.002,339.002 505,338.604 C504.998,338.207 505.071,337.817 505.221,337.432 C505.369,337.049 505.593,336.707 505.893,336.406 C506.181,336.119 506.513,335.897 506.893,335.74 C507.274,335.585 507.667,335.504 508.073,335.5 L506.796,338.282 L507.695,339.577 L509.25,339.444 z M520,335.5 L518.5,335.5 C518.5,336 518,336.5 517.5,336.5 C517,336.5 516.077,336.5 515,336.5 C513.5,336.5 512,338.553 512,340 C513,339.053 513.385,339 515,339 L515,348.5 C515,350 517,350 517,348.5 C517,347 517,339 517,339 L517.5,339 C518,339 518.5,339.5 518.5,340 L520,340 C520,340 520,335.5 520,335.5 z" fill="#000000" id="poi-tool-shape"/>
     </g>
-    <g id="poi-street-lamp">
-      <path d="M501.25,339 L501.25,341 L500.75,341 L500.75,339 L501.25,339 z M503.224,338.888 L502.776,339.112 L503.776,341.112 L504.224,340.888 L503.224,338.888 z M498.776,338.888 L497.776,340.888 L498.224,341.112 L499.224,339.112 L498.776,338.888 z M501,335 C500.763,335 500.367,335.014 499.862,335.056 C499.021,335.126 498.179,335.253 497.382,335.452 C496.707,335.621 496.093,335.836 495.553,336.106 C493.179,337.293 492,339.65 492,343 L492,349 C492,349.552 492.448,350 493,350 C493.552,350 494,349.552 494,349 L494,343 C494,340.35 494.821,338.707 496.447,337.894 C496.845,337.696 497.324,337.528 497.867,337.392 C499.04,337.157 498.568,337.222 499.273,337.139 C498.831,337.465 499.039,337.295 498.646,337.646 C498.331,337.961 498.555,338.5 499,338.5 L503,338.5 C503.445,338.5 503.669,337.961 503.354,337.646 C503.207,337.5 502.965,337.292 502.652,337.084 C501.786,336.633 502.134,336.713 501.682,336.628 C502.015,336.296 501.899,336.5 502,336 C502,335.448 501.552,335 501,335 z" fill="#000000" id="poi-street-lamp-shape"/>
+    <g id="poi-shower">
+      <path d="M501.25,339 L501.25,341 L500.75,341 L500.75,339 L501.25,339 z M503.224,338.888 L502.776,339.112 L503.776,341.112 L504.224,340.888 L503.224,338.888 z M498.776,338.888 L497.776,340.888 L498.224,341.112 L499.224,339.112 L498.776,338.888 z M501,335 C500.763,335 500.367,335.014 499.862,335.056 C499.021,335.126 498.179,335.253 497.382,335.452 C496.707,335.621 496.093,335.836 495.553,336.106 C493.179,337.293 492,339.65 492,343 L492,349 C492,349.552 492.448,350 493,350 C493.552,350 494,349.552 494,349 L494,343 C494,340.35 494.821,338.707 496.447,337.894 C496.845,337.696 497.324,337.528 497.867,337.392 C499.04,337.157 498.568,337.222 499.273,337.139 C498.831,337.465 499.039,337.295 498.646,337.646 C498.331,337.961 498.555,338.5 499,338.5 L503,338.5 C503.445,338.5 503.669,337.961 503.354,337.646 C503.207,337.5 502.965,337.292 502.652,337.084 C501.786,336.633 502.134,336.713 501.682,336.628 C502.015,336.296 501.899,336.5 502,336 C502,335.448 501.552,335 501,335 z" fill="#000000" id="poi-shower-shape"/>
     </g>
     <g id="poi-silo">
       <path d="M480,338.5 C480,339 485,339 485,338.5 C485,338 485,348.625 485,349.125 C485,350.125 480,350.125 480,349.125 C480,348.625 480,338 480,338.5 z M480,337.625 C480,338.125 485,338.125 485,337.625 C485,334.125 480,334.125 480,337.625 z" fill="#000000" id="poi-silo-shape"/>