Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 14298)
+++ trunk/data/defaultpresets.xml	(revision 14299)
@@ -7866,5 +7866,5 @@
                 <reference ref="power_output" />
             </item> <!-- Waste Power Generator -->
-            <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
+            <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="hydro" />
                 <reference ref="power_generator" />
@@ -7878,5 +7878,5 @@
                 <reference ref="power_output" />
             </item> <!-- Water Turbine -->
-            <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
+            <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="tidal" />
                 <reference ref="power_generator" />
@@ -7949,5 +7949,5 @@
             <reference ref="optional_transformer_rating_phases_devices_windings" />
         </item> <!-- Power Transformer -->
-        <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
+        <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:power=switchgear" />
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 14298)
+++ trunk/data/validator/geometry.mapcss	(revision 14299)
@@ -53,5 +53,5 @@
 }
 
-/* {0} on a node, should be an area; #10679 #16528 */
+/* {0} on a node, should be an area; #10679 #16528 #16792 */
 node[golf=green],
 node[golf=bunker],
@@ -78,4 +78,5 @@
 node[aeroway=apron],
 node[power=plant],
+node[power=switchgear],
 node[building:part],
 node[source:outline] {
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 14298)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 14299)
@@ -1211,4 +1211,5 @@
 area[power=compensator],
 area[power=converter],
+area[power=switchgear],
 area[power=generator] {
     fill-color: power#eeeeee;
@@ -1232,8 +1233,4 @@
 node[power=terminal] {
     icon-image: "presets/power/terminal.svg";
-    set icon_z17;
-}
-node[power=switchgear] {
-    icon-image: "presets/power/switchgear.svg";
     set icon_z17;
 }