Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9420)
+++ trunk/data/defaultpresets.xml	(revision 9423)
@@ -6152,6 +6152,6 @@
         </item>
     </group> <!-- Military -->
-    <group name="Power" icon="presets/power.png">
-        <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
+    <group name="Power" icon="styles/standard/power/power.svg">
+        <item name="Power Plant" icon="styles/standard/power/plant.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=plant"
@@ -6177,5 +6177,5 @@
             </optional>
         </item> <!-- Power Plant -->
-        <group name="Power Generator" icon="presets/power.png">
+        <group name="Power Generator" icon="styles/standard/power/generator.svg">
             <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="biofuel" />
@@ -6336,5 +6336,5 @@
         </group> <!-- Power Generator -->
         <separator/>
-        <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
+        <item name="Power Substation" icon="styles/standard/power/substation.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6353,5 +6353,5 @@
             </optional>
         </item> <!-- Power Substation -->
-        <item name="Power Transformer" icon="styles/standard/misc/landmark/power/transformer.png" type="node,closedway" preset_name_label="true">
+        <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
@@ -6369,5 +6369,5 @@
             </optional>
         </item> <!-- Power Transformer -->
-        <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
+        <item name="Power Switchgear" icon="styles/standard/power/switchgear.svg" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6385,5 +6385,5 @@
             </optional>
         </item> <!-- Power Switchgear -->
-        <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
+        <item name="Power Busbar" icon="styles/standard/power/busbar.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6396,5 +6396,5 @@
             <reference ref="power_line_extra" />
         </item> <!-- Power Busbar -->
-        <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
+        <item name="Power Bay" icon="styles/standard/power/bay.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6407,5 +6407,5 @@
             <reference ref="power_line_extra" />
         </item> <!-- Power Bay -->
-        <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
+        <item name="Power Switch" icon="styles/standard/power/switch.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
             <space />
@@ -6413,5 +6413,5 @@
         </item> <!-- Power Switch -->
         <separator/>
-        <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
+        <item name="Power Converter" icon="styles/standard/power/converter.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6429,5 +6429,5 @@
             </optional>
         </item> <!-- Power Converter -->
-        <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
+        <item name="Power Compensator" icon="styles/standard/power/compensator.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6445,8 +6445,8 @@
         </item> <!-- Power Compensator -->
         <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"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
+        <item name="Cable Distribution Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable_distribution_cabinet" />
             <space />
             <key key="power" value="cable_distribution_cabinet" />
@@ -6455,5 +6455,5 @@
         </item> <!-- Cable Distribution Cabinet -->
         <separator/>
-        <item name="Power Tower" icon="styles/standard/misc/landmark/power/tower_small.png" type="node" preset_name_label="true">
+        <item name="Power Tower" icon="styles/standard/power/tower.svg" 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"
@@ -6482,5 +6482,5 @@
             </optional>
         </item> <!-- Power Tower -->
-        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
+        <item name="Pole" icon="styles/standard/power/pole.svg" 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"
@@ -6500,5 +6500,5 @@
             <reference ref="ref_operator_branch" />
         </item> <!-- Pole -->
-        <item name="Pole with Transformer" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
+        <item name="Pole with Transformer" icon="styles/standard/power/pole_transformer.svg" 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"
@@ -6525,5 +6525,5 @@
             </optional>
         </item> <!-- Pole with Transformer-->
-        <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
+        <item name="Power Line" icon="styles/standard/power/line.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
@@ -6545,5 +6545,5 @@
             </optional>
         </item> <!-- Power Line -->
-        <item name="Power Cable" icon="presets/power.png" type="way" preset_name_label="true">
+        <item name="Power Cable" icon="styles/standard/power/cable.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"