Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 2639)
+++ trunk/styles/standard/elemstyles.xml	(revision 2640)
@@ -1318,5 +1318,5 @@
 	<rule>
 		<condition k="aeroway" v="gate"/>
-		<icon annotate="true" src="misc/no_icon.png"/>		
+		<icon annotate="true" src="transport/airport/terminal.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2262,5 +2262,5 @@
 	<rule>
 		<condition k="amenity" v="driving_school"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="education/driving_school.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -2455,5 +2455,13 @@
 		<condition k="amenity" v="hunting_stand"/>
 		<area colour="amenity_light#f7efb7"/>
-    <icon annotate="true" src="hunting_stand.png"/>
+		<icon annotate="true" src="hunting_stand.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="marketplace"/>
+		<area colour="amenity_light#f7efb7"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4162,34 +4170,6 @@
 
 	<rule>
-		<condition k="building" b="yes"/>
+		<condition k="building"/>
 		<icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
-		<area colour="building#cb9999" priority="-10000"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	<rule>
-		<condition k="building" v="church"/>
-		<icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-		<area colour="building#cb9999" priority="-10000"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	<rule>
-		<condition k="building" v="museum"/>
-		<icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-		<area colour="building#cb9999" priority="-10000"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	<rule>
-		<condition k="building" v="tower"/>
-		<icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-		<area colour="building#cb9999" priority="-10000"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	<rule>
-		<condition k="building" v="station"/>
-		<icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 		<area colour="building#cb9999" priority="-10000"/>
 		<scale_min>1</scale_min>