diff --git a/assets/layers/power_generator/power_generator.json b/assets/layers/power_generator/power_generator.json
new file mode 100644
index 0000000000..4288f66671
--- /dev/null
+++ b/assets/layers/power_generator/power_generator.json
@@ -0,0 +1,47 @@
+{
+  "id": "power_generator",
+  "name": {
+    "en": "Power Generators",
+    "nl": "Stroomgeneratoren"
+  },
+  "description": {
+    "en": "Layer showing generators that produce electricity, such as solar panels, wind turbines, and other types of power generation.",
+    "nl": "Laag met generatoren die elektriciteit produceren, zoals zonnepanelen, windturbines en andere soorten energieopwekking."
+  },
+  "source": {
+    "osmTags": "power=generator"
+  },
+  "minzoom": 12,
+  "title": {
+    "render": {
+      "en": "Power Generator",
+      "nl": "Stroomgenerator"
+    }
+  },
+  "pointRendering": [
+    {
+      "marker": [
+        {
+          "icon": "lightning",
+          "color": "#ffcc00"
+        }
+      ],
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "color": "#ffcc00",
+      "width": 4,
+      "fillColor": "#ffcc00ac"
+    }
+  ],
+  "tagRenderings": [],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  }
+}
\ No newline at end of file
diff --git a/assets/layers/power_line/power_line.json b/assets/layers/power_line/power_line.json
index 1c73fab0a1..b2a8ce50cf 100644
--- a/assets/layers/power_line/power_line.json
+++ b/assets/layers/power_line/power_line.json
@@ -21,9 +21,8 @@
     {
       "marker": [
         {
-          "icon": {
-            "render": "bug"
-          }
+          "icon": "lightning",
+          "color": "#ffcc00"
         }
       ],
       "location": [
@@ -35,8 +34,7 @@
     {
       "color": "#ffcc00",
       "width": 6,
-      "dashArray": "5 5",
-      "imageAlongWay": "./assets/svg/lightning.svg"
+      "dashArray": "5 5"
     }
   ],
   "tagRenderings": [
@@ -130,8 +128,5 @@
       }
     }
   ],
-  "allowMove": {
-    "enableImproveAccuracy": true,
-    "enableRelocation": false
-  }
+  "allowMove": false
 }
\ No newline at end of file
diff --git a/assets/themes/infrastructure/infrastructure.json b/assets/themes/infrastructure/infrastructure.json
index df92efa322..9cfcafaba2 100644
--- a/assets/themes/infrastructure/infrastructure.json
+++ b/assets/themes/infrastructure/infrastructure.json
@@ -14,6 +14,13 @@
     "power_tower",
     "power_pole",
     "power_line",
+    {
+      "builtin": "windturbine",
+      "override": {
+        "minzoom": 14
+      }
+    },
+    "power_generator",
     "street_cabinet",
     {
       "builtin": "utility_pole",