Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18229)
+++ trunk/resources/data/defaultpresets.xml	(revision 18230)
@@ -473,7 +473,24 @@
         </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">
@@ -2046,4 +2063,5 @@
                 <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>
@@ -5603,5 +5621,5 @@
             <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 -->
@@ -5610,5 +5628,5 @@
             <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 -->
@@ -5617,12 +5635,67 @@
             <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>
+            <preset_link preset_name="Pump" text="Similar but different tags:" />
+            <preset_link preset_name="Water Well" text="Similar but different tags:" />
+            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
+        </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>
+            <preset_link preset_name="Windpump" text="Similar but different tags:" />
+            <preset_link preset_name="Water Well" text="Similar but different tags:" />
+            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
+        </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>
+            <preset_link preset_name="Water Well" text="Similar but different tags:" />
+            <preset_link preset_name="Windpump" text="Similar but different tags:" />
+            <preset_link preset_name="Pump" text="Similar but different tags:" />
+        </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" />
@@ -5631,8 +5704,7 @@
         <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" />
@@ -5643,5 +5715,5 @@
             <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" />
@@ -5651,25 +5723,22 @@
         <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">
@@ -5684,6 +5753,6 @@
             <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">
@@ -5946,9 +6015,10 @@
             <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">
@@ -5957,7 +6027,7 @@
             <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">
@@ -5965,8 +6035,7 @@
             <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" />
@@ -5976,5 +6045,5 @@
             <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" />
@@ -6024,8 +6093,16 @@
             <space />
             <key key="man_made" value="water_well" />
-            <optional>
-                <text key="name" text="Name" />
-                <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
-            </optional>
+            <combo key="pump" text="Pump" values="yes,no,manual,powered" values_sort="false"/>
+            <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" />
+            </optional>
+            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
+            <preset_link preset_name="Windpump" text="Similar but different tags:" />
+            <preset_link preset_name="Pump" text="Similar but different tags:" />
         </item> <!-- Water Well -->
     </group> <!-- Water -->
Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 18229)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 18230)
@@ -126,9 +126,16 @@
 }
 
-/* {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],
@@ -246,5 +253,5 @@
 }
 
-/* {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:/],
@@ -256,4 +263,6 @@
 *[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],
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 18229)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 18230)
@@ -2278,4 +2278,43 @@
 }
 
+/* #20530 */
+*[man_made=pumping_rig][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=petroleum_well";
+  suggestAlternative: "man_made=water_well";
+  fixAdd: "pump_mechanism=piston";
+  fixAdd: "mechanical_driver=combustion_engine";
+  fixAdd: "mechanical_coupling=nodding_donkey";
+  group: tr("deprecated tagging");
+  set pumping_ring_no_mech;
+}
+*[man_made=pumping_rig]!.pumping_ring_no_mech {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=petroleum_well";
+  suggestAlternative: "man_made=water_well";
+  group: tr("deprecated tagging");
+}
+*[pump:type=beam_pump][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "pump_mechanism";
+  fixRemove: "pump:type";
+  fixAdd: "pump_mechanism=piston";
+  fixAdd: "mechanical_driver=combustion_engine";
+  fixAdd: "mechanical_coupling=nodding_donkey";
+  group: tr("deprecated tagging");
+  set beam_pump_no_mech
+}
+*[pump:type]!.beam_pump_no_mech {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "pump_mechanism";
+  group: tr("deprecated tagging");
+}
+*[substance=heat] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "substance=hot_water";
+  suggestAlternative: "substance=steam";
+  group: tr("deprecated tagging");
+}
+
 /* #20959 */
 *[landuse=school] {
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18229)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18230)
@@ -174,5 +174,4 @@
 K:bicycle=dismount
 K:wall=no
-K:man_made=petroleum_well
 K:man_made=yes
 K:man_made=clearcut
@@ -705,4 +704,7 @@
 E:role
 E:levels
