Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 18210)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -472,9 +472,26 @@
             <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
         </optional>
     </chunk>
-    <chunk id="operator_substance">
-        <text key="operator" text="Operator" />
-        <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
+    <chunk id="substance">
+        <combo key="substance" text="Substance" values="water,hot_water,steam,sewage,gas,oil" values_sort="false" values_searchable="true" />
+    </chunk>
+    <chunk id="handle">
+        <optional text="Only in case of manual actuator or manual mechanical drive: ">
+        <combo key="handle" text="Handle" values="wheel,cross,lever,crank,button,no" values_context="handle" values_sort="false" values_searchable="true" />
+        <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
+        </optional>
+        <space />
+    </chunk>
+    <chunk id="pumpMechanism">
+        <combo key="pump_mechanism" text="Pump mechanism" values="gear,screw,progressive_cavity,diaphragm,peristaltic,rope,rotary_vane,piston,centrifugal,axial_flow,eductor_jet,ram,siphon,pulser,airlift" values_sort="false" values_searchable="true" />
+    </chunk>
+    <chunk id="mechCoupling">
+        <combo key="mechanical_coupling" text="Mechanical coupling" values="direct,reducer,gearbox,nodding_donkey,belt" values_sort="false" values_searchable="true" />
+    </chunk>
+    <chunk id="pump_details">
+        <reference ref="pumpMechanism" />
+        <combo key="mechanical_driver" text="Mechanical driver" values="manual,electric_motor,combustion_engine,reciprocating_solenoid,cylinder,turbine" values_sort="false" values_searchable="true" />
+        <reference ref="mechCoupling" />
     </chunk>
     <chunk id="support">
         <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
@@ -2045,6 +2062,7 @@
                 <reference ref="name_operator" />
                 <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
                 <text key="pressure" text="Pressure (bar)" />
+                <text key="flow_rate" text="Flow rate with unit of measure" />
                 <combo key="material" text="Material" values="metal,steel" />
             </optional>
         </item> <!-- Penstock -->
@@ -5602,38 +5620,83 @@
             <link wiki="Tag:man_made=chimney" />
             <space />
             <key key="man_made" value="chimney" />
-            <reference ref="name_operator" />
+            <reference ref="name_ref_operator" />
             <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Chimney -->
         <item name="Kiln" icon="presets/misc/kiln.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=kiln" />
             <space />
             <key key="man_made" value="kiln" />
-            <reference ref="name_operator" />
+            <reference ref="name_ref_operator" />
             <combo key="product" text="Product" values="lime,charcoal,bricks" />
         </item> <!-- Kiln -->
         <item name="Windmill" icon="presets/landmark/windmill.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=windmill" />
             <space />
             <key key="man_made" value="windmill" />
-            <text key="name" text="Name" />
+            <reference ref="name_ref_operator" />
         </item> <!-- Windmill -->
+        <item name="Windpump" icon="presets/landmark/windpump.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=windpump" />
+            <space />
+            <key key="man_made" value="windpump" />
+            <reference ref="substance" />
+            <optional>
+                <reference ref="pumpMechanism" />
+                <reference ref="mechCoupling" />
+                <reference ref="handle" />
+                <text key="pressure" text="Pressure (bar)" />
+                <text key="flow_rate" text="Flow rate with unit of measure" />
+                <space />
+                <reference ref="name_ref_operator" />
+                <text key="manufacturer" text="Manufacturer" />
+            </optional>
+        </item> <!-- Windpump-->
+        <item name="Pump" icon="presets/landmark/pump.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=pump" />
+            <space />
+            <key key="man_made" value="pump" />
+            <reference ref="substance" />
+            <optional>
+                <reference ref="pump_details" />
+                <reference ref="handle" />
+                <text key="pressure" text="Pressure (bar)" />
+                <text key="flow_rate" text="Flow rate with unit of measure" />
+                <space />
+                <reference ref="name_ref_operator" />
+                <text key="manufacturer" text="Manufacturer" />
+                <combo key="location" text="Location" values="outdoor,indoor,underground,underwater" values_context="pump" />
+            </optional>
+        </item> <!-- Pump -->
+        <item name="Petroleum Well" icon="presets/landmark/petroleum_well.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=petroleum_well" />
+            <space />
+            <key key="man_made" value="petroleum_well" />
+            <combo key="substance" text="Substance" values="gas,oil" />
+            <optional>
+                <reference ref="pump_details" />
+                <reference ref="handle" />
+                <text key="pressure" text="Pressure (bar)" />
+                <text key="flow_rate" text="Flow rate with unit of measure" />
+                <space />
+                <reference ref="name_ref_operator" />
+                <text key="manufacturer" text="Manufacturer" />
+            </optional>
+        </item> <!-- Petroleum Well -->
         <item name="Gasometer" icon="presets/landmark/gasometer.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=gasometer" />
