diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7aab8cdca..1d3035c26 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8652,7 +8652,7 @@
             "name": "Watermill"
         },
         "man_made/windmill": {
-            "icon": "buddhism",
+            "icon": "poi-windmill",
             "fields": [
                 "building_area"
             ],
diff --git a/data/presets/presets/man_made/windmill.json b/data/presets/presets/man_made/windmill.json
index 87f8874d8..a2cca5abf 100644
--- a/data/presets/presets/man_made/windmill.json
+++ b/data/presets/presets/man_made/windmill.json
@@ -1,5 +1,5 @@
 {
-    "icon": "buddhism",
+    "icon": "poi-windmill",
     "fields": [
         "building_area"
     ],
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index df849d8b5..1be3f332b 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -270,6 +270,7 @@
     "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-foot-shape":              { "fill": "currentColor" },
     "poi-traffic-signals-shape":   { "fill": "currentColor" },
@@ -285,6 +286,7 @@
     "poi-junction-shape":          { "fill": "currentColor" },
     "poi-social-facility-shape":   { "fill": "currentColor" },
     "poi-elevator-shape":          { "fill": "currentColor" },
+    "poi-windmill-shape":          { "fill": "currentColor" },
 
     "poi-vending-machine":      { "viewBox": "400 335 15 15" },
     "poi-dice":                 { "viewBox": "415 335 15 15" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index b730fce10..7a05281bb 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 d5c27a6c5..d5863eab0 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -354,6 +354,9 @@
     <g id="poi-vending-machine">
       <path d="M412,335 C412.552,335 413,335.448 413,336 L413,349 C413,349.552 412.552,350 412,350 L403,350 C402.448,350 402,349.552 402,349 L402,336 C402,335.448 402.448,335 403,335 L412,335 z M409,346 L406,346 L406,347.5 L409,347.5 L409,346 z M409,341 L408,341 L408,342 L409,342 L409,341 z M405,341 L404,341 L404,342 L405,342 L405,341 z M407,341 L406,341 L406,342 L407,342 L407,341 z M411,341 L410,341 L410,342 L411,342 L411,341 z M411,339 L410,339 L410,340 L411,340 L411,339 z M407,339 L406,339 L406,340 L407,340 L407,339 z M405,339 L404,339 L404,340 L405,340 L405,339 z M409,339 L408,339 L408,340 L409,340 L409,339 z M409,337 L408,337 L408,338 L409,338 L409,337 z M405,337 L404,337 L404,338 L405,338 L405,337 z M407,337 L406,337 L406,338 L407,338 L407,337 z M411,337 L410,337 L410,338 L411,338 L411,337 z" fill="#000000" id="poi-vending-machine-shape"/>
     </g>
+    <g id="poi-windmill">
+      <path d="M614.833,320 L613.833,321 L616.5,323.667 L617.167,322.333 L614.833,320 z M613.667,321.167 L613.167,321.667 L616,324.5 L616.5,324 L613.667,321.167 z M621.667,321.167 L618.833,324 L619.333,324.5 L622.167,321.667 L621.667,321.167 z M622.333,321.833 L619.667,324.5 L621,325.167 L623.333,322.833 L622.333,321.833 z M617.667,323.167 L614.552,326.281 L614.333,326.167 L612,328.5 L613,329.5 L614.271,328.229 L614.229,328.604 L613.167,329.667 L613.667,330.167 L614.094,329.74 L613.667,333.333 C612,333.667 611,335 611,335 L624.333,335 C624.333,335 623.333,333.667 621.667,333.333 L621.333,330.5 L621.5,330.333 L621.292,330.156 L621.24,329.74 L621.667,330.167 L622.167,329.667 L621.104,328.604 L620.833,326.333 L617.667,323.167 z M617.167,327 L618.167,327 L618.5,329 L616.833,329 L617.167,327 z" fill="#000000" id="poi-windmill-shape"/>
+    </g>
     <g id="poi-elevator">
       <path d="M602.5,335 C602.5,335 598,328 598,328 L607,328 C607,328 602.5,335 602.5,335 z M602.5,320 C602.5,320 607,327 607,327 L598,327 C598,327 602.5,320 602.5,320 z" fill="#000000" id="poi-elevator-shape"/>
     </g>