+K:man_made=pumping_rig
+E:pump:type
+K:substance=heat
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 
Index: trunk/resources/images/presets/landmark/gas_well.svg
===================================================================
--- trunk/resources/images/presets/landmark/gas_well.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/gas_well.svg	(revision 18230)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="Réteg_1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" 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:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<path id="path44" style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFF00;" d="M0,14v-1h3v-1v-2H0.2V9.6C0.2,8,0.8,6.3,3,6.2
+	c2,0,3,1.8,3,3.4V10v3h2.3l0-1.5C7,10.7,6.5,9,6.5,8c0-1.1,0.3-2,0.8-3l0-3c0-0.5,0.4-1,1.1-1h0.9c0-0.6,0.5-1,1-1h4.5
+	c0.6,0,1.1,0.5,1.1,1l0,7c0,1.7-0.6,2.8-1.6,3.6l0,2.4H0z"/>
+<g id="g8">
+	<polyline id="polyline4" style="fill:none;stroke:#706F6F;stroke-width:0.25;stroke-linecap:round;stroke-miterlimit:1;" points="
+		8.6,3.1 9.1,3.7 8.6,4.3 	"/>
+	
+		<line id="line6" style="fill:none;stroke:#878787;stroke-width:0.25;stroke-linecap:round;stroke-miterlimit:1;" x1="8.5" y1="2.5" x2="8.5" y2="4.9"/>
+</g>
+<g id="g14">
+	
+		<polyline id="polyline10" style="fill:none;stroke:#706F6F;stroke-width:0.45;stroke-linecap:square;stroke-miterlimit:1;" points="
+		14.3,2.9 13.7,2.3 14.3,1.7 	"/>
+	
+		<line id="line12" style="fill:none;stroke:#878787;stroke-width:0.45;stroke-linecap:round;stroke-miterlimit:1;" x1="14.5" y1="3.6" x2="14.5" y2="1.1"/>
+</g>
+<linearGradient id="line23_00000056390731845143994270000002014353993123974291_" gradientUnits="userSpaceOnUse" x1="13.05" y1="14.1386" x2="13.05" y2="13.1886" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="0" style="stop-color:#EF7B5A"/>
+	<stop  offset="0.5" style="stop-color:#C21B1C"/>
+	<stop  offset="1" style="stop-color:#530B00"/>
+</linearGradient>
+<line id="line23" style="fill:none;stroke:url(#line23_00000056390731845143994270000002014353993123974291_);stroke-width:0.95;stroke-miterlimit:1;" x1="12.2" y1="2.3" x2="13.9" y2="2.3"/>
+<linearGradient id="line32_00000045580130229475538680000003042321430554409908_" gradientUnits="userSpaceOnUse" x1="10.1" y1="12.6299" x2="10.1" y2="11.9799" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="0" style="stop-color:#EF7B5A"/>
+	<stop  offset="0.5" style="stop-color:#C21B1C"/>
+	<stop  offset="1" style="stop-color:#530B00"/>
+</linearGradient>
+<line id="line32" style="fill:none;stroke:url(#line32_00000045580130229475538680000003042321430554409908_);stroke-width:0.65;stroke-miterlimit:1;" x1="9" y1="3.7" x2="11.2" y2="3.7"/>
+<linearGradient id="line39_00000082360090784082821790000015168642177134732431_" gradientUnits="userSpaceOnUse" x1="11.2" y1="1.15" x2="11.2" y2="15.35" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="3.558486e-09" style="stop-color:#533812"/>
+	<stop  offset="1" style="stop-color:#1C0000"/>
+</linearGradient>
+<line id="line39" style="fill:none;stroke:url(#line39_00000082360090784082821790000015168642177134732431_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:1;" x1="11.2" y1="13.9" x2="11.2" y2="1.6"/>
+<rect id="rect41" x="9.8" y="12.9" style="fill:none;stroke:#808080;stroke-miterlimit:1;" width="2.8" height="0.7"/>
+<path id="path43" style="fill:none;stroke:#000000;stroke-miterlimit:10;" d="M4.4,14c0-1.6,0-3.1,0-4.7c0-0.9-0.6-1.6-1.3-1.7
+	c-0.8,0-1.5,0.8-1.5,1.8"/>
+<rect id="rect45" y="14" style="fill:#7D4E24;" width="16" height="2"/>
+<ellipse id="ellipse47" cx="11.2" cy="8.1" rx="2" ry="2.3"/>
+<g id="g58">
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000091696109928770295790000006027385785474707628_">
+		
+			<line id="line49" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.3" y1="8" x2="8.9" y2="10.3"/>
+	</g>
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000095314307147076997730000011218221142246247092_">
+		
+			<line id="line52" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.2" y1="8.2" x2="10.4" y2="5"/>
+	</g>
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000152980639432485058720000012890486366756343474_">
+		
+			<line id="line55" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.1" y1="8.1" x2="14.3" y2="9"/>
+	</g>
+</g>
+<circle id="circle60" style="fill:none;stroke:#808080;stroke-width:0.5;stroke-miterlimit:1;" cx="11.2" cy="8.1" r="3.3"/>
+<line id="line62" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-miterlimit:1;" x1="9.7" y1="9.4" x2="9.7" y2="9.4"/>
+</svg>
Index: trunk/resources/images/presets/landmark/gas_well_donkey.svg
===================================================================
--- trunk/resources/images/presets/landmark/gas_well_donkey.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/gas_well_donkey.svg	(revision 18230)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="Réteg_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   style="enable-background:new 0 0 16 16;"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs18" />
+<g
+   id="halo">
+	
+		<line
+   id="line2204-5"
+   style="fill:none;stroke:#FFFF00;stroke-width:2;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+	<path
+   id="path2208-7"
+   style="fill:#FFFF00;"
+   d="M4.1-0.7C3.2-0.6,1.6-0.1,0.8,1C-0.8,3-0.6,6.5,0,6.9c0.5,0.3,2.9-0.6,4.3-2.2   l8.3,4.1V14h0.9V9.9H16V8.8h-1.2l-0.5-1.2l0.5-0.9L5.4,2c0.1-1.1-0.3-2.3-0.6-2.6C4.6-0.7,4.4-0.7,4.1-0.7z" />
+	<polyline
+   id="polyline2210-3"
+   style="fill:none;stroke:#FFFF00;stroke-width:2.25;stroke-miterlimit:10;"
+   points="11.4,14.8    7.8,5.5 7.6,5.3 5.4,14.8  " />
+</g>
+<line
+   id="line2204"
+   style="fill:none;stroke:#7B6A58;stroke-width:0.45;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+<rect
+   id="rect2206"
+   x="0.14999998"
+   y="13.4"
+   style="fill:#634e42"
+   width="1.5"
+   height="0.89999998" />
+<path
+   id="path2208"
+   style="fill:#3C3C3B;"
+   d="M0.6,6C0.1,5.7,0.1,3.1,1.3,1.6C2.1,0.5,3.8,0,4.2,0.3s0.5,2.1,0.1,2.8  C3.4,4.8,1.1,6.3,0.6,6z" />
+<polyline
+   id="polyline2210"
+   style="fill:none;stroke:#706F6F;stroke-width:1.25;stroke-miterlimit:10;"
+   points="11.4,14.8 7.8,5.5   7.6,5.3 5.4,14.8 " />
+<line
+   id="line2212"
+   style="fill:none;stroke:#634E42;stroke-width:0.75;stroke-miterlimit:10;"
+   x1="13.2"
+   y1="7.3"
+   x2="14.6"
+   y2="10.7" />
+<line
+   style="fill:none;stroke:#3C3C3B;stroke-miterlimit:10;"
+   x1="4"
+   y1="3"
+   x2="13.4"
+   y2="7.5"
+   id="line11" />
+<rect
+   id="rect2216"
+   y="14"
+   style="fill:#7D4E24;"
+   width="16"
+   height="2" />
+<rect
+   id="rect2218"
+   x="13.5"
+   y="9.9"
+   style="fill:#575756;"
+   width="2.5"
+   height="4.1" />
+</svg>
Index: trunk/resources/images/presets/landmark/oil_well.svg
===================================================================
--- trunk/resources/images/presets/landmark/oil_well.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/oil_well.svg	(revision 18230)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="Réteg_1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" 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:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<path id="path44" style="fill-rule:evenodd;clip-rule:evenodd;fill:#708090;" d="M0,14v-1h3v-1v-2H0.2V9.6C0.2,8,0.8,6.3,3,6.2
+	c2,0,3,1.8,3,3.4V10v3h2.3l0-1.5C7,10.7,6.5,9,6.5,8c0-1.1,0.3-2,0.8-3l0-3c0-0.5,0.4-1,1.1-1h0.9c0-0.6,0.5-1,1-1h4.5
+	c0.6,0,1.1,0.5,1.1,1l0,7c0,1.7-0.6,2.8-1.6,3.6l0,2.4H0z"/>
+<g id="g8">
+	<polyline id="polyline4" style="fill:none;stroke:#706F6F;stroke-width:0.25;stroke-linecap:round;stroke-miterlimit:1;" points="
+		8.6,3.1 9.1,3.7 8.6,4.3 	"/>
+	
+		<line id="line6" style="fill:none;stroke:#878787;stroke-width:0.25;stroke-linecap:round;stroke-miterlimit:1;" x1="8.5" y1="2.5" x2="8.5" y2="4.9"/>
+</g>
+<g id="g14">
+	
+		<polyline id="polyline10" style="fill:none;stroke:#706F6F;stroke-width:0.45;stroke-linecap:square;stroke-miterlimit:1;" points="
+		14.3,2.9 13.7,2.3 14.3,1.7 	"/>
+	
+		<line id="line12" style="fill:none;stroke:#878787;stroke-width:0.45;stroke-linecap:round;stroke-miterlimit:1;" x1="14.5" y1="3.6" x2="14.5" y2="1.1"/>
+</g>
+<linearGradient id="line23_00000056390731845143994270000002014353993123974291_" gradientUnits="userSpaceOnUse" x1="13.05" y1="14.1386" x2="13.05" y2="13.1886" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="0" style="stop-color:#EF7B5A"/>
+	<stop  offset="0.5" style="stop-color:#C21B1C"/>
+	<stop  offset="1" style="stop-color:#530B00"/>
+</linearGradient>
+<line id="line23" style="fill:none;stroke:url(#line23_00000056390731845143994270000002014353993123974291_);stroke-width:0.95;stroke-miterlimit:1;" x1="12.2" y1="2.3" x2="13.9" y2="2.3"/>
+<linearGradient id="line32_00000045580130229475538680000003042321430554409908_" gradientUnits="userSpaceOnUse" x1="10.1" y1="12.6299" x2="10.1" y2="11.9799" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="0" style="stop-color:#EF7B5A"/>
+	<stop  offset="0.5" style="stop-color:#C21B1C"/>
+	<stop  offset="1" style="stop-color:#530B00"/>
+</linearGradient>
+<line id="line32" style="fill:none;stroke:url(#line32_00000045580130229475538680000003042321430554409908_);stroke-width:0.65;stroke-miterlimit:1;" x1="9" y1="3.7" x2="11.2" y2="3.7"/>
+<linearGradient id="line39_00000082360090784082821790000015168642177134732431_" gradientUnits="userSpaceOnUse" x1="11.2" y1="1.15" x2="11.2" y2="15.35" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="3.558486e-09" style="stop-color:#533812"/>
+	<stop  offset="1" style="stop-color:#1C0000"/>
+</linearGradient>
+<line id="line39" style="fill:none;stroke:url(#line39_00000082360090784082821790000015168642177134732431_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:1;" x1="11.2" y1="13.9" x2="11.2" y2="1.6"/>
+<rect id="rect41" x="9.8" y="12.9" style="fill:none;stroke:#808080;stroke-miterlimit:1;" width="2.8" height="0.7"/>
+<path id="path43" style="fill:none;stroke:#000000;stroke-miterlimit:10;" d="M4.4,14c0-1.6,0-3.1,0-4.7c0-0.9-0.6-1.6-1.3-1.7
+	c-0.8,0-1.5,0.8-1.5,1.8"/>
+<rect id="rect45" y="14" style="fill:#7D4E24;" width="16" height="2"/>
+<ellipse id="ellipse47" cx="11.2" cy="8.1" rx="2" ry="2.3"/>
+<g id="g58">
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000091696109928770295790000006027385785474707628_">
+		
+			<line id="line49" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.3" y1="8" x2="8.9" y2="10.3"/>
+	</g>
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000095314307147076997730000011218221142246247092_">
+		
+			<line id="line52" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.2" y1="8.2" x2="10.4" y2="5"/>
+	</g>
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000152980639432485058720000012890486366756343474_">
+		
+			<line id="line55" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.1" y1="8.1" x2="14.3" y2="9"/>
+	</g>
+</g>
+<circle id="circle60" style="fill:none;stroke:#808080;stroke-width:0.5;stroke-miterlimit:1;" cx="11.2" cy="8.1" r="3.3"/>
+<line id="line62" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-miterlimit:1;" x1="9.7" y1="9.4" x2="9.7" y2="9.4"/>
+</svg>
Index: trunk/resources/images/presets/landmark/oil_well_donkey.svg
===================================================================
--- trunk/resources/images/presets/landmark/oil_well_donkey.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/oil_well_donkey.svg	(revision 18230)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="Réteg_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   style="enable-background:new 0 0 16 16;"
+   xml:space="preserve"><metadata
+   id="metadata142"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs140" />
+<g
+   id="halo">
+	
+		<line
+   id="line2204-5"
+   style="fill:none;stroke:#708090;stroke-width:2;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+	<path
+   id="path2208-7"
+   style="fill:#708090;"
+   d="M4.1-0.7C3.2-0.6,1.6-0.1,0.8,1C-0.8,3-0.6,6.5,0,6.9c0.5,0.3,2.9-0.6,4.3-2.2   l8.3,4.1V14h0.9V9.9H16V8.8h-1.2l-0.5-1.2l0.5-0.9L5.4,2c0.1-1.1-0.3-2.3-0.6-2.6C4.6-0.7,4.4-0.7,4.1-0.7z" />
+	<polyline
+   id="polyline2210-3"
+   style="fill:none;stroke:#708090;stroke-width:2.25;stroke-miterlimit:10;"
+   points="11.4,14.8    7.8,5.5 7.6,5.3 5.4,14.8  " />
+</g>
+<line
+   id="line2204"
+   style="fill:none;stroke:#7B6A58;stroke-width:0.45;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+<rect
+   id="rect2206"
+   x="0.14999998"
+   y="13.4"
+   style="fill:#634e42"
+   width="1.5"
+   height="0.89999998" />
+<path
+   id="path2208"
+   style="fill:#3C3C3B;"
+   d="M0.6,6C0.1,5.7,0.1,3.1,1.3,1.6C2.1,0.5,3.8,0,4.2,0.3s0.5,2.1,0.1,2.8  C3.4,4.8,1.1,6.3,0.6,6z" />
+<polyline
+   id="polyline2210"
+   style="fill:none;stroke:#706F6F;stroke-width:1.25;stroke-miterlimit:10;"
+   points="11.4,14.8 7.8,5.5   7.6,5.3 5.4,14.8 " />
+<line
+   id="line2212"
+   style="fill:none;stroke:#634E42;stroke-width:0.75;stroke-miterlimit:10;"
+   x1="13.2"
+   y1="7.3"
+   x2="14.6"
+   y2="10.7" />
+<line
+   style="fill:none;stroke:#3C3C3B;stroke-miterlimit:10;"
+   x1="4"
+   y1="3"
+   x2="13.4"
+   y2="7.5"
+   id="line133" />
+<rect
+   id="rect2216"
+   y="14"
+   style="fill:#7D4E24;"
+   width="16"
+   height="2" />
+<rect
+   id="rect2218"
+   x="13.5"
+   y="9.9"
+   style="fill:#575756;"
+   width="2.5"
+   height="4.1" />
+</svg>
Index: trunk/resources/images/presets/landmark/petroleum_well.svg
===================================================================
--- trunk/resources/images/presets/landmark/petroleum_well.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/petroleum_well.svg	(revision 18230)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="Réteg_1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" 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:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<path id="path44" style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" d="M0,14v-1h3v-1v-2H0.2V9.6C0.2,8,0.8,6.3,3,6.2
+	c2,0,3,1.8,3,3.4V10v3h2.3l0-1.5C7,10.7,6.5,9,6.5,8c0-1.1,0.3-2,0.8-3l0-3c0-0.5,0.4-1,1.1-1h0.9c0-0.6,0.5-1,1-1h4.5
+	c0.6,0,1.1,0.5,1.1,1l0,7c0,1.7-0.6,2.8-1.6,3.6l0,2.4H0z"/>
+<g id="g8">
+	<polyline id="polyline4" style="fill:none;stroke:#706F6F;stroke-width:0.25;stroke-linecap:round;stroke-miterlimit:1;" points="
+		8.6,3.1 9.1,3.7 8.6,4.3 	"/>
+	
+		<line id="line6" style="fill:none;stroke:#878787;stroke-width:0.25;stroke-linecap:round;stroke-miterlimit:1;" x1="8.5" y1="2.5" x2="8.5" y2="4.9"/>
+</g>
+<g id="g14">
+	
+		<polyline id="polyline10" style="fill:none;stroke:#706F6F;stroke-width:0.45;stroke-linecap:square;stroke-miterlimit:1;" points="
+		14.3,2.9 13.7,2.3 14.3,1.7 	"/>
+	
+		<line id="line12" style="fill:none;stroke:#878787;stroke-width:0.45;stroke-linecap:round;stroke-miterlimit:1;" x1="14.5" y1="3.6" x2="14.5" y2="1.1"/>
+</g>
+<linearGradient id="line23_00000056390731845143994270000002014353993123974291_" gradientUnits="userSpaceOnUse" x1="13.05" y1="14.1386" x2="13.05" y2="13.1886" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="0" style="stop-color:#EF7B5A"/>
+	<stop  offset="0.5" style="stop-color:#C21B1C"/>
+	<stop  offset="1" style="stop-color:#530B00"/>
+</linearGradient>
+<line id="line23" style="fill:none;stroke:url(#line23_00000056390731845143994270000002014353993123974291_);stroke-width:0.95;stroke-miterlimit:1;" x1="12.2" y1="2.3" x2="13.9" y2="2.3"/>
+<linearGradient id="line32_00000045580130229475538680000003042321430554409908_" gradientUnits="userSpaceOnUse" x1="10.1" y1="12.6299" x2="10.1" y2="11.9799" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="0" style="stop-color:#EF7B5A"/>
+	<stop  offset="0.5" style="stop-color:#C21B1C"/>
+	<stop  offset="1" style="stop-color:#530B00"/>
+</linearGradient>
+<line id="line32" style="fill:none;stroke:url(#line32_00000045580130229475538680000003042321430554409908_);stroke-width:0.65;stroke-miterlimit:1;" x1="9" y1="3.7" x2="11.2" y2="3.7"/>
+<linearGradient id="line39_00000082360090784082821790000015168642177134732431_" gradientUnits="userSpaceOnUse" x1="11.2" y1="1.15" x2="11.2" y2="15.35" gradientTransform="matrix(1 0 0 -1 0 16)">
+	<stop  offset="3.558486e-09" style="stop-color:#533812"/>
+	<stop  offset="1" style="stop-color:#1C0000"/>
+</linearGradient>
+<line id="line39" style="fill:none;stroke:url(#line39_00000082360090784082821790000015168642177134732431_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:1;" x1="11.2" y1="13.9" x2="11.2" y2="1.6"/>
+<rect id="rect41" x="9.8" y="12.9" style="fill:none;stroke:#808080;stroke-miterlimit:1;" width="2.8" height="0.7"/>
+<path id="path43" style="fill:none;stroke:#000000;stroke-miterlimit:10;" d="M4.4,14c0-1.6,0-3.1,0-4.7c0-0.9-0.6-1.6-1.3-1.7
+	c-0.8,0-1.5,0.8-1.5,1.8"/>
+<rect id="rect45" y="14" style="fill:#7D4E24;" width="16" height="2"/>
+<ellipse id="ellipse47" cx="11.2" cy="8.1" rx="2" ry="2.3"/>
+<g id="g58">
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000091696109928770295790000006027385785474707628_">
+		
+			<line id="line49" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.3" y1="8" x2="8.9" y2="10.3"/>
+	</g>
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000095314307147076997730000011218221142246247092_">
+		
+			<line id="line52" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.2" y1="8.2" x2="10.4" y2="5"/>
+	</g>
+	<g id="_x3C_Körkörös_ismétlés_x3E__00000152980639432485058720000012890486366756343474_">
+		
+			<line id="line55" style="fill:none;stroke:#B2B2B2;stroke-width:0.75;stroke-miterlimit:1;" x1="11.1" y1="8.1" x2="14.3" y2="9"/>
+	</g>
+</g>
+<circle id="circle60" style="fill:none;stroke:#808080;stroke-width:0.5;stroke-miterlimit:1;" cx="11.2" cy="8.1" r="3.3"/>
+<line id="line62" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-miterlimit:1;" x1="9.7" y1="9.4" x2="9.7" y2="9.4"/>
+</svg>
Index: trunk/resources/images/presets/landmark/pump.svg
===================================================================
--- trunk/resources/images/presets/landmark/pump.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/pump.svg	(revision 18230)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4264"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+   id="defs18">
+	
+	
+</defs>
+
+
+<g
+   id="g3542"><g
+     id="g10-9"
+     style="fill:none;fill-opacity:1;stroke:#ff4b00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /><g
+     id="g6"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)">
+		<path
+   fill="#66baff"
+   stroke="#262626"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M 14.537,3.14 V 7.21 L 12.12,7.19 c 0.1,0.412 0.147,0.833 0.147,1.265 0,2.933 -2.416,5.316 -5.408,5.316 -2.98,0 -5.397,-2.384 -5.397,-5.316 0,-2.932 2.417,-5.315 5.397,-5.315 z"
+   id="path4"
+   style="stroke-width:0.502344;stroke-miterlimit:10;stroke-dasharray:none;fill:#00ffff;fill-opacity:1" />
+	</g><polygon
+     fill="#FDFDF8"
+     stroke="#494949"
+     stroke-miterlimit="10"
+     points="5.954,6.758 7.884,6.749 8.855,8.446 7.899,10.15 5.971,10.161 4.998,8.465 "
+     id="polygon13"
+     style="fill:#fdfdf8;fill-opacity:1;stroke-width:1.00469;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /></g>
+</svg>
Index: trunk/resources/images/presets/landmark/pump_gas.svg
===================================================================
--- trunk/resources/images/presets/landmark/pump_gas.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/pump_gas.svg	(revision 18230)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4264"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+   id="defs18">
+	
+	
+</defs>
+
+
+<path
+   style="fill:#ffff00;fill-rule:evenodd;stroke:#ffff00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+   d="m 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 C 15,15 1,15 1,15 1,15 1,1 1,1 Z"
+   id="path3011" /><g
+   id="g3542"><g
+     id="g10-9"
+     style="fill:none;fill-opacity:1;stroke:#ff4b00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /><g
+     id="g6"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)">
+		<path
+   fill="#66baff"
+   stroke="#262626"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M 14.537,3.14 V 7.21 L 12.12,7.19 c 0.1,0.412 0.147,0.833 0.147,1.265 0,2.933 -2.416,5.316 -5.408,5.316 -2.98,0 -5.397,-2.384 -5.397,-5.316 0,-2.932 2.417,-5.315 5.397,-5.315 z"
+   id="path4"
+   style="stroke-width:0.502344;stroke-miterlimit:10;stroke-dasharray:none;fill:#00ffff;fill-opacity:1" />
+	</g><polygon
+     fill="#FDFDF8"
+     stroke="#494949"
+     stroke-miterlimit="10"
+     points="5.954,6.758 7.884,6.749 8.855,8.446 7.899,10.15 5.971,10.161 4.998,8.465 "
+     id="polygon13"
+     style="fill:#fdfdf8;fill-opacity:1;stroke-width:1.00469;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /></g>
+</svg>
Index: trunk/resources/images/presets/landmark/pump_oil.svg
===================================================================
--- trunk/resources/images/presets/landmark/pump_oil.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/pump_oil.svg	(revision 18230)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4264"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+   id="defs18">
+	
+	
+</defs>
+
+
+<path
+   style="fill:#708090;fill-rule:evenodd;stroke:#708090;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+   d="m 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 C 15,15 1,15 1,15 1,15 1,1 1,1 Z"
+   id="path3011" /><g
+   id="g3542"><g
+     id="g10-9"
+     style="fill:none;fill-opacity:1;stroke:#ff4b00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /><g
+     id="g6"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)">
+		<path
+   fill="#66baff"
+   stroke="#262626"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M 14.537,3.14 V 7.21 L 12.12,7.19 c 0.1,0.412 0.147,0.833 0.147,1.265 0,2.933 -2.416,5.316 -5.408,5.316 -2.98,0 -5.397,-2.384 -5.397,-5.316 0,-2.932 2.417,-5.315 5.397,-5.315 z"
+   id="path4"
+   style="stroke-width:0.502344;stroke-miterlimit:10;stroke-dasharray:none;fill:#00ffff;fill-opacity:1" />
+	</g><polygon
+     fill="#FDFDF8"
+     stroke="#494949"
+     stroke-miterlimit="10"
+     points="5.954,6.758 7.884,6.749 8.855,8.446 7.899,10.15 5.971,10.161 4.998,8.465 "
+     id="polygon13"
+     style="fill:#fdfdf8;fill-opacity:1;stroke-width:1.00469;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /></g>
+</svg>
Index: trunk/resources/images/presets/landmark/pump_sewage.svg
===================================================================
--- trunk/resources/images/presets/landmark/pump_sewage.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/pump_sewage.svg	(revision 18230)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4264"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+   id="defs18">
+	
+	
+</defs>
+
+
+<path
+   style="fill:#ee82ee;fill-rule:evenodd;stroke:#ee82ee;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+   d="m 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 C 15,15 1,15 1,15 1,15 1,1 1,1 Z"
+   id="path3011" /><g
+   id="g3542"><g
+     id="g10-9"
+     style="fill:none;fill-opacity:1;stroke:#ff4b00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /><g
+     id="g6"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)">
+		<path
+   fill="#66baff"
+   stroke="#262626"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M 14.537,3.14 V 7.21 L 12.12,7.19 c 0.1,0.412 0.147,0.833 0.147,1.265 0,2.933 -2.416,5.316 -5.408,5.316 -2.98,0 -5.397,-2.384 -5.397,-5.316 0,-2.932 2.417,-5.315 5.397,-5.315 z"
+   id="path4"
+   style="stroke-width:0.502344;stroke-miterlimit:10;stroke-dasharray:none;fill:#00ffff;fill-opacity:1" />
+	</g><polygon
+     fill="#FDFDF8"
+     stroke="#494949"
+     stroke-miterlimit="10"
+     points="5.954,6.758 7.884,6.749 8.855,8.446 7.899,10.15 5.971,10.161 4.998,8.465 "
+     id="polygon13"
+     style="fill:#fdfdf8;fill-opacity:1;stroke-width:1.00469;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /></g>
+</svg>
Index: trunk/resources/images/presets/landmark/pump_steam.svg
===================================================================
--- trunk/resources/images/presets/landmark/pump_steam.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/pump_steam.svg	(revision 18230)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4264"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+   id="defs18">
+	
+	
+</defs>
+
+
+<path
+   style="fill:#ff4b00;fill-rule:evenodd;stroke:#ff4b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+   d="m 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 C 15,15 1,15 1,15 1,15 1,1 1,1 Z"
+   id="path3011" /><g
+   id="g3542"><g
+     id="g10-9"
+     style="fill:none;fill-opacity:1;stroke:#ff4b00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /><g
+     id="g6"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)">
+		<path
+   fill="#66baff"
+   stroke="#262626"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M 14.537,3.14 V 7.21 L 12.12,7.19 c 0.1,0.412 0.147,0.833 0.147,1.265 0,2.933 -2.416,5.316 -5.408,5.316 -2.98,0 -5.397,-2.384 -5.397,-5.316 0,-2.932 2.417,-5.315 5.397,-5.315 z"
+   id="path4"
+   style="stroke-width:0.502344;stroke-miterlimit:10;stroke-dasharray:none;fill:#00ffff;fill-opacity:1" />
+	</g><polygon
+     fill="#FDFDF8"
+     stroke="#494949"
+     stroke-miterlimit="10"
+     points="5.954,6.758 7.884,6.749 8.855,8.446 7.899,10.15 5.971,10.161 4.998,8.465 "
+     id="polygon13"
+     style="fill:#fdfdf8;fill-opacity:1;stroke-width:1.00469;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /></g>
+</svg>
Index: trunk/resources/images/presets/landmark/pump_water.svg
===================================================================
--- trunk/resources/images/presets/landmark/pump_water.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/pump_water.svg	(revision 18230)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4264"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+         rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+   id="defs18">
+	
+	
+</defs>
+
+
+<path
+   style="fill:#2090cf;fill-rule:evenodd;stroke:#2090cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+   d="m 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 C 15,15 1,15 1,15 1,15 1,1 1,1 Z"
+   id="path3011" /><g
+   id="g3542"><g
+     id="g10-9"
+     style="fill:none;fill-opacity:1;stroke:#ff4b00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /><g
+     id="g6"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)">
+		<path
+   fill="#66baff"
+   stroke="#262626"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M 14.537,3.14 V 7.21 L 12.12,7.19 c 0.1,0.412 0.147,0.833 0.147,1.265 0,2.933 -2.416,5.316 -5.408,5.316 -2.98,0 -5.397,-2.384 -5.397,-5.316 0,-2.932 2.417,-5.315 5.397,-5.315 z"
+   id="path4"
+   style="stroke-width:0.502344;stroke-miterlimit:10;stroke-dasharray:none;fill:#00ffff;fill-opacity:1" />
+	</g><polygon
+     fill="#FDFDF8"
+     stroke="#494949"
+     stroke-miterlimit="10"
+     points="5.954,6.758 7.884,6.749 8.855,8.446 7.899,10.15 5.971,10.161 4.998,8.465 "
+     id="polygon13"
+     style="fill:#fdfdf8;fill-opacity:1;stroke-width:1.00469;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(0.99533437,0,0,0.99533437,0.03732271,0.03945023)" /></g>
+</svg>
Index: trunk/resources/images/presets/landmark/water_well_donkey.svg
===================================================================
--- trunk/resources/images/presets/landmark/water_well_donkey.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/water_well_donkey.svg	(revision 18230)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="Réteg_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   style="enable-background:new 0 0 16 16;"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs18" />
+<g
+   id="halo">
+	
+		<line
+   id="line2204-5"
+   style="fill:none;stroke:#2090cf;stroke-width:2;stroke-miterlimit:10;stroke-opacity:1"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+	<path
+   id="path2208-7"
+   style="fill:#2090cf;fill-opacity:1"
+   d="M4.1-0.7C3.2-0.6,1.6-0.1,0.8,1C-0.8,3-0.6,6.5,0,6.9c0.5,0.3,2.9-0.6,4.3-2.2   l8.3,4.1V14h0.9V9.9H16V8.8h-1.2l-0.5-1.2l0.5-0.9L5.4,2c0.1-1.1-0.3-2.3-0.6-2.6C4.6-0.7,4.4-0.7,4.1-0.7z" />
+	<polyline
+   id="polyline2210-3"
+   style="fill:none;stroke:#2090cf;stroke-width:2.25;stroke-miterlimit:10;stroke-opacity:1"
+   points="11.4,14.8    7.8,5.5 7.6,5.3 5.4,14.8  " />
+</g>
+<line
+   id="line2204"
+   style="fill:none;stroke:#7B6A58;stroke-width:0.45;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+<rect
+   id="rect2206"
+   x="0.14999998"
+   y="13.4"
+   style="fill:#634e42"
+   width="1.5"
+   height="0.89999998" />
+<path
+   id="path2208"
+   style="fill:#3C3C3B;"
+   d="M0.6,6C0.1,5.7,0.1,3.1,1.3,1.6C2.1,0.5,3.8,0,4.2,0.3s0.5,2.1,0.1,2.8  C3.4,4.8,1.1,6.3,0.6,6z" />
+<polyline
+   id="polyline2210"
+   style="fill:none;stroke:#706F6F;stroke-width:1.25;stroke-miterlimit:10;"
+   points="11.4,14.8 7.8,5.5   7.6,5.3 5.4,14.8 " />
+<line
+   id="line2212"
+   style="fill:none;stroke:#634E42;stroke-width:0.75;stroke-miterlimit:10;"
+   x1="13.2"
+   y1="7.3"
+   x2="14.6"
+   y2="10.7" />
+<line
+   style="fill:none;stroke:#3C3C3B;stroke-miterlimit:10;"
+   x1="4"
+   y1="3"
+   x2="13.4"
+   y2="7.5"
+   id="line11" />
+<rect
+   id="rect2216"
+   y="14"
+   style="fill:#7D4E24;"
+   width="16"
+   height="2" />
+<rect
+   id="rect2218"
+   x="13.5"
+   y="9.9"
+   style="fill:#575756;"
+   width="2.5"
+   height="4.1" />
+</svg>
Index: trunk/resources/images/presets/landmark/well_donkey.svg
===================================================================
--- trunk/resources/images/presets/landmark/well_donkey.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/well_donkey.svg	(revision 18230)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="Réteg_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   style="enable-background:new 0 0 16 16;"
+   xml:space="preserve"><metadata
+   id="metadata20"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs18" />
+<g
+   id="halo">
+	
+		<line
+   id="line2204-5"
+   style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+	<path
+   id="path2208-7"
+   style="fill:#FFFFFF;"
+   d="M4.1-0.7C3.2-0.6,1.6-0.1,0.8,1C-0.8,3-0.6,6.5,0,6.9c0.5,0.3,2.9-0.6,4.3-2.2   l8.3,4.1V14h0.9V9.9H16V8.8h-1.2l-0.5-1.2l0.5-0.9L5.4,2c0.1-1.1-0.3-2.3-0.6-2.6C4.6-0.7,4.4-0.7,4.1-0.7z" />
+	<polyline
+   id="polyline2210-3"
+   style="fill:none;stroke:#FFFFFF;stroke-width:2.25;stroke-miterlimit:10;"
+   points="11.4,14.8    7.8,5.5 7.6,5.3 5.4,14.8  " />
+</g>
+<line
+   id="line2204"
+   style="fill:none;stroke:#7B6A58;stroke-width:0.45;stroke-miterlimit:10;"
+   x1="0.9"
+   y1="5.8"
+   x2="0.9"
+   y2="14.2" />
+<rect
+   id="rect2206"
+   x="0.14999998"
+   y="13.4"
+   style="fill:#634e42"
+   width="1.5"
+   height="0.89999998" />
+<path
+   id="path2208"
+   style="fill:#3C3C3B;"
+   d="M0.6,6C0.1,5.7,0.1,3.1,1.3,1.6C2.1,0.5,3.8,0,4.2,0.3s0.5,2.1,0.1,2.8  C3.4,4.8,1.1,6.3,0.6,6z" />
+<polyline
+   id="polyline2210"
+   style="fill:none;stroke:#706F6F;stroke-width:1.25;stroke-miterlimit:10;"
+   points="11.4,14.8 7.8,5.5   7.6,5.3 5.4,14.8 " />
+<line
+   id="line2212"
+   style="fill:none;stroke:#634E42;stroke-width:0.75;stroke-miterlimit:10;"
+   x1="13.2"
+   y1="7.3"
+   x2="14.6"
+   y2="10.7" />
+<line
+   style="fill:none;stroke:#3C3C3B;stroke-miterlimit:10;"
+   x1="4"
+   y1="3"
+   x2="13.4"
+   y2="7.5"
+   id="line11" />
+<rect
+   id="rect2216"
+   y="14"
+   style="fill:#7D4E24;"
+   width="16"
+   height="2" />
+<rect
+   id="rect2218"
+   x="13.5"
+   y="9.9"
+   style="fill:#575756;"
+   width="2.5"
+   height="4.1" />
+</svg>
Index: trunk/resources/images/presets/landmark/windpump.svg
===================================================================
--- trunk/resources/images/presets/landmark/windpump.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/windpump.svg	(revision 18230)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 16 16"
+   width="16"
+   height="16"
+   id="svg90">
+  <metadata
+     id="metadata94">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12">
+    <path
+       d="M16 0C16 0 16 0 16 0C16 9.6 16 14.93 16 16C16 16 16 16 16 16C6.4 16 1.07 16 0 16C0 16 0 16 0 16C0 6.4 0 1.07 0 0C0 0 0 0 0 0C9.6 0 14.93 0 16 0Z"
+       id="ccRwnaUUk" />
+    <path
+       d="M8.31 6.11L4.77 16"
+       id="ceIUUXiUW" />
+    <path
+       d="M7.75 6.11L11.29 16"
+       id="a12gRlD1Ax" />
+    <path
+       d=""
+       id="d8zFyV8x0" />
+    <path
+       d="M7.04 8.29L6.07 6.59L7.03 4.88L8.96 4.87L9.93 6.57L8.97 8.27L7.04 8.29Z"
+       id="bINovgSx" />
+    <path
+       d="M9.67 11.3L5.49 14.3"
+       id="aiVw1qwfp" />
+    <path
+       d="M12.77 2.35L15.13 3.35L14.06 5.53L9.71 6.75L8.94 4.97L12.77 2.35Z"
+       id="bPr1Y3e7R" />
+    <path
+       d="M1.59 5.14L0.95 2.67L3.33 2.18L6.94 4.88L6.01 6.58L1.59 5.14Z"
+       id="exj7SiCrz" />
+    <path
+       d="M14.28 8.31L14.96 10.78L12.59 11.3L8.94 8.64L9.85 6.93L14.28 8.31Z"
+       id="bzrjfThtT" />
+    <path
+       d="M3.66 11.48L1.2 10.78L1.99 8.48L6.16 6.75L7.15 8.41L3.66 11.48Z"
+       id="bJHJhycjc" />
+  </defs>
+  <g
+     id="g88">
+    <path
+       style="fill:#288aed;fill-rule:evenodd;stroke:#2090cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1,15 C 1,15 1,1 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 0,0 -14,0 -14,0 z"
+       id="path880" />
+    <g
+       id="g86">
+      <g
+         id="g20">
+        <g
+           id="g18">
+          <use
+             xlink:href="#ccRwnaUUk"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="0"
+             id="use16"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g26">
+        <g
+           id="g24">
+          <use
+             xlink:href="#ceIUUXiUW"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use22"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g32">
+        <g
+           id="g30">
+          <use
+             xlink:href="#a12gRlD1Ax"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use28"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g38">
+        <g
+           id="g36">
+          <use
+             xlink:href="#d8zFyV8x0"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use34"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g46">
+        <use
+           xlink:href="#bINovgSx"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use40"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g44">
+          <use
+             xlink:href="#bINovgSx"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use42"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g52">
+        <g
+           id="g50">
+          <use
+             xlink:href="#aiVw1qwfp"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use48"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g60">
+        <use
+           xlink:href="#bPr1Y3e7R"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use54"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g58">
+          <use
+             xlink:href="#bPr1Y3e7R"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use56"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g68">
+        <use
+           xlink:href="#exj7SiCrz"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use62"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g66">
+          <use
+             xlink:href="#exj7SiCrz"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use64"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g76">
+        <use
+           xlink:href="#bzrjfThtT"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use70"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g74">
+          <use
+             xlink:href="#bzrjfThtT"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use72"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g84">
+        <use
+           xlink:href="#bJHJhycjc"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use78"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g82">
+          <use
+             xlink:href="#bJHJhycjc"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use80"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: trunk/resources/images/presets/landmark/windpump_gas.svg
===================================================================
--- trunk/resources/images/presets/landmark/windpump_gas.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/windpump_gas.svg	(revision 18230)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 16 16"
+   width="16"
+   height="16"
+   id="svg90">
+  <metadata
+     id="metadata94">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12">
+    <path
+       d="M16 0C16 0 16 0 16 0C16 9.6 16 14.93 16 16C16 16 16 16 16 16C6.4 16 1.07 16 0 16C0 16 0 16 0 16C0 6.4 0 1.07 0 0C0 0 0 0 0 0C9.6 0 14.93 0 16 0Z"
+       id="ccRwnaUUk" />
+    <path
+       d="M8.31 6.11L4.77 16"
+       id="ceIUUXiUW" />
+    <path
+       d="M7.75 6.11L11.29 16"
+       id="a12gRlD1Ax" />
+    <path
+       d=""
+       id="d8zFyV8x0" />
+    <path
+       d="M7.04 8.29L6.07 6.59L7.03 4.88L8.96 4.87L9.93 6.57L8.97 8.27L7.04 8.29Z"
+       id="bINovgSx" />
+    <path
+       d="M9.67 11.3L5.49 14.3"
+       id="aiVw1qwfp" />
+    <path
+       d="M12.77 2.35L15.13 3.35L14.06 5.53L9.71 6.75L8.94 4.97L12.77 2.35Z"
+       id="bPr1Y3e7R" />
+    <path
+       d="M1.59 5.14L0.95 2.67L3.33 2.18L6.94 4.88L6.01 6.58L1.59 5.14Z"
+       id="exj7SiCrz" />
+    <path
+       d="M14.28 8.31L14.96 10.78L12.59 11.3L8.94 8.64L9.85 6.93L14.28 8.31Z"
+       id="bzrjfThtT" />
+    <path
+       d="M3.66 11.48L1.2 10.78L1.99 8.48L6.16 6.75L7.15 8.41L3.66 11.48Z"
+       id="bJHJhycjc" />
+  </defs>
+  <g
+     id="g88">
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#ffff00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1,15 C 1,15 1,1 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 0,0 -14,0 -14,0 z"
+       id="path880" />
+    <g
+       id="g86">
+      <g
+         id="g20">
+        <g
+           id="g18">
+          <use
+             xlink:href="#ccRwnaUUk"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="0"
+             id="use16"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g26">
+        <g
+           id="g24">
+          <use
+             xlink:href="#ceIUUXiUW"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use22"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g32">
+        <g
+           id="g30">
+          <use
+             xlink:href="#a12gRlD1Ax"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use28"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g38">
+        <g
+           id="g36">
+          <use
+             xlink:href="#d8zFyV8x0"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use34"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g46">
+        <use
+           xlink:href="#bINovgSx"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use40"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g44">
+          <use
+             xlink:href="#bINovgSx"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use42"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g52">
+        <g
+           id="g50">
+          <use
+             xlink:href="#aiVw1qwfp"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use48"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g60">
+        <use
+           xlink:href="#bPr1Y3e7R"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use54"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g58">
+          <use
+             xlink:href="#bPr1Y3e7R"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use56"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g68">
+        <use
+           xlink:href="#exj7SiCrz"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use62"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g66">
+          <use
+             xlink:href="#exj7SiCrz"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use64"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g76">
+        <use
+           xlink:href="#bzrjfThtT"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use70"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g74">
+          <use
+             xlink:href="#bzrjfThtT"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use72"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g84">
+        <use
+           xlink:href="#bJHJhycjc"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use78"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g82">
+          <use
+             xlink:href="#bJHJhycjc"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use80"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: trunk/resources/images/presets/landmark/windpump_oil.svg
===================================================================
--- trunk/resources/images/presets/landmark/windpump_oil.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/windpump_oil.svg	(revision 18230)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 16 16"
+   width="16"
+   height="16"
+   id="svg90">
+  <metadata
+     id="metadata94">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12">
+    <path
+       d="M16 0C16 0 16 0 16 0C16 9.6 16 14.93 16 16C16 16 16 16 16 16C6.4 16 1.07 16 0 16C0 16 0 16 0 16C0 6.4 0 1.07 0 0C0 0 0 0 0 0C9.6 0 14.93 0 16 0Z"
+       id="ccRwnaUUk" />
+    <path
+       d="M8.31 6.11L4.77 16"
+       id="ceIUUXiUW" />
+    <path
+       d="M7.75 6.11L11.29 16"
+       id="a12gRlD1Ax" />
+    <path
+       d=""
+       id="d8zFyV8x0" />
+    <path
+       d="M7.04 8.29L6.07 6.59L7.03 4.88L8.96 4.87L9.93 6.57L8.97 8.27L7.04 8.29Z"
+       id="bINovgSx" />
+    <path
+       d="M9.67 11.3L5.49 14.3"
+       id="aiVw1qwfp" />
+    <path
+       d="M12.77 2.35L15.13 3.35L14.06 5.53L9.71 6.75L8.94 4.97L12.77 2.35Z"
+       id="bPr1Y3e7R" />
+    <path
+       d="M1.59 5.14L0.95 2.67L3.33 2.18L6.94 4.88L6.01 6.58L1.59 5.14Z"
+       id="exj7SiCrz" />
+    <path
+       d="M14.28 8.31L14.96 10.78L12.59 11.3L8.94 8.64L9.85 6.93L14.28 8.31Z"
+       id="bzrjfThtT" />
+    <path
+       d="M3.66 11.48L1.2 10.78L1.99 8.48L6.16 6.75L7.15 8.41L3.66 11.48Z"
+       id="bJHJhycjc" />
+  </defs>
+  <g
+     id="g88">
+    <path
+       style="fill:#708090;fill-rule:evenodd;stroke:#708090;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1,15 C 1,15 1,1 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 0,0 -14,0 -14,0 z"
+       id="path880" />
+    <g
+       id="g86">
+      <g
+         id="g20">
+        <g
+           id="g18">
+          <use
+             xlink:href="#ccRwnaUUk"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="0"
+             id="use16"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g26">
+        <g
+           id="g24">
+          <use
+             xlink:href="#ceIUUXiUW"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use22"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g32">
+        <g
+           id="g30">
+          <use
+             xlink:href="#a12gRlD1Ax"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use28"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g38">
+        <g
+           id="g36">
+          <use
+             xlink:href="#d8zFyV8x0"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use34"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g46">
+        <use
+           xlink:href="#bINovgSx"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use40"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g44">
+          <use
+             xlink:href="#bINovgSx"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use42"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g52">
+        <g
+           id="g50">
+          <use
+             xlink:href="#aiVw1qwfp"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use48"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g60">
+        <use
+           xlink:href="#bPr1Y3e7R"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use54"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g58">
+          <use
+             xlink:href="#bPr1Y3e7R"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use56"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g68">
+        <use
+           xlink:href="#exj7SiCrz"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use62"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g66">
+          <use
+             xlink:href="#exj7SiCrz"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use64"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g76">
+        <use
+           xlink:href="#bzrjfThtT"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use70"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g74">
+          <use
+             xlink:href="#bzrjfThtT"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use72"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g84">
+        <use
+           xlink:href="#bJHJhycjc"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use78"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g82">
+          <use
+             xlink:href="#bJHJhycjc"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use80"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: trunk/resources/images/presets/landmark/windpump_sewage.svg
===================================================================
--- trunk/resources/images/presets/landmark/windpump_sewage.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/windpump_sewage.svg	(revision 18230)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 16 16"
+   width="16"
+   height="16"
+   id="svg90">
+  <metadata
+     id="metadata94">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12">
+    <path
+       d="M16 0C16 0 16 0 16 0C16 9.6 16 14.93 16 16C16 16 16 16 16 16C6.4 16 1.07 16 0 16C0 16 0 16 0 16C0 6.4 0 1.07 0 0C0 0 0 0 0 0C9.6 0 14.93 0 16 0Z"
+       id="ccRwnaUUk" />
+    <path
+       d="M8.31 6.11L4.77 16"
+       id="ceIUUXiUW" />
+    <path
+       d="M7.75 6.11L11.29 16"
+       id="a12gRlD1Ax" />
+    <path
+       d=""
+       id="d8zFyV8x0" />
+    <path
+       d="M7.04 8.29L6.07 6.59L7.03 4.88L8.96 4.87L9.93 6.57L8.97 8.27L7.04 8.29Z"
+       id="bINovgSx" />
+    <path
+       d="M9.67 11.3L5.49 14.3"
+       id="aiVw1qwfp" />
+    <path
+       d="M12.77 2.35L15.13 3.35L14.06 5.53L9.71 6.75L8.94 4.97L12.77 2.35Z"
+       id="bPr1Y3e7R" />
+    <path
+       d="M1.59 5.14L0.95 2.67L3.33 2.18L6.94 4.88L6.01 6.58L1.59 5.14Z"
+       id="exj7SiCrz" />
+    <path
+       d="M14.28 8.31L14.96 10.78L12.59 11.3L8.94 8.64L9.85 6.93L14.28 8.31Z"
+       id="bzrjfThtT" />
+    <path
+       d="M3.66 11.48L1.2 10.78L1.99 8.48L6.16 6.75L7.15 8.41L3.66 11.48Z"
+       id="bJHJhycjc" />
+  </defs>
+  <g
+     id="g88">
+    <path
+       style="fill:#ee82ee;fill-rule:evenodd;stroke:#ee82ee;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1,15 C 1,15 1,1 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 0,0 -14,0 -14,0 z"
+       id="path880" />
+    <g
+       id="g86">
+      <g
+         id="g20">
+        <g
+           id="g18">
+          <use
+             xlink:href="#ccRwnaUUk"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="0"
+             id="use16"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g26">
+        <g
+           id="g24">
+          <use
+             xlink:href="#ceIUUXiUW"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use22"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g32">
+        <g
+           id="g30">
+          <use
+             xlink:href="#a12gRlD1Ax"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use28"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g38">
+        <g
+           id="g36">
+          <use
+             xlink:href="#d8zFyV8x0"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use34"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g46">
+        <use
+           xlink:href="#bINovgSx"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use40"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g44">
+          <use
+             xlink:href="#bINovgSx"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use42"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g52">
+        <g
+           id="g50">
+          <use
+             xlink:href="#aiVw1qwfp"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use48"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g60">
+        <use
+           xlink:href="#bPr1Y3e7R"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use54"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g58">
+          <use
+             xlink:href="#bPr1Y3e7R"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use56"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g68">
+        <use
+           xlink:href="#exj7SiCrz"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use62"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g66">
+          <use
+             xlink:href="#exj7SiCrz"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use64"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g76">
+        <use
+           xlink:href="#bzrjfThtT"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use70"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g74">
+          <use
+             xlink:href="#bzrjfThtT"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use72"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g84">
+        <use
+           xlink:href="#bJHJhycjc"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use78"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g82">
+          <use
+             xlink:href="#bJHJhycjc"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use80"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: trunk/resources/images/presets/landmark/windpump_steam.svg
===================================================================
--- trunk/resources/images/presets/landmark/windpump_steam.svg	(revision 18230)
+++ trunk/resources/images/presets/landmark/windpump_steam.svg	(revision 18230)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 16 16"
+   width="16"
+   height="16"
+   id="svg90">
+  <metadata
+     id="metadata94">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12">
+    <path
+       d="M16 0C16 0 16 0 16 0C16 9.6 16 14.93 16 16C16 16 16 16 16 16C6.4 16 1.07 16 0 16C0 16 0 16 0 16C0 6.4 0 1.07 0 0C0 0 0 0 0 0C9.6 0 14.93 0 16 0Z"
+       id="ccRwnaUUk" />
+    <path
+       d="M8.31 6.11L4.77 16"
+       id="ceIUUXiUW" />
+    <path
+       d="M7.75 6.11L11.29 16"
+       id="a12gRlD1Ax" />
+    <path
+       d=""
+       id="d8zFyV8x0" />
+    <path
+       d="M7.04 8.29L6.07 6.59L7.03 4.88L8.96 4.87L9.93 6.57L8.97 8.27L7.04 8.29Z"
+       id="bINovgSx" />
+    <path
+       d="M9.67 11.3L5.49 14.3"
+       id="aiVw1qwfp" />
+    <path
+       d="M12.77 2.35L15.13 3.35L14.06 5.53L9.71 6.75L8.94 4.97L12.77 2.35Z"
+       id="bPr1Y3e7R" />
+    <path
+       d="M1.59 5.14L0.95 2.67L3.33 2.18L6.94 4.88L6.01 6.58L1.59 5.14Z"
+       id="exj7SiCrz" />
+    <path
+       d="M14.28 8.31L14.96 10.78L12.59 11.3L8.94 8.64L9.85 6.93L14.28 8.31Z"
+       id="bzrjfThtT" />
+    <path
+       d="M3.66 11.48L1.2 10.78L1.99 8.48L6.16 6.75L7.15 8.41L3.66 11.48Z"
+       id="bJHJhycjc" />
+  </defs>
+  <g
+     id="g88">
+    <path
+       style="fill:#ff4b00;fill-rule:evenodd;stroke:#ff4b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1,15 C 1,15 1,1 1,1 c 0,0 14,0 14,0 0,0 0,14 0,14 0,0 -14,0 -14,0 z"
+       id="path880" />
+    <g
+       id="g86">
+      <g
+         id="g20">
+        <g
+           id="g18">
+          <use
+             xlink:href="#ccRwnaUUk"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="0"
+             id="use16"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g26">
+        <g
+           id="g24">
+          <use
+             xlink:href="#ceIUUXiUW"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use22"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g32">
+        <g
+           id="g30">
+          <use
+             xlink:href="#a12gRlD1Ax"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use28"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g38">
+        <g
+           id="g36">
+          <use
+             xlink:href="#d8zFyV8x0"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use34"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g46">
+        <use
+           xlink:href="#bINovgSx"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use40"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g44">
+          <use
+             xlink:href="#bINovgSx"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use42"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g52">
+        <g
+           id="g50">
+          <use
+             xlink:href="#aiVw1qwfp"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#000000"
+             stroke-width="1"
+             stroke-opacity="1"
+             id="use48"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g60">
+        <use
+           xlink:href="#bPr1Y3e7R"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use54"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g58">
+          <use
+             xlink:href="#bPr1Y3e7R"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use56"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g68">
+        <use
+           xlink:href="#exj7SiCrz"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use62"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g66">
+          <use
+             xlink:href="#exj7SiCrz"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use64"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g76">
+        <use
+           xlink:href="#bzrjfThtT"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use70"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g74">
+          <use
+             xlink:href="#bzrjfThtT"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use72"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+      <g
+         id="g84">
+        <use
+           xlink:href="#bJHJhycjc"
+           opacity="1"
+           fill="#b6b6b6"
+           fill-opacity="1"
+           id="use78"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" />
+        <g
+           id="g82">
+          <use
+             xlink:href="#bJHJhycjc"
+             opacity="1"
+             fill-opacity="0"
+             stroke="#494949"
+             stroke-width="0.8"
+             stroke-opacity="1"
+             id="use80"
+             x="0"
+             y="0"
+             width="100%"
+             height="100%" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: trunk/resources/images/presets/power/power_source-biofuel.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-biofuel.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-biofuel.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,10 @@
    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">