-            <space />
             <key key="man_made" value="gasometer" />
             <optional>
-                <reference ref="name_operator" />
+                <reference ref="name_ref_operator" />
                 <combo key="building" text="Building" values="gasometer" values_context="building" />
                 <text key="height" text="Height (meters)" length="7" />
             </optional>
         </item> <!-- Gasometer -->
         <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=silo" />
-            <space />
             <key key="man_made" value="silo" />
             <optional>
-                <reference ref="name_operator" />
+                <reference ref="name_ref_operator" />
                 <combo key="building" text="Building" values="silo" values_context="building" />
                 <text key="height" text="Height (meters)" length="7" />
             </optional>
@@ -5642,7 +5705,7 @@
             <link wiki="Tag:man_made=storage_tank" />
             <key key="man_made" value="storage_tank" />
             <optional>
-                <reference ref="name_operator" />
+                <reference ref="name_ref_operator" />
                 <combo key="building" text="Building" values="storage_tank" values_context="building" />
                 <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
                 <text key="height" text="Height (meters)" length="7" />
@@ -5650,27 +5713,24 @@
         </item> <!-- Storage Tank -->
         <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=bunker_silo" />
-            <space />
             <key key="man_made" value="bunker_silo" />
             <optional>
-                <reference ref="name_operator" />
+                <reference ref="name_ref_operator" />
             </optional>
         </item> <!-- Bunker Silo -->
         <item name="Crane" icon="presets/landmark/crane.svg" type="node,way,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=crane" />
-            <space />
             <key key="man_made" value="crane" />
             <optional>
                 <combo key="crane:type" text="Type" values="floor-mounted_crane,gantry_crane,portal_crane,travel_lift" />
-                <reference ref="name_operator" />
+                <reference ref="name_ref_operator" />
             </optional>
         </item> <!-- Crane -->
         <item name="Goods conveyor" icon="presets/landmark/goods_conveyor.svg" type="way" preset_name_label="true">
             <link wiki="Tag:man_made=goods_conveyor" />
-            <space />
             <key key="man_made" value="goods_conveyor" />
             <optional>
-                <reference ref="name_operator" />
+                <reference ref="name_ref_operator" />
                 <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
                 <checkgroup columns="3">
                     <check key="covered" text="Covered" />
@@ -5683,8 +5743,8 @@
             <link wiki="Tag:man_made=pumping_station" />
             <space />
             <key key="man_made" value="pumping_station" />
-            <reference ref="name_ref" />
-            <reference ref="operator_substance" />
+            <reference ref="name_ref_operator" />
+            <reference ref="substance" />
         </item> <!-- Pumping station -->
         <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=mineshaft" />
@@ -5945,29 +6005,29 @@
             <link wiki="Tag:man_made=pipeline" />
             <space />
             <key key="man_made" value="pipeline" />
-            <reference ref="name_ref" />
-            <reference ref="operator_substance" />
+            <reference ref="name_ref_operator" />
+            <reference ref="substance" />
             <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
             <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
             <text key="pressure" text="Pressure (bar)" />
+            <text key="flow_rate" text="Flow rate with unit of measure" />
         </item> <!-- Pipeline -->
         <item name="Pipeline Substation" icon="presets/misc/pipeline_substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:pipeline=substation" />
             <space />
             <key key="pipeline" value="substation" />
             <text key="name" text="Name" />
-            <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" />
-            <text key="ref" text="Reference" />
-            <reference ref="operator_substance" />
+            <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" values_searchable="true" />
+            <reference ref="ref_operator" />
+            <reference ref="substance" />
         </item> <!-- Pipeline Substation -->
         <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
             <link wiki="Tag:pipeline=valve" />
             <space />
             <key key="pipeline" value="valve" />
