Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 3622)
+++ trunk/styles/standard/elemstyles.xml	(revision 3623)
@@ -488,5 +488,5 @@
 	<rule>
 		<condition k="barrier" v="block"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/block.png"/>
 		<line width="3" colour="barrier#F0F050"/>
 		<area colour="barrier#F0F050" closed="true"/>
@@ -496,5 +496,5 @@
 	<rule>
 		<condition k="barrier" v="border_control"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/border_control.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1193,5 +1193,5 @@
 	<rule>
 		<condition k="waterway" v="dam"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="nautical/dam.png"/>
 		<line width="2" colour="manmade#d8d8d8"/>
 		<area colour="manmade#d8d8d8" closed="true"/>
@@ -1429,5 +1429,5 @@
 		<condition k="aeroway" v="runway"/>
 		<line width="3" colour="aeroway_dark#330000"/>
-		<icon annotate="true" src="transport/airport.png"/>
+		<icon annotate="true" src="transport/airport/runway.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1437,5 +1437,5 @@
 		<condition k="aeroway" v="taxiway"/>
 		<line width="2" colour="aeroway#660000"/>
-		<icon annotate="true" src="transport/airport.png"/>
+		<icon annotate="true" src="transport/airport/taxiway.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1445,5 +1445,13 @@
 		<condition k="aeroway" v="apron"/>
 		<area colour="aeroway_light#990000"/>
-		<icon annotate="true" src="transport/airport.png"/>
+		<icon annotate="true" src="transport/airport/apron.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="aeroway" v="hangar"/>
+		<area colour="aeroway_light#990000"/>
+		<icon annotate="true" src="transport/airport/hangar.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1452,5 +1460,5 @@
 	<rule>
 		<condition k="aeroway" v="gate"/>
-		<icon annotate="true" src="transport/airport/terminal.png"/>
+		<icon annotate="true" src="transport/airport/gate.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1742,5 +1750,5 @@
 	<rule>
 		<condition k="man_made" v="groyne"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="nautical/groyne.png"/>
 		<area colour="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
@@ -1751,4 +1759,12 @@
 		<condition k="man_made" v="lighthouse"/>
 		<icon annotate="true" src="misc/landmark/lighthouse.png"/>
+		<area colour="manmade#d8d8d8"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="man_made" v="measurement_station"/>
+		<icon annotate="true" src="misc/landmark/measurement_station.png"/>
 		<area colour="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
@@ -1854,5 +1870,5 @@
 	<rule>
 		<condition k="man_made" v="water_well"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="misc/landmark/water_well.png"/>
 		<area colour="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
@@ -3782,5 +3798,5 @@
 	<rule>
 		<condition k="natural" v="cliff"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="misc/cliff.png"/>
 		<line width="2" colour="natural#002f00"/>
 		<area colour="natural#002f00" closed="true"/>
@@ -3847,5 +3863,5 @@
 	<rule>
 		<condition k="natural" v="coastline"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="misc/coastline.png"/>
 		<line width="1" colour="water#0000ff"/>
 		<scale_min>1</scale_min>
@@ -3855,5 +3871,5 @@
 	<rule>
 		<condition k="natural" v="mud"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="misc/mud.png"/>
 		<area colour="mud#cba762"/>
 		<scale_min>1</scale_min>
@@ -3863,5 +3879,5 @@
 	<rule>
 		<condition k="natural" v="beach"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="misc/beach.png"/>
 		<area colour="beach#f8dba2"/>
 		<scale_min>1</scale_min>
@@ -3871,5 +3887,5 @@
 	<rule>
 		<condition k="natural" v="bay"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="misc/bay.png"/>
 		<area colour="natural#002f00"/>
 		<scale_min>1</scale_min>