@@ -41,62 +35,4 @@
     </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">
@@ -136,5 +72,4 @@
      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"
@@ -162,5 +97,4 @@
      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"
Index: trunk/resources/images/presets/power/power_source-coal.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-coal.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-coal.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,10 @@
    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">
@@ -41,62 +35,4 @@
     </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">
@@ -136,5 +72,4 @@
      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"
@@ -162,5 +97,4 @@
      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"
Index: trunk/resources/images/presets/power/power_source-gas.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-gas.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-gas.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,10 @@
    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">
@@ -41,62 +35,4 @@
     </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">
@@ -136,5 +72,4 @@
      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"
@@ -162,5 +97,4 @@
      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"
Index: trunk/resources/images/presets/power/power_source-geothermal.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-geothermal.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-geothermal.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,8 @@
    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" />
@@ -43,62 +35,4 @@
     </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">
@@ -137,16 +71,13 @@
        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: trunk/resources/images/presets/power/power_source-nuclear.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-nuclear.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-nuclear.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,8 @@
    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" />
@@ -43,62 +35,4 @@
     </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">
@@ -137,16 +71,13 @@
        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"
Index: trunk/resources/images/presets/power/power_source-oil.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-oil.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-oil.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,10 @@
    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">
@@ -41,62 +35,4 @@
     </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">
