diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index f82114b43..e23de6703 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -276,104 +276,6 @@
"restriction": { "viewBox": "480 260 60 60" },
"multipolygon": { "viewBox": "540 260 60 60" },
- "poi-foot": { "viewBox": "400 320 15 15" },
- "poi-traffic-signals": { "viewBox": "415 320 15 15" },
- "poi-yield": { "viewBox": "430 320 15 15" },
- "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-bench": { "viewBox": "520 320 15 15" },
- "poi-clock": { "viewBox": "535 320 15 15" },
- "poi-ruins": { "viewBox": "550 320 15 15" },
- "poi-junction": { "viewBox": "565 320 15 15" },
- "poi-social-facility": { "viewBox": "580 320 15 15" },
- "poi-elevator": { "viewBox": "595 320 15 15" },
- "poi-windmill": { "viewBox": "610 320 15 15" },
- "poi-hinduist": { "viewBox": "625 320 15 15" },
- "poi-shintoist": { "viewBox": "640 320 15 15" },
- "poi-buffer-stop": { "viewBox": "655 320 15 15" },
- "poi-railway-signals": { "viewBox": "670 320 15 15" },
- "poi-monorail": { "viewBox": "685 320 15 15" },
- "poi-tram": { "viewBox": "700 320 15 15" },
- "poi-subway": { "viewBox": "715 320 15 15" },
- "poi-light-rail": { "viewBox": "730 320 15 15" },
- "poi-trolleybus": { "viewBox": "745 320 15 15" },
-
- "poi-foot-shape": { "fill": "currentColor" },
- "poi-traffic-signals-shape": { "fill": "currentColor" },
- "poi-yield-shape": { "fill": "currentColor" },
- "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" },
- "poi-bench-shape": { "fill": "currentColor" },
- "poi-clock-shape": { "fill": "currentColor" },
- "poi-ruins-shape": { "fill": "currentColor" },
- "poi-junction-shape": { "fill": "currentColor" },
- "poi-social-facility-shape": { "fill": "currentColor" },
- "poi-elevator-shape": { "fill": "currentColor" },
- "poi-windmill-shape": { "fill": "currentColor" },
- "poi-hinduist-shape": { "fill": "currentColor" },
- "poi-shintoist-shape": { "fill": "currentColor" },
- "poi-buffer-stop-shape": { "fill": "currentColor" },
- "poi-railway-signals-shape": { "fill": "currentColor" },
- "poi-monorail-shape": { "fill": "currentColor" },
- "poi-tram-shape": { "fill": "currentColor" },
- "poi-subway-shape": { "fill": "currentColor" },
- "poi-light-rail-shape": { "fill": "currentColor" },
- "poi-trolleybus-shape": { "fill": "currentColor" },
-
- "poi-vending-machine": { "viewBox": "400 335 15 15" },
- "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-silo": { "viewBox": "475 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" },
- "poi-chimney": { "viewBox": "550 335 15 15" },
- "poi-bowling": { "viewBox": "565 335 15 15" },
- "poi-binoculars": { "viewBox": "580 335 15 15" },
- "poi-wind": { "viewBox": "595 335 15 15" },
- "poi-nuclear": { "viewBox": "610 335 15 15" },
- "poi-sikhist": { "viewBox": "625 335 15 15" },
- "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-window": { "viewBox": "700 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" },
- "poi-silo-shape": { "fill": "currentColor" },
- "poi-shower-shape": { "fill": "currentColor" },
- "poi-tool-shape": { "fill": "currentColor" },
- "poi-tower-shape": { "fill": "currentColor" },
- "poi-military-shape": { "fill": "currentColor" },
- "poi-chimney-shape": { "fill": "currentColor" },
- "poi-bowling-shape": { "fill": "currentColor" },
- "poi-binoculars-shape": { "fill": "currentColor" },
- "poi-wind-shape": { "fill": "currentColor" },
- "poi-nuclear-shape": { "fill": "currentColor" },
- "poi-sikhist-shape": { "fill": "currentColor" },
- "poi-taoist-shape": { "fill": "currentColor" },
- "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" },
-
- "poi-vertex-shape": { "fill": "currentColor" },
-
"turn-yes": { "viewBox": "200 320 44 24" },
"turn-no": { "viewBox": "244 320 44 24" },
"turn-only": { "viewBox": "288 320 44 24" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index bc6c290fc..2fedb677e 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 44c4f87a8..11d9e235e 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -320,146 +320,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-