diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 2358022254..12ff6647a8 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1702,13 +1702,27 @@ area|z17-[power=station],
node|z17-[power=plant],
area|z17-[power=plant],
/* Skip individual solar generators, because there are a lot of mapped panels */
-/* ToDo: Make separate wind generator icon? Because of a good landmark */
node|z17-[power=generator][generator:source!=solar],
area|z17-[power=generator][generator:source!=solar],
node|z19-[power=substation],
area|z19-[power=substation],
{icon-image: power-m.svg;font-size: 11;}
+
+node|z15-[power=generator][generator:source=wind],
+area|z15-[power=generator][generator:source=wind],
+{icon-image: dot-m.svg;}
+node|z18-[power=generator][generator:source=wind],
+area|z18-[power=generator][generator:source=wind],
+{icon-image: wind_turbine-m.svg;text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
+
+node|z15-[power=plant][plant:source=wind],
+area|z15-[power=plant][plant:source=wind],
+{icon-image: power_plant_wind-m.svg;}
+node|z16-[power=plant][plant:source=wind],
+area|z16-[power=plant][plant:source=wind],
+{text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
+
node|z17-[amenity=shower],
area|z17-[amenity=shower]
{icon-image: shower-m.svg;}
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index cbb9725dfa..345e351434 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -1173,6 +1173,13 @@ amenity-parking_entrance-permissive # icon z17- (also has captio
building # caption z16- (also has area z14-)
building-garage # caption z16- (also has area z14-)
building-has_parts # caption z16- (also has area z14-)
+power-plant # icon z17-
+power-plant-coal # icon z17-
+power-plant-gas # icon z17-
+power-plant-hydro # icon z17-
+power-plant-solar # icon z17-
+power-plant-wind # icon z17-
+power-station # icon z17- (also has caption(optional) z17-)
=== 230
barrier-entrance # icon z16- (also has caption(optional) z16-)
@@ -1213,13 +1220,6 @@ power-generator # icon z17-
power-generator-gas # icon z17-
power-generator-hydro # icon z17-
power-generator-wind # icon z17-
-power-plant # icon z17-
-power-plant-coal # icon z17-
-power-plant-gas # icon z17-
-power-plant-hydro # icon z17-
-power-plant-solar # icon z17-
-power-plant-wind # icon z17-
-power-station # icon z17- (also has caption(optional) z17-)
=== 120
amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-)
diff --git a/data/styles/clear/style-clear/symbols/power_plant_wind-m.svg b/data/styles/clear/style-clear/symbols/power_plant_wind-m.svg
new file mode 100644
index 0000000000..9886650f0d
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/power_plant_wind-m.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/wind_turbine-m.svg b/data/styles/clear/style-clear/symbols/wind_turbine-m.svg
new file mode 100644
index 0000000000..da307bd37a
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/wind_turbine-m.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/power_plant_wind-m.svg b/data/styles/clear/style-night/symbols/power_plant_wind-m.svg
new file mode 100644
index 0000000000..4e89acc5b1
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/power_plant_wind-m.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/wind_turbine-m.svg b/data/styles/clear/style-night/symbols/wind_turbine-m.svg
new file mode 100644
index 0000000000..b488a800fe
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/wind_turbine-m.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index b3ed35256a..b2432d171f 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -318,6 +318,17 @@ node|z14-[highway=ford],
node|z14-[power=tower],
{icon-image: power-tower-m.svg;}
+node|z13-[power=generator][generator:source=wind],
+area|z13-[power=generator][generator:source=wind],
+{icon-image: dot-m.svg;}
+node|z16-[power=generator][generator:source=wind],
+area|z16-[power=generator][generator:source=wind],
+{icon-image: wind_turbine-m.svg;text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
+
+node|z13-[power=plant][plant:source=wind],
+area|z13-[power=plant][plant:source=wind],
+{icon-image: power_plant_wind-m.svg;}
+
node|z12-[man_made=flagpole],
node|z13-[man_made=mast],
{icon-image: dot-m.svg;}
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index ea4ed07e79..d0fe044768 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1173,6 +1173,13 @@ amenity-parking_entrance-permissive # icon z17- (also has captio
building # caption z16- (also has area z14-)
building-garage # caption z16- (also has area z14-)
building-has_parts # caption z16- (also has area z14-)
+power-plant # icon z17-
+power-plant-coal # icon z17-
+power-plant-gas # icon z17-
+power-plant-hydro # icon z17-
+power-plant-solar # icon z17-
+power-plant-wind # icon z17-
+power-station # icon z17- (also has caption(optional) z17-)
=== 230
barrier-entrance # icon z16- (also has caption(optional) z16-)
@@ -1213,13 +1220,6 @@ power-generator # icon z17-
power-generator-gas # icon z17-
power-generator-hydro # icon z17-
power-generator-wind # icon z17-
-power-plant # icon z17-
-power-plant-coal # icon z17-
-power-plant-gas # icon z17-
-power-plant-hydro # icon z17-
-power-plant-solar # icon z17-
-power-plant-wind # icon z17-
-power-station # icon z17- (also has caption(optional) z17-)
=== 120
amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-)