Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3619)
+++ trunk/data/defaultpresets.xml	(revision 3620)
@@ -2378,5 +2378,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
+        <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
             <label text="Edit Baby Hatch" />
@@ -2492,11 +2492,4 @@
         </item>
         <separator/>
-        <item name="Fountain" icon="presets/spring.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-            <label text="Edit Fountain" />
-            <key key="amenity" value="fountain" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
         <item name="Drinking Water" icon="presets/drinking_water.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
@@ -2902,4 +2895,14 @@
             <check key="disused" text="Disused" default="off" delete_if_empty="true" />                                                             
         </item>
+        <item name="Adit" icon="presets/tunnel.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
+            <label text="Edit Adit" />
+            <key key="man_made" value="adit" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="length" text="Length in meters" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" default="" delete_if_empty="true" />
+            <check key="disused" text="Disused" default="off" delete_if_empty="true" />                                                             
+        </item>
         <separator/>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
@@ -2923,4 +2926,17 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>       
+        <item name="Fountain" icon="presets/spring.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
+            <label text="Edit Fountain" />
+            <key key="amenity" value="fountain" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Water Well" icon="presets/empty.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
+            <label text="Edit Water Well" />
+            <key key="man_made" value="water_well" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
         <separator/>
         <item name="Lighthouse" icon="presets/lighthouse.png" type="node,closedway">
@@ -2977,5 +2993,14 @@
             <text key="ref" text="Line reference" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Tower" icon="presets/power_tower.png" type="node,closedway">
+        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dcable_distribution_cabinet"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
+            <label text="Edit Cable Distribution Cabinet" />
+            <key key="power" value="cable_distribution_cabinet" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Power Tower" icon="presets/power_tower.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
@@ -2983,6 +3008,13 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
             <label text="Edit Power Tower" />
-            <combo key="power" text="Type" values="tower,pole" default="tower" delete_if_empty="true" />
+            <key key="power" value="tower" />
             <text key="ref" text="Tower reference" default="" delete_if_empty="true" />
+        </item>
+        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dpole"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
+            <label text="Edit Power Pole" />
+            <key key="power" value="tower" />
+            <text key="ref" text="Pole reference" default="" delete_if_empty="true" />
         </item>
         <item name="Power Line" icon="presets/power.png" type="way">
@@ -3172,5 +3204,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Boutique" icon="presets/empty.png" type="node,closedway">
+        <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
             <label text="Edit Boutique" />
@@ -3429,5 +3461,5 @@
         </item>                             
         <separator/>
-        <item name="Stationery" icon="presets/empty.png" type="node,closedway">
+        <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
             <label text="Edit Stationery Shop" />
             <key key="shop" value="stationery" />
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 3619)
+++ trunk/styles/standard/elemstyles.xml	(revision 3620)
@@ -1628,4 +1628,11 @@
 
 	<rule>
+		<condition k="power" v="cable_distribution_cabinet"/>
+		<icon annotate="true" src="misc/landmark/power.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="power_source" v="wind"/>
 		<icon annotate="true" src="misc/landmark/power/wind.png"/>
@@ -1752,4 +1759,12 @@
 		<condition k="man_made" v="mineshaft"/>
 		<icon annotate="true" src="misc/landmark/mine.png"/>
+		<area colour="manmade#d8d8d8"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="man_made" v="adit"/>
+		<icon annotate="true" src="vehicle/tunnel.png"/>
 		<area colour="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
@@ -1838,4 +1853,12 @@
 
 	<rule>
+		<condition k="man_made" v="water_well"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="manmade#d8d8d8"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="man_made" v="windmill"/>
 		<icon annotate="true" src="misc/landmark/windmill.png"/>
@@ -2522,5 +2545,5 @@
 	<rule>
 		<condition k="amenity" v="baby_hatch"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="health/baby_hatch.png"/>
 		<area colour="health#eeeeee"/>
 		<scale_min>1</scale_min>
@@ -2835,5 +2858,5 @@
 	<rule>
 		<condition k="shop" v="boutique"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="shop/boutique.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -3156,5 +3179,5 @@
 	<rule>
 		<condition k="shop" v="stationery"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="shop/stationery.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>