Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 3499)
+++ /trunk/styles/standard/elemstyles.xml	(revision 3500)
@@ -2012,4 +2012,28 @@
 
 	<rule>
+		<condition k="amenity" v="motorcycle_parking"/>
+		<icon annotate="true" src="vehicle/parking/motorbike.png" priority="20000"/>
+		<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" priority="20000"/>
+		<area colour="amenity_traffic#f7efb7"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="parking" v="park_and_ride"/>
+		<icon annotate="true" src="vehicle/parking/park_ride.png" priority="20000"/>
+		<area colour="amenity_traffic#f7efb7"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="parking" v="multi-storey"/>
 		<icon annotate="true" src="vehicle/parking/multi-storey.png" priority="10000"/>
@@ -2028,12 +2052,4 @@
 
 	<rule>
-		<condition k="parking" v="park_and_ride"/>
-		<icon annotate="true" src="vehicle/parking/park_ride.png" priority="10000"/>
-		<area colour="amenity_traffic#f7efb7"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="parking" v="surface"/>
 		<icon annotate="true" src="vehicle/parking.png"/>
@@ -2046,20 +2062,4 @@
 		<condition k="amenity" v="parking"/>
 		<icon annotate="true" src="vehicle/parking.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<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"/>
 		<area colour="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -3983,7 +3983,23 @@
 
 	<rule>
+		<condition k="sport" v="karting"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/karting.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="motocross"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/motocross.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="sport" v="motor"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="vehicle/motorbike.png"/>
+		<icon src="sport/motor.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>