diff --git a/assets/layers/pipeline/pipeline.json b/assets/layers/pipeline/pipeline.json
new file mode 100644
index 0000000000..aa623a245e
--- /dev/null
+++ b/assets/layers/pipeline/pipeline.json
@@ -0,0 +1,52 @@
+{
+  "id": "pipeline",
+  "name": {
+    "en": "Pipelines",
+    "nl": "Pijpleidingen"
+  },
+  "description": {
+    "en": "Layer showing pipelines for transport of various substances.",
+    "nl": "Laag die pijpleidingen toont voor het transport van verschillende stoffen."
+  },
+  "source": {
+    "osmTags": "man_made=pipeline"
+  },
+  "minzoom": 13,
+  "title": {
+    "render": {
+      "en": "Pipeline",
+      "nl": "Pijpleiding"
+    }
+  },
+  "pointRendering": [
+    {
+      "location": [
+        "point"
+      ],
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "black"
+        }
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "width": 4,
+      "color": {
+        "render": "black",
+        "mappings": [
+          {
+            "if": "location=underground",
+            "then": "gray"
+          }
+        ]
+      }
+    }
+  ],
+  "tagRenderings": [
+    "images"
+  ],
+  "allowMove": false
+}
\ No newline at end of file
diff --git a/assets/layers/power_generator/power_generator.json b/assets/layers/power_generator/power_generator.json
index e0cc9fbaca..2e955efdb9 100644
--- a/assets/layers/power_generator/power_generator.json
+++ b/assets/layers/power_generator/power_generator.json
@@ -205,13 +205,6 @@
         "en": "What method does this generator use to produce electricity?",
         "nl": "Welke methode gebruikt deze generator om elektriciteit te produceren?"
       },
-      "condition": {
-        "and": [
-          "generator:source~*",
-          "generator:source!=wave",
-          "generator:source!=geothermal"
-        ]
-      },
       "mappings": [
         {
           "if": "generator:method=fission",
@@ -334,7 +327,14 @@
           },
           "hideInAnswer": "generator:source!=biogas"
         }
-      ]
+      ],
+      "condition": {
+        "and": [
+          "generator:source~*",
+          "generator:source!=wave",
+          "generator:source!=geothermal"
+        ]
+      }
     }
   ],
   "allowMove": {
diff --git a/assets/themes/infrastructure/infrastructure.json b/assets/themes/infrastructure/infrastructure.json
index f919b93056..a9e1d32ecb 100644
--- a/assets/themes/infrastructure/infrastructure.json
+++ b/assets/themes/infrastructure/infrastructure.json
@@ -24,6 +24,7 @@
       }
     },
     "power_generator",
+    "pipeline",
     "street_cabinet",
     {
       "builtin": "utility_pole",