Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 1098)
+++ /trunk/styles/standard/elemstyles.xml	(revision 1099)
@@ -228,5 +228,5 @@
 
 	<rule>
-		<condition k="maxweight" v="yes"/>
+		<condition k="maxweight"/>
 		<icon src="vehicle/restrictions/maxweight.png"/>
 		<scale_min>1</scale_min>
@@ -235,5 +235,5 @@
 
 	<rule>
-		<condition k="maxheight" v="yes"/>
+		<condition k="maxheight"/>
 		<icon src="vehicle/restrictions/maxheight.png"/>
 		<scale_min>1</scale_min>
@@ -242,5 +242,5 @@
 
 	<rule>
-		<condition k="maxwidth" v="yes"/>
+		<condition k="maxwidth"/>
 		<icon src="vehicle/restrictions/maxwidth.png"/>
 		<scale_min>1</scale_min>
@@ -249,5 +249,5 @@
 
 	<rule>
-		<condition k="maxlength" v="yes"/>
+		<condition k="maxlength"/>
 		<icon src="vehicle/restrictions/maxlength.png"/>
 		<scale_min>1</scale_min>
@@ -256,5 +256,5 @@
 
 	<rule>
-		<condition k="maxspeed" v="yes"/>
+		<condition k="maxspeed"/>
 		<icon src="vehicle/restrictions/speed.png"/>
 		<scale_min>1</scale_min>
@@ -263,5 +263,5 @@
 
 	<rule>
-		<condition k="minspeed" v="yes"/>
+		<condition k="minspeed"/>
 		<icon src="vehicle/restrictions/minspeed.png"/>
 		<scale_min>1</scale_min>
@@ -270,5 +270,5 @@
 
 	<rule>
-		<condition k="maxstay" v="yes"/>
+		<condition k="maxstay"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
@@ -277,5 +277,5 @@
 
 	<rule>
-		<condition k="toll" v="yes"/>
+		<condition k="toll"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
@@ -298,4 +298,10 @@
 		<condition k="barrier" v="speed_bump"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier"/>
+		<icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2006,5 +2012,5 @@
 	<rule>
 		<condition k="amenity" v="vending_machine"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="transport/ticket-machine.png"/>
 		<area colour="amenity2#f7efb7"/>
 		<scale_min>1</scale_min>