Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7965)
+++ trunk/data/defaultpresets.xml	(revision 7967)
@@ -5533,5 +5533,5 @@
         </item> <!-- Power Transformer -->
         <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
@@ -5609,5 +5609,5 @@
         <separator/>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
@@ -5618,5 +5618,5 @@
         </item> <!-- Cable Distribution Cabinet -->
         <separator/>
-        <item name="Power Tower" icon="icons/power_tower_high2.n.16.png" type="node" preset_name_label="true">
+        <item name="Power Tower" icon="styles/standard/misc/landmark/power/tower_small.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
@@ -5643,5 +5643,5 @@
             </optional>
         </item> <!-- Power Tower -->
-        <item name="Pole" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
+        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
@@ -5658,5 +5658,5 @@
             <reference ref="ref_operator_branch" />
         </item> <!-- Pole -->
-        <item name="Pole with Transformer" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
+        <item name="Pole with Transformer" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 7965)
+++ trunk/data/validator/combinations.mapcss	(revision 7967)
@@ -108,4 +108,5 @@
 /* {0.tag} without {1.key} */
 *[aeroway=terminal][!building],
+*[power=generator][!generator:source],
 *[amenity=place_of_worship][!religion] {
   throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}");
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 7965)
+++ trunk/data/validator/geometry.mapcss	(revision 7967)
@@ -49,4 +49,5 @@
 node[waterway=riverbank],
 node[man_made=bridge],
+node[power=plant],
 node[source:outline] {
   throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
@@ -62,4 +63,5 @@
 way[entrance],
 way[man_made=survey_point],
+way[power=pole],
 way[natural=peak],
 way[natural=saddle],