Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 2562)
+++ trunk/styles/standard/elemstyles.xml	(revision 2630)
@@ -793,18 +793,4 @@
 
 	<rule>
-		<condition k="highway" v="cattle_grid"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="highway" v="toll_booth"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="highway" v="incline"/>
 		<icon annotate="true" src="vehicle/restriction/incline.png"/>
@@ -1282,4 +1268,12 @@
 
 	<rule>
+		<condition k="railway" v="funicular"/>
+		<line width="1" colour="rail#404040" dashed="true"/>
+		<icon annotate="true" src="misc/deprecated.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="service" v="yard"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
@@ -1354,4 +1348,11 @@
 
 	<rule>
+		<condition k="aeroway" v="gate"/>
+		<icon annotate="true" src="misc/no_icon.png"/>		
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="aeroway" v="windsock"/>
 		<icon annotate="true" src="transport/airport/windsock.png"/>
@@ -1623,4 +1624,11 @@
 
 	<rule>
+		<condition k="man_made" v="petroleum_well"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="man_made" v="reservoir_covered"/>
 		<icon annotate="true" src="misc/landmark/reservoir_covered.png"/>
@@ -1819,4 +1827,20 @@
 		<condition k="leisure" v="miniature_golf"/>
 		<icon annotate="true" src="sport/golf.png"/>
+		<area colour="leisure#c7f1a3"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="leisure" v="dog_park"/>
+		<icon annotate="true" src="leisure/dog.png"/>
+		<area colour="leisure#c7f1a3"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="leisure" v="ice_rink"/>
+		<icon annotate="true" src="sport/hockey.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -4266,75 +4290,13 @@
 
 	<!-- historic=museum -> tourism=museum -->
-	<rule>
-		<condition k="historic" v="museum"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
 	<!-- man_made=power_wind -> power=generator and power_source=wind -->
-	<rule>
-		<condition k="man_made" v="power_wind"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
 	<!-- man_made=power_hydro -> power=generator and power_source=hydro -->
-	<rule>
-		<condition k="man_made" v="power_hydro"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
 	<!-- man_made=power_fossil -> power=generator and power_source=fossil -->
-	<rule>
-		<condition k="man_made" v="power_fossil"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
 	<!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
-	<rule>
-		<condition k="man_made" v="power_nuclear"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<!-- highway classification now more detailed -->
-	<rule>
-		<condition k="highway" v="minor"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>40000</scale_max>
-	</rule>
-
+	<!-- highway minor - classification now more detailed -->
 	<!-- amenity=park_bench -> amenity=bench -->
-	<rule>
-		<condition k="amenity" v="park_bench"/>
-		<area colour="deprecated#ff0000"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
 	<!-- highway=stile -> barrier=stile -->
-	<rule>
-		<condition k="highway" v="stile"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
+	<!-- highway=cattle_grid -> barrier=cattle_grid -->
+	<!-- highway=toll_booth -> barrier=toll_booth -->
 
 	<!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->