Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 2735)
+++ /trunk/styles/standard/elemstyles.xml	(revision 2736)
@@ -378,4 +378,10 @@
 
 	<rule>
+		<condition k="barrier"/>
+		<icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
 		<condition k="barrier" v="bollard"/>
 		<icon annotate="true" src="vehicle/restriction/bollard.png"/>
@@ -412,5 +418,5 @@
 	<rule>
 		<condition k="barrier" v="fence"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
 		<line width="3" colour="barrier#F0F050"/>
 		<area colour="barrier#F0F050" closed="true"/>
@@ -846,6 +852,6 @@
 	<rule>
 		<condition k="highway" v="construction"/>
-		<line width="2" realwidth="5" colour="construction#ffff00" dashed="true"/>
-		<icon src="misc/construction.png"/>
+		<line width="2" realwidth="5" colour="construction#ffff00" dashed="true" priority="10"/>
+		<icon src="misc/construction.png" priority="10"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2463,5 +2469,5 @@
 		<condition k="amenity" v="marketplace"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="place/marketplace.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>