Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 969)
+++ /trunk/styles/standard/elemstyles.xml	(revision 970)
@@ -1572,4 +1572,12 @@
 
 	<rule>
+		<condition k="amenity" v="emergency_phone"/>
+		<icon annotate="true" src="vehicle/emergency_phone.png"/>
+		<area colour="amenity2#f7efb7"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="toilets"/>
 		<icon annotate="true" src="public/toilets.png"/>
@@ -1795,4 +1803,12 @@
 
 	<rule>
+		<condition k="amenity" v="veterinary"/>
+		<area colour="health#eeeeee"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="library"/>
 		<area colour="amenity2#f7efb7"/>
@@ -1827,4 +1843,12 @@
 
 	<rule>
+		<condition k="amenity" v="ferry_terminal"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="amenity2#f7efb7"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="theatre"/>
 		<area colour="amenity2#f7efb7"/>
@@ -2905,5 +2929,5 @@
 		<condition k="sport" v="10pin"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sports/10pin.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2985,5 +3009,5 @@
 		<condition k="sport" v="croquet"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sports/croquet.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3041,5 +3065,5 @@
 		<condition k="sport" v="hockey"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sports/hockey.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3057,5 +3081,5 @@
 		<condition k="sport" v="motor"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="vehicle/motorbike.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>