Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 3448)
+++ trunk/styles/standard/elemstyles.xml	(revision 3493)
@@ -2044,4 +2044,12 @@
 
 	<rule>
+		<condition k="amenity" v="motorcycle_parking"/>
+		<icon annotate="true" src="vehicle/parking/motorbike.png"/>
+		<area colour="amenity_traffic#f7efb7"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="bicycle_parking"/>
 		<icon annotate="true" src="vehicle/parking/bicycle.png"/>
@@ -2461,5 +2469,5 @@
 	<rule>
 		<condition k="amenity" v="ferry_terminal"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="nautical/ferry.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -2726,5 +2734,13 @@
 	<rule>
 		<condition k="shop" v="car_repair"/>
-		<icon annotate="true" src="transport/car.png"/>
+		<icon annotate="true" src="vehicle/repair_shop.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="tyres"/>
+		<icon annotate="true" src="vehicle/tyres.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -3578,5 +3594,5 @@
 	<rule>
 		<condition k="natural" v="cave_entrance"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="vehicle/tunnel.png"/>
 		<area colour="natural#002f00"/>
 		<scale_min>1</scale_min>