-            <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
-            <combo key="actuator" text="Actuator" values="electric_motor,hydraulic_cylinder,manual,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" />
-            <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
-            <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
+            <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" values_searchable="true" />
+            <combo key="actuator" text="Actuator" values="manual,electric_motor,hydraulic_cylinder,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" values_searchable="true" values_sort="false" />
+            <reference ref="handle" />
             <combo key="sensor:position" text="Position sensor" values="optical,mechanical,inductive,yes" />
             <reference ref="ref_operator" />
         </item> <!-- Pipeline Valve -->
@@ -5975,7 +6035,7 @@
             <link wiki="Key:marker" />
             <space />
             <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
-            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
+            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true" />
             <optional>
                 <reference ref="ref_operator" />
                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
@@ -6023,9 +6083,14 @@
             <link wiki="Tag:man_made=water_well" />
             <space />
             <key key="man_made" value="water_well" />
+            <combo key="pump" text="Pump" values="yes,no,manual,powered" values_sort="false"/>
             <optional>
-                <text key="name" text="Name" />
-                <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
+                <reference ref="pump_details" />
+                <reference ref="handle" />
+                <text key="pressure" text="Pressure (bar)" />
+                <text key="flow_rate" text="Flow rate with unit of measure" />
+                <space />
+                <reference ref="name_ref_operator" />
             </optional>
         </item> <!-- Water Well -->
     </group> <!-- Water -->
Index: resources/data/validator/combinations.mapcss
===================================================================
--- resources/data/validator/combinations.mapcss	(revision 18112)
+++ resources/data/validator/combinations.mapcss	(working copy)
@@ -125,11 +125,18 @@
   group: tr("missing tag");
 }
 
-/* {0.tag} without {1.key} (warning level), #18411, #18246 */
+/* {0.key} without {1.tag}, {2.tag}, {3.tag} or {4.tag}, #20530 */
+*[pump_mechanism][man_made!=pump][man_made!=windpump][man_made!=water_well][man_made!=petroleum_well] {
+  throwWarning: tr("{0} without {1}, {2}, {3} or {4}", "{0.key}", "{1.tag}", "{2.tag}", "{3.tag}", "{4.tag}");
+  group: tr("missing tag");
+}
+
+/* {0.tag} without {1.key} (warning level), #18411, #18246, #20530 */
 way[railway=construction][!construction],
 way[highway=construction][!construction],
 node[traffic_sign=maxspeed][!maxspeed][!/^maxspeed:.+/],
-node[actuator=manual][!handle],
+*[actuator=manual][!handle],
+*[mechanical_driver=manual][!handle],
 node[emergency=fire_hydrant][!fire_hydrant:type],
 way[     boundary=administrative][!admin_level],
 relation[boundary=administrative][!admin_level],
@@ -245,7 +252,7 @@
   group: tr("missing tag");
 }
 
-/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
+/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530 */
 *[power=plant][/^generator:/],
 *[power=generator][/^plant:/],
 *[power=plant][voltage],
@@ -255,6 +262,8 @@
 node[transformer=distribution][voltage][power=pole],
 *[amenity=vending_machine][shop],
 *[noname?][name],
+*[actuator][handle][actuator !~ /(^|;)manual(;|$)/],
+*[mechanical_driver][handle][mechanical_driver !~ /(^|;)manual(;|$)/],
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
 way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no],
 way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
Index: resources/data/validator/ignoretags.cfg
===================================================================
--- resources/data/validator/ignoretags.cfg	(revision 18220)
+++ resources/data/validator/ignoretags.cfg	(working copy)
@@ -173,7 +173,6 @@
 K:waterway=rapids
 K:bicycle=dismount
 K:wall=no
-K:man_made=petroleum_well
 K:man_made=yes
 K:man_made=clearcut
 K:man_made=maypole
Index: resources/styles/standard/elemstyles.mapcss
===================================================================
--- resources/styles/standard/elemstyles.mapcss	(revision 18094)
+++ resources/styles/standard/elemstyles.mapcss	(working copy)
@@ -1552,6 +1552,8 @@
     width: 2;
     color: pipeline#660000;
 }
