Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 503)
+++ trunk/styles/standard/elemstyles.xml	(revision 519)
@@ -94,4 +94,11 @@
     </rule>
 
+	<rule>
+		<condition k="highway" v="living_street"/>
+		<line width="1" realwidth="3" colour="#c0c0c0"/> 
+        <scale_min>1</scale_min>
+        <scale_max>40000</scale_max>
+    </rule>
+
     <rule>
         <condition k="highway" v="service"/>
@@ -389,4 +396,12 @@
 		<condition k="waterway" v="weir" />
 		<icon annotate="true" src="nautical/weir.png" />
+        <line width="2" colour="#D8D8D8" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="waterway" v="dam" />
+        <line width="2" colour="#D8D8D8" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -409,4 +424,11 @@
 
 	<rule>
+		<condition k="railway" v="tram_stop" />
+		<icon annotate="true" src="transport/railway_small.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="railway" v="viaduct" />
 		<icon annotate="true" src="vehicle/viaduct.png" />
@@ -517,5 +539,5 @@
     <rule>
         <condition k="aeroway" v="helipad"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="transport/airport/helipad.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -557,4 +579,11 @@
 		<condition k="power" v="line" />
         <line width="1" colour="#eeeeee" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="power" v="sub_station" />
+		<icon annotate="true" src="misc/landmark/power.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -661,4 +690,19 @@
 	</rule>
 
+	<rule>
+		<condition k="man_made" v="pipeline" />
+        <line width="2" colour="#660000" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="man_made" v="wastewater_plant" />
+        <area colour="#D8D8D8" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--leisure tags -->
 	<rule>
@@ -1039,4 +1083,12 @@
 	</rule>
 
+	<rule>
+		<condition k="amenity" v="fountain"/>
+		<icon annotate="true" src="misc/landmark/spring.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--shop tags -->
 
@@ -1071,5 +1123,5 @@
 	<rule>
 		<condition k="shop" v="doityourself" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/diy_store.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1078,5 +1130,12 @@
 	<rule>
 		<condition k="shop" v="outdoor" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/sports/outdoor.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="kiosk" />
+		<icon annotate="true" src="shopping/kiosk.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1092,4 +1151,32 @@
 
 	<rule>
+		<condition k="tourism" v="hotel" />
+		<icon annotate="true" src="accommodation.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="motel" />
+		<icon annotate="true" src="accommodation/motel.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="guest_house" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="hostel" />
+		<icon annotate="true" src="accommodation/hostel.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="tourism" v="camp_site" />
 		<icon annotate="true" src="accommodation/camping.png" />
@@ -1126,32 +1213,4 @@
 	</rule>
 
-	<rule>
-		<condition k="tourism" v="hotel" />
-		<icon annotate="true" src="accommodation.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="tourism" v="motel" />
-		<icon annotate="true" src="accommodation/motel.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="tourism" v="guest_house" />
-		<icon annotate="true" src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="tourism" v="hostel" />
-		<icon annotate="true" src="accommodation/hostel.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
     <rule>
         <condition k="tourism" v="attraction"/>
@@ -1161,4 +1220,11 @@
     </rule>
 
+    <rule>
+        <condition k="tourism" v="artwork"/>
+        <icon annotate="true" src="public/arts_centre.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
 <!--historic tags -->
 	<rule>
@@ -1193,11 +1259,4 @@
 		<condition k="historic" v="archaeological_site" />
 		<icon annotate="true" src="sightseeing/archaeological.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="historic" v="icon" />
-		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1254,5 +1313,5 @@
 		<condition k="landuse" v="forest"/>
 		<area colour="#b1efc8" />
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/landmark/trees.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1262,5 +1321,5 @@
 		<condition k="landuse" v="allotments"/>
 		<area colour="#b1e0c2" />
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/landmark/plant.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1316,4 +1375,28 @@
 
 	<rule>
+		<condition k="landuse" v="railway"/>
+		<area colour="#b1ec5c"/>
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="construction"/>
+		<area colour="#b1ec5c"/>
+		<icon src="misc/construction.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="military"/>
+		<area colour="#b1ec5c"/>
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="landuse" v="cemetery"/>
 		<area colour="#bde3cb"/>
@@ -1326,5 +1409,5 @@
 		<condition k="landuse" v="village_green"/>
 		<area colour="#b1e0c2" />
-		<icon src="misc/no_icon.png" />
+		<icon src="recreation/common.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1334,5 +1417,5 @@
 		<condition k="landuse" v="recreation_ground"/>
 		<area colour="#b1e0c2" />
-		<icon src="misc/no_icon.png" />
+		<icon src="recreation/common.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1366,5 +1449,5 @@
 	<rule>
 		<condition k="military" v="danger_area" />
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/danger.png" />
 		<area colour="#b62c2c"/>
         <scale_min>1</scale_min>
@@ -1396,4 +1479,19 @@
     
     <rule>
+        <condition k="natural" v="glacier"/>
+        <icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="#ffffff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="natural" v="volcano"/>
+        <icon annotate="true" src="misc/no_icon.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
         <condition k="natural" v="cliff"/>
 		<icon src="misc/no_icon.png" />
@@ -1437,5 +1535,5 @@
 	<rule>
         <condition k="natural" v="wood"/>
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/landmark/trees.png" />
         <area colour="#008000" />
         <scale_min>1</scale_min>
@@ -1495,12 +1593,4 @@
 		<icon src="misc/no_icon.png" />
 		<area colour="#002f00"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-    <rule>
-		<condition k="natural" v="glacier"/>
-		<icon src="misc/no_icon.png" />
-		<area colour="#ffffff"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1841,4 +1931,11 @@
 <!--properties tags -->
 
+	<rule>
+		<condition k="mountain_pass" v="yes" />
+		<icon src="misc/landmark/mountain_pass.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--restrictions tags -->
 
@@ -1927,5 +2024,5 @@
 	<rule>
 		<condition k="place" v="island" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/island.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1985,11 +2082,4 @@
 
 	<rule>
-		<condition k="shop" v="kiosk" />
-		<icon annotate="true" src="vehicle/caution.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="shop" v="motorcycle" />
 		<icon annotate="true" src="vehicle/caution.png" />