Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 1465)
+++ trunk/styles/standard/elemstyles.xml	(revision 1466)
@@ -1636,5 +1636,5 @@
 	<rule>
 		<condition k="parking" v="multi-storey"/>
-		<icon annotate="true" src="vehicle/parking/garage.png" priority="10000"/>
+		<icon annotate="true" src="vehicle/parking/multi-storey.png" priority="10000"/>
 		<area colour="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1668,5 +1668,5 @@
 	<rule>
 		<condition k="amenity" v="bicycle_parking"/>
-		<icon annotate="true" src="vehicle/parking/bike.png"/>
+		<icon annotate="true" src="vehicle/parking/bicycle.png"/>
 		<area colour="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1756,5 +1756,5 @@
 	<rule>
 		<condition k="amenity" v="public_building"/>
-		<icon annotate="true" src="public.png"/>
+		<icon annotate="true" src="service.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1764,5 +1764,5 @@
 	<rule>
 		<condition k="amenity" v="embassy"/>
-		<icon annotate="true" src="public.png"/>
+		<icon annotate="true" src="service.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1772,5 +1772,5 @@
 	<rule>
 		<condition k="amenity" v="townhall"/>
-		<icon annotate="true" src="public.png"/>
+		<icon annotate="true" src="service.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1780,5 +1780,5 @@
 	<rule>
 		<condition k="amenity" v="community_centre"/>
-		<icon annotate="true" src="public.png"/>
+		<icon annotate="true" src="service.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>