+area[man_made=petroleum_well],
+area[man_made=pump],
 area[pipeline=substation] {
     fill-color: pipeline_substation#eeeeee;
 }
@@ -1571,6 +1573,54 @@
     icon-image: "presets/misc/manhole.svg";
     set icon_z17;
 }
+node[man_made=petroleum_well] {
+    icon-image: "presets/landmark/petroleum_well.svg";
+    set icon_z17;
+}
+node[man_made=petroleum_well][substance=gas] {
+    icon-image: "presets/landmark/gas_well.svg";
+    set icon_z17;
+}
+node[man_made=petroleum_well][substance=oil] {
+    icon-image: "presets/landmark/oil_well.svg";
+    set icon_z17;
+}
+node[man_made=petroleum_well][mechanical_coupling=nodding_donkey] {
+    icon-image: "presets/landmark/well_donkey.svg";
+    set icon_z17;
+}
+node[man_made=petroleum_well][mechanical_coupling=nodding_donkey][substance=gas] {
+    icon-image: "presets/landmark/gas_well_donkey.svg";
+    set icon_z17;
+}
+node[man_made=petroleum_well][mechanical_coupling=nodding_donkey][substance=oil] {
+    icon-image: "presets/landmark/oil_well_donkey.svg";
+    set icon_z17;
+}
+node[man_made=pump] {
+    icon-image: "presets/landmark/pump.svg";
+    set icon_z17;
+}
+node[man_made=pump][substance=gas] {
+    icon-image: "presets/landmark/pump_gas.svg";
+    set icon_z17;
+}
+node[man_made=pump][substance=oil] {
+    icon-image: "presets/landmark/pump_oil.svg";
+    set icon_z17;
+}
+node[man_made=pump][substance=sewage] {
+    icon-image: "presets/landmark/pump_sewage.svg";
+    set icon_z17;
+}
+node[man_made=pump][substance=steam] {
+    icon-image: "presets/landmark/pump_steam.svg";
+    set icon_z17;
+}
+node[man_made=pump][substance=~/(^|_)?water$/] {
+    icon-image: "presets/landmark/pump_water.svg";
+    set icon_z17;
+}
 node[man_made=breakwater],
 node[man_made=groyne],
 node[man_made=embankment],
@@ -1578,15 +1628,12 @@
     icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
-node[man_made=petroleum_well][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
-    set icon_z17;
-}
 area[man_made=reservoir_covered],
 area[man_made=wastewater_plant],
 area[man_made=watermill],
 area[man_made=water_well],
 area[man_made=windmill],
+area[man_made=windpump],
 area[man_made=works],
 area[man_made=water_works] {
     fill-color: manmade#d8d8d8;
@@ -1619,6 +1666,26 @@
     icon-image: "presets/landmark/windmill.svg";
     set icon_z17;
 }
