diff --git a/data/presets/presets.json b/data/presets/presets.json
index 35b6da757..f7ed19e43 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5880,7 +5880,7 @@
             "name": "Gardener"
         },
         "craft/glaziery": {
-            "icon": "fire-station",
+            "icon": "poi-window",
             "fields": [
                 "name",
                 "operator",
@@ -6358,7 +6358,7 @@
             "name": "Watchmaker"
         },
         "craft/window_construction": {
-            "icon": "poi-tool",
+            "icon": "poi-window",
             "fields": [
                 "name",
                 "operator",
@@ -19002,7 +19002,7 @@
             "name": "Wholesale Store"
         },
         "shop/window_blind": {
-            "icon": "shop",
+            "icon": "poi-window",
             "fields": [
                 "name",
                 "operator",
diff --git a/data/presets/presets/craft/glaziery.json b/data/presets/presets/craft/glaziery.json
index 5e0caa60f..8178423af 100644
--- a/data/presets/presets/craft/glaziery.json
+++ b/data/presets/presets/craft/glaziery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "fire-station",
+    "icon": "poi-window",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
index 3889cf72a..de00f08a1 100644
--- a/data/presets/presets/craft/window_construction.json
+++ b/data/presets/presets/craft/window_construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-tool",
+    "icon": "poi-window",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/shop/window_blind.json b/data/presets/presets/shop/window_blind.json
index 5920528ed..868d4b9b8 100644
--- a/data/presets/presets/shop/window_blind.json
+++ b/data/presets/presets/shop/window_blind.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "poi-window",
     "fields": [
         "name",
         "operator",
diff --git a/data/taginfo.json b/data/taginfo.json
index 3b7c00948..1ec94a3c6 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2572,8 +2572,7 @@
             "object_types": [
                 "node",
                 "area"
-            ],
-            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fire-station-15.svg?sanitize=true"
+            ]
         },
         {
             "key": "craft",
@@ -7645,8 +7644,7 @@
             "object_types": [
                 "node",
                 "area"
-            ],
-            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+            ]
         },
         {
             "key": "shop",
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index a11490f81..f82114b43 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -346,6 +346,7 @@
     "poi-milestone":            { "viewBox": "655 335 15 15" },
     "poi-crane":                { "viewBox": "670 335 15 15" },
     "poi-bulb":                 { "viewBox": "685 335 15 15" },
+    "poi-window":               { "viewBox": "700 335 15 15" },
 
     "poi-vending-machine-shape":   { "fill": "currentColor" },
     "poi-dice-shape":              { "fill": "currentColor" },
@@ -367,6 +368,7 @@
     "poi-milestone-shape":         { "fill": "currentColor" },
     "poi-crane-shape":             { "fill": "currentColor" },
     "poi-bulb-shape":              { "fill": "currentColor" },
+    "poi-window-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 42c4bdf15..630b38f7a 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 3bee7ee3d..44c4f87a8 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -324,6 +324,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-window">
+      <path d="M712.5,348.5 L712.5,349.5 L702.5,349.5 L702.5,348.5 L712.5,348.5 z M711,337 L711,341 L708,341 L708,337 L711,337 z M707,337 L707,341 L704,341 L704,337 L707,337 z M707,342 L707,346.5 L704,346.5 L704,342 L707,342 z M711,342 L711,346.5 L708,346.5 L708,342 L711,342 z M702.5,335.5 L702.5,348 L712.5,348 L712.5,335.5 L702.5,335.5 z" fill="#000000" id="poi-window-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>