@@ -122,5 +58,5 @@
   </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"
@@ -136,5 +72,4 @@
      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"
@@ -162,5 +97,4 @@
      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"
Index: trunk/resources/images/presets/power/power_source-sun.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-sun.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-sun.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,8 @@
    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" />
@@ -43,62 +35,4 @@
     </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">
@@ -124,55 +58,59 @@
   </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: trunk/resources/images/presets/power/power_source-water.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-water.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-water.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,8 @@
    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" />
@@ -43,62 +35,4 @@
     </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">
@@ -124,5 +58,5 @@
   </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"
@@ -137,16 +71,13 @@
        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: trunk/resources/images/presets/power/power_source-wind.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-wind.svg	(revision 18229)
+++ trunk/resources/images/presets/power/power_source-wind.svg	(revision 18230)
@@ -1,5 +1,3 @@
 <?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/"
@@ -8,14 +6,8 @@
    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" />
@@ -43,62 +35,4 @@
     </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">
@@ -163,6 +97,5 @@
        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>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 18229)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 18230)
@@ -1553,4 +1553,6 @@
     color: pipeline#660000;
 }
+area[man_made=petroleum_well],
+area[man_made=pump],
 area[pipeline=substation] {
     fill-color: pipeline_substation#eeeeee;
@@ -1570,4 +1572,52 @@
 node[man_made=manhole] {
     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;
 }
@@ -1575,10 +1625,7 @@
 node[man_made=groyne],
 node[man_made=embankment],
+node[man_made=pumping_rig],
 node[man_made=pipeline] {
     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;
 }
@@ -1588,4 +1635,5 @@
 area[man_made=water_well],
 area[man_made=windmill],
+area[man_made=windpump],
 area[man_made=works],
 area[man_made=water_works] {
@@ -1616,6 +1664,30 @@
     set icon_z17;
 }
+node[man_made=water_well][mechanical_coupling=nodding_donkey] {
+    icon-image: "presets/landmark/water_well_donkey.svg";
+    set icon_z17;
+}
 node[man_made=windmill] {
     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;
 }