+node[man_made=windpump] {
+    icon-image: "presets/landmark/windpump.svg";
+    set icon_z17;
+}
+node[man_made=windpump][substance=gas] {
+    icon-image: "presets/landmark/windpump_gas.svg";
+    set icon_z17;
+}
+node[man_made=windpump][substance=oil] {
+    icon-image: "presets/landmark/windpump_oil.svg";
+    set icon_z17;
+}
+node[man_made=windpump][substance=sewage] {
+    icon-image: "presets/landmark/windpump_sewage.svg";
+    set icon_z17;
+}
+node[man_made=windpump][substance=steam] {
+    icon-image: "presets/landmark/windpump_steam.svg";
+    set icon_z17;
+}
 node[man_made=works] {
     icon-image: "presets/landmark/works.svg";
     set icon_z17;
Index: resources/images/presets/power/power_source-biofuel.svg
===================================================================
--- resources/images/presets/power/power_source-biofuel.svg	(revision 10918)
+++ resources/images/presets/power/power_source-biofuel.svg	(working copy)
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-gas.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
+  <defs
+     id="defs183" />
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -40,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1018"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="6.9004192"
-     inkscape:cy="10.644037"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,7 +71,6 @@
      height="6"
      id="rect2939" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
      d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
      id="path2941" />
@@ -161,7 +96,6 @@
      height="0.99999595"
      id="rect2949" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
      d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
      id="path2941-2" />
Index: resources/images/presets/power/power_source-coal.svg
===================================================================
--- resources/images/presets/power/power_source-coal.svg	(revision 10918)
+++ resources/images/presets/power/power_source-coal.svg	(working copy)
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-gas.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
+  <defs
+     id="defs280" />
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -40,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1018"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="6.9004192"
-     inkscape:cy="10.644037"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,7 +71,6 @@
      height="6"
      id="rect2939" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
      d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
      id="path2941" />
@@ -161,7 +96,6 @@
      height="0.99999595"
      id="rect2949" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
      d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
      id="path2941-2" />
Index: resources/images/presets/power/power_source-gas.svg
===================================================================
--- resources/images/presets/power/power_source-gas.svg	(revision 10918)
+++ resources/images/presets/power/power_source-gas.svg	(working copy)
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-gas.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
+  <defs
+     id="defs212" />
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -40,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1018"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="6.9004192"
-     inkscape:cy="10.644037"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,7 +71,6 @@
      height="6"
      id="rect2939" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
      d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
      id="path2941" />
@@ -161,7 +96,6 @@
      height="0.99999595"
      id="rect2949" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
      d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
      id="path2941-2" />
Index: resources/images/presets/power/power_source-geothermal.svg
===================================================================
--- resources/images/presets/power/power_source-geothermal.svg	(revision 13363)
+++ resources/images/presets/power/power_source-geothermal.svg	(working copy)
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-geothermal2.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
   <defs
      id="defs14" />
   <metadata
@@ -42,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="33.37544"
-     inkscape:cx="0.88431149"
-     inkscape:cy="7.3901301"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -136,17 +70,14 @@
     <path
        id="path2959"
        d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2961"
        d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2963"
        d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
Index: resources/images/presets/power/power_source-nuclear.svg
===================================================================
--- resources/images/presets/power/power_source-nuclear.svg	(revision 10918)
+++ resources/images/presets/power/power_source-nuclear.svg	(working copy)
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-nuclear.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
   <defs
      id="defs15" />
   <metadata
@@ -42,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="33.37544"
-     inkscape:cx="6.6382163"
-     inkscape:cy="6.2111108"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -136,18 +70,15 @@
     <path
        id="path4369"
        d="m 14,3.074 -2.5,4.33 C 12.396,7.922 13.001,8.889 13.001,10 L 18,10 C 18,7.041 16.39,4.457 14,3.074 Z"
-       style="fill:#000000"
-       inkscape:connector-curvature="0" />
+       style="fill:#000000" />
     <path
        id="path4371"
        d="m 2.006,10 4.999,0 C 7.005,8.964 7.54,7.957 8.501,7.402 L 6.002,3.072 C 3.441,4.552 2.008,7.238 2.006,10 Z"
-       style="fill:#000000"
-       inkscape:connector-curvature="0" />
+       style="fill:#000000" />
     <path
        id="path4373"
        d="m 14,16.925 -2.5,-4.329 c -0.897,0.516 -2.037,0.556 -2.998,10e-4 l -2.499,4.328 c 2.562,1.481 5.604,1.377 7.997,0 z"
-       style="fill:#000000"
-       inkscape:connector-curvature="0" />
+       style="fill:#000000" />
     <circle
        id="path4395"
        style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
Index: resources/images/presets/power/power_source-oil.svg
===================================================================
--- resources/images/presets/power/power_source-oil.svg	(revision 10918)
+++ resources/images/presets/power/power_source-oil.svg	(working copy)
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-gas.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
+  <defs
+     id="defs115" />
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -40,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1018"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="6.9004192"
-     inkscape:cy="10.644037"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -121,7 +57,7 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
+     style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
      id="background"
      cx="8"
      cy="8"
@@ -135,7 +71,6 @@
      height="6"
      id="rect2939" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
      d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
      id="path2941" />
@@ -161,7 +96,6 @@
      height="0.99999595"
      id="rect2949" />
   <path
-     inkscape:connector-curvature="0"
      style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
      d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
      id="path2941-2" />
Index: resources/images/presets/power/power_source-sun.svg
===================================================================
--- resources/images/presets/power/power_source-sun.svg	(revision 10918)
+++ resources/images/presets/power/power_source-sun.svg	(working copy)
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-sun5.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
   <defs
      id="defs18" />
   <metadata
@@ -42,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="23.6"
-     inkscape:cx="8.6883174"
-     inkscape:cy="3.5715644"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,56 +57,60 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.74915254;stroke-opacity:1"
-     id="background"
-     cx="7.4915257"
-     cy="8.5084743"
-     rx="7.1169496"
-     ry="7.1169491" />
-  <rect
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     id="rect4146"
-     width="1"
-     height="11"
-     x="-1.2071068"
-     y="5.8137083"
-     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-     ry="0.5" />
-  <rect
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     id="rect4148"
-     width="11"
-     height="1"
-     x="-6.2071066"
-     y="10.813708"
-     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-     ry="0.5" />
-  <rect
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     id="rect4154"
-     width="11"
-     height="1"
-     x="2"
-     y="8"
-     ry="0.5" />
-  <rect
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     id="rect4156"
-     width="0.99999952"
-     height="11.000003"
-     x="7"
-     y="3"
-     ry="0.49999976" />
-  <circle
-     id="circle4170"
-     cy="8.5"
-     cx="7.5"
-     style="fill:#000000;stroke:none;stroke-width:0.99980003"
-     r="2.5" />
-  <circle
-     cy="8.5"
-     cx="7.5"
-     style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="circle4172"
-     r="1.5" />
+     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="background-6"
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
+  <g
+     id="g983"
+     transform="translate(0.5,-0.50000143)">
+    <circle
+       id="circle4170"
+       cy="8.5"
+       cx="7.5"
+       style="fill:#000000;stroke:none;stroke-width:0.9998"
+       r="2.5" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4146"
+       width="1"
+       height="11"
+       x="-1.2071068"
+       y="5.8137083"
+       transform="rotate(-45)"
+       ry="0.5" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4148"
+       width="11"
+       height="1"
+       x="-6.2071066"
+       y="10.813708"
+       transform="rotate(-45)"
+       ry="0.5" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4154"
+       width="11"
+       height="1"
+       x="2"
+       y="8"
+       ry="0.5" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4156"
+       width="1"
+       height="11"
+       x="7"
+       y="3"
+       ry="0.5" />
+    <circle
+       cy="8.5"
+       cx="7.5"
+       style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="circle4172"
+       r="1.5" />
+  </g>
 </svg>
Index: resources/images/presets/power/power_source-waste.svg
===================================================================
--- resources/images/presets/power/power_source-waste.svg	(revision 10918)
+++ resources/images/presets/power/power_source-waste.svg	(working copy)
@@ -10,7 +10,7 @@
    id="svg2"
    version="1.0">
   <defs
-     id="defs16" />
+     id="defs309" />
   <metadata
      id="metadata10">
     <rdf:RDF>
Index: resources/images/presets/power/power_source-water.svg
===================================================================
--- resources/images/presets/power/power_source-water.svg	(revision 10918)
+++ resources/images/presets/power/power_source-water.svg	(working copy)
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-geothermal2.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
   <defs
      id="defs14" />
   <metadata
@@ -42,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="33.37544"
-     inkscape:cx="0.88431149"
-     inkscape:cy="7.3901301"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,7 +57,7 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="fill:#00ffff;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#2090cf;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="background"
      cx="8"
      cy="8"
@@ -136,17 +70,14 @@
     <path
        id="path2959"
        d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2961"
        d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2963"
        d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
Index: resources/images/presets/power/power_source-wind.svg
===================================================================
--- resources/images/presets/power/power_source-wind.svg	(revision 10918)
+++ resources/images/presets/power/power_source-wind.svg	(working copy)
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-wind3.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.0">
   <defs
      id="defs15" />
   <metadata
@@ -42,64 +34,6 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="true"
-     inkscape:zoom="47.2"
-     inkscape:cx="8.3885021"
-     inkscape:cy="7.9297332"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -162,7 +96,6 @@
     <path
        id="path3846"
        d="m 9,18 2,0 0,-6 -1,-0.5 -1,0.5 0,6 z"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>