Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 1461)
+++ trunk/styles/standard/elemstyles.xml	(revision 1465)
@@ -51,5 +51,5 @@
 	<rule>
 		<condition k="restriction" v="no_left_turn"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/no_left_turn.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -57,5 +57,5 @@
 	<rule>
 		<condition k="restriction" v="no_right_turn"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/no_right_turn.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -63,5 +63,5 @@
 	<rule>
 		<condition k="restriction" v="no_straight_on"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/no_straight_on.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -69,5 +69,5 @@
 	<rule>
 		<condition k="restriction" v="no_u_turn"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/no_u_turn.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -75,5 +75,5 @@
 	<rule>
 		<condition k="restriction" v="only_left_turn"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/only_left_turn.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/only_left_turn.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -81,5 +81,5 @@
 	<rule>
 		<condition k="restriction" v="only_right_turn"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/only_right_turn.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/only_right_turn.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -87,5 +87,5 @@
 	<rule>
 		<condition k="restriction" v="only_straight_on"/>
-		<icon annotate="true" src="vehicle/restrictions/turn_restrictions/only_straight_on.png"/>
+		<icon annotate="true" src="vehicle/restriction/turn_restrictions/only_straight_on.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -170,5 +170,5 @@
 	<rule>
 		<condition k="access" b="no"/>
-		<icon src="vehicle/restrictions/access.png"/>
+		<icon src="vehicle/restriction/access.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -198,5 +198,5 @@
 	<rule>
 		<condition k="bicycle" b="no"/>
-		<icon src="vehicle/restrictions/bicycle.png"/>
+		<icon src="vehicle/restriction/bicycle.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -205,5 +205,5 @@
 		<condition k="bicycle" v="designated"/>
 		<line width="1" realwidth="2" colour="bicycle#ff00ff"/>
-		<icon annotate="true" src="vehicle/restrictions/bicycle-designated.png"/>
+		<icon annotate="true" src="vehicle/restriction/bicycle-designated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -212,5 +212,5 @@
 	<rule>
 		<condition k="foot" b="no"/>
-		<icon src="vehicle/restrictions/foot.png"/>
+		<icon src="vehicle/restriction/foot.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -219,5 +219,5 @@
 		<condition k="foot" v="designated"/>
 		<line width="1" realwidth="1" colour="foot#00ff00"/>
-		<icon annotate="true" src="vehicle/restrictions/foot-designated.png"/>
+		<icon annotate="true" src="vehicle/restriction/foot-designated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -226,5 +226,5 @@
 	<rule>
 		<condition k="goods" b="no"/>
-		<icon src="vehicle/restrictions/goods.png"/>
+		<icon src="vehicle/restriction/goods.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -233,5 +233,5 @@
 	<rule>
 		<condition k="hgv" b="no"/>
-		<icon src="vehicle/restrictions/goods.png"/>
+		<icon src="vehicle/restriction/goods.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -240,5 +240,5 @@
 	<rule>
 		<condition k="horse" b="no"/>
-		<icon src="vehicle/restrictions/horse.png"/>
+		<icon src="vehicle/restriction/horse.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -247,5 +247,5 @@
 		<condition k="horse" v="designated"/>
 		<line width="1" realwidth="2" colour="horse#c08000"/>
-		<icon src="vehicle/restrictions/horse-designated.png"/>
+		<icon src="vehicle/restriction/horse-designated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -254,5 +254,5 @@
 	<rule>
 		<condition k="motorcycle" b="no"/>
-		<icon src="vehicle/restrictions/motorbike.png"/>
+		<icon src="vehicle/restriction/motorbike.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -261,5 +261,5 @@
 	<rule>
 		<condition k="motorcar" b="no"/>
-		<icon src="vehicle/restrictions/motorcar.png"/>
+		<icon src="vehicle/restriction/motorcar.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -268,5 +268,5 @@
 	<rule>
 		<condition k="psv" b="no"/>
-		<icon src="vehicle/restrictions/psv.png"/>
+		<icon src="vehicle/restriction/psv.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -289,5 +289,5 @@
 	<rule>
 		<condition k="noexit" b="yes"/>
-		<icon src="vehicle/restrictions/dead_end.png"/>
+		<icon src="vehicle/restriction/dead_end.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -296,5 +296,5 @@
 	<rule>
 		<condition k="maxweight"/>
-		<icon src="vehicle/restrictions/maxweight.png"/>
+		<icon src="vehicle/restriction/maxweight.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -303,5 +303,5 @@
 	<rule>
 		<condition k="maxheight"/>
-		<icon src="vehicle/restrictions/maxheight.png"/>
+		<icon src="vehicle/restriction/maxheight.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -310,5 +310,5 @@
 	<rule>
 		<condition k="maxwidth"/>
-		<icon src="vehicle/restrictions/maxwidth.png"/>
+		<icon src="vehicle/restriction/maxwidth.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -317,5 +317,5 @@
 	<rule>
 		<condition k="maxlength"/>
-		<icon src="vehicle/restrictions/maxlength.png"/>
+		<icon src="vehicle/restriction/maxlength.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -324,5 +324,5 @@
 	<rule>
 		<condition k="maxspeed"/>
-		<icon src="vehicle/restrictions/speed.png"/>
+		<icon src="vehicle/restriction/speed.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -331,5 +331,5 @@
 	<rule>
 		<condition k="minspeed"/>
-		<icon src="vehicle/restrictions/minspeed.png"/>
+		<icon src="vehicle/restriction/minspeed.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -352,5 +352,5 @@
 	<rule>
 		<condition k="barrier" v="bollard"/>
-		<icon annotate="true" src="vehicle/restrictions/bollard.png"/>
+		<icon annotate="true" src="vehicle/restriction/bollard.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -599,5 +599,5 @@
 	<rule>
 		<condition k="highway" v="mini_roundabout"/>
-		<icon annotate="true" src="vehicle/restrictions/roundabout_left.png"/>
+		<icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -606,5 +606,5 @@
 	<rule>
 		<condition k="highway" v="stop"/>
-		<icon annotate="true" src="vehicle/restrictions/stop.png"/>
+		<icon annotate="true" src="vehicle/restriction/stop.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -613,5 +613,5 @@
 	<rule>
 		<condition k="highway" v="traffic_signals"/>
-		<icon annotate="true" src="vehicle/restrictions/traffic-light.png"/>
+		<icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -620,5 +620,5 @@
 	<rule>
 		<condition k="highway" v="speed_camera"/>
-		<icon annotate="true" src="vehicle/restrictions/speed_trap.png"/>
+		<icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -627,5 +627,5 @@
 	<rule>
 		<condition k="traffic_sign" v="city_limit"/>
-		<icon annotate="true" src="vehicle/restrictions/citylimit.png"/>
+		<icon annotate="true" src="vehicle/restriction/citylimit.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -655,5 +655,5 @@
 	<rule>
 		<condition k="highway" v="toll_booth"/>
-		<icon annotate="true" src="vehicle/toll_station.png"/>
+		<icon annotate="true" src="vehicle/toll_booth.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -662,5 +662,5 @@
 	<rule>
 		<condition k="highway" v="incline"/>
-		<icon annotate="true" src="vehicle/restrictions/incline.png"/>
+		<icon annotate="true" src="vehicle/restriction/incline.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -669,5 +669,5 @@
 	<rule>
 		<condition k="highway" v="incline_steep"/>
-		<icon annotate="true" src="vehicle/restrictions/incline.png"/>
+		<icon annotate="true" src="vehicle/restriction/incline.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1213,5 +1213,5 @@
 		<condition k="piste:difficulty" v="easy"/>
 		<line width="6" colour="piste_easy#0000ff"/>
-		<icon src="sports/skiing.png"/>
+		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1221,5 +1221,5 @@
 		<condition k="piste:difficulty" v="intermediate"/>
 		<line width="6" colour="piste_intermediate#ff0000"/>
-		<icon src="sports/skiing.png"/>
+		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1229,5 +1229,5 @@
 		<condition k="piste:difficulty" v="advanced"/>
 		<line width="6" colour="piste_advanced#606060"/>
-		<icon src="sports/skiing.png"/>
+		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1237,5 +1237,5 @@
 		<condition k="piste:difficulty" v="freeride"/>
 		<line width="6" colour="piste_freeride#ffff00"/>
-		<icon src="sports/skiing.png"/>
+		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1245,5 +1245,5 @@
 		<condition k="piste:difficulty" v="novice"/>
 		<line width="6" colour="piste_novice#00ff00"/>
-		<icon src="sports/skiing.png"/>
+		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>300000</scale_max>
@@ -1353,5 +1353,5 @@
 		<condition k="man_made" v="pier"/>
 		<line width="2" colour="pier#660000"/>
-		<icon annotate="true" src="misc/landmark/pier.png"/>
+		<icon annotate="true" src="nautical/pier.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1442,5 +1442,5 @@
 	<rule>
 		<condition k="leisure" v="sports_centre"/>
-		<icon annotate="true" src="sports/centre.png"/>
+		<icon annotate="true" src="sport/centre.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1450,5 +1450,5 @@
 	<rule>
 		<condition k="leisure" v="golf_course"/>
-		<icon annotate="true" src="sports/golf.png"/>
+		<icon annotate="true" src="sport/golf.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1458,5 +1458,5 @@
 	<rule>
 		<condition k="leisure" v="stadium"/>
-		<icon annotate="true" src="sports/stadium.png"/>
+		<icon annotate="true" src="sport/stadium.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1466,5 +1466,5 @@
 	<rule>
 		<condition k="leisure" v="track"/>
-		<icon annotate="true" src="sports/track.png"/>
+		<icon annotate="true" src="sport/track.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1474,5 +1474,5 @@
 	<rule>
 		<condition k="leisure" v="pitch"/>
-		<icon annotate="true" src="sports/pitch.png"/>
+		<icon annotate="true" src="sport/pitch.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1482,5 +1482,5 @@
 	<rule>
 		<condition k="leisure" v="water_park"/>
-		<icon annotate="true" src="recreation/water_park.png"/>
+		<icon annotate="true" src="leisure/water_park.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1506,5 +1506,5 @@
 	<rule>
 		<condition k="leisure" v="fishing"/>
-		<icon annotate="true" src="sports/fishing.png"/>
+		<icon annotate="true" src="sport/fishing.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1514,5 +1514,5 @@
 	<rule>
 		<condition k="leisure" v="nature_reserve"/>
-		<icon annotate="true" src="recreation/nature_reserve.png"/>
+		<icon annotate="true" src="leisure/nature_reserve.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1522,5 +1522,5 @@
 	<rule>
 		<condition k="leisure" v="park"/>
-		<icon annotate="true" src="recreation/park.png"/>
+		<icon annotate="true" src="leisure/park.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1530,5 +1530,5 @@
 	<rule>
 		<condition k="leisure" v="playground"/>
-		<icon annotate="true" src="recreation/playground.png"/>
+		<icon annotate="true" src="leisure/playground.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1538,5 +1538,5 @@
 	<rule>
 		<condition k="leisure" v="garden"/>
-		<icon annotate="true" src="recreation/garden.png"/>
+		<icon annotate="true" src="leisure/garden.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1546,5 +1546,5 @@
 	<rule>
 		<condition k="leisure" v="common"/>
-		<icon annotate="true" src="recreation/common.png"/>
+		<icon annotate="true" src="leisure/common.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1554,5 +1554,5 @@
 	<rule>
 		<condition k="leisure" v="swimming_pool"/>
-		<icon annotate="true" src="sports/pool.png"/>
+		<icon annotate="true" src="sport/pool.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1562,5 +1562,5 @@
 	<rule>
 		<condition k="leisure" v="miniature_golf"/>
-		<icon annotate="true" src="sports/golf.png"/>
+		<icon annotate="true" src="sport/golf.png"/>
 		<area colour="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
@@ -1588,5 +1588,5 @@
 	<rule>
 		<condition k="amenity" v="nightclub"/>
-		<icon annotate="true" src="recreation/nightclub.png"/>
+		<icon annotate="true" src="leisure/nightclub.png"/>
 		<area colour="amenity#ecba52"/>
 		<scale_min>1</scale_min>
@@ -1676,5 +1676,5 @@
 	<rule>
 		<condition k="amenity" v="bicycle_rental"/>
-		<icon annotate="true" src="vehicle/bicycle_rental.png"/>
+		<icon annotate="true" src="vehicle/rental/bicycle.png"/>
 		<area colour="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1684,5 +1684,5 @@
 	<rule>
 		<condition k="amenity" v="car_rental"/>
-		<icon annotate="true" src="vehicle/car_rental.png"/>
+		<icon annotate="true" src="vehicle/rental/car.png"/>
 		<area colour="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1716,5 +1716,5 @@
 	<rule>
 		<condition k="amenity" v="fuel"/>
-		<icon annotate="true" src="vehicle/fuel_station.png"/>
+		<icon annotate="true" src="vehicle/fuel.png"/>
 		<area colour="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1724,5 +1724,5 @@
 	<rule>
 		<condition k="amenity" v="telephone"/>
-		<icon annotate="true" src="public/telephone.png"/>
+		<icon annotate="true" src="service/telephone.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1740,5 +1740,5 @@
 	<rule>
 		<condition k="amenity" v="toilets"/>
-		<icon annotate="true" src="public/toilets.png"/>
+		<icon annotate="true" src="service/toilets.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1748,5 +1748,5 @@
 	<rule>
 		<condition k="amenity" v="recycling"/>
-		<icon annotate="true" src="public/recycling.png"/>
+		<icon annotate="true" src="service/recycling.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1898,5 +1898,5 @@
 	<rule>
 		<condition k="amenity" v="post_office"/>
-		<icon annotate="true" src="public/post_office.png"/>
+		<icon annotate="true" src="service/post_office.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -1906,5 +1906,5 @@
 	<rule>
 		<condition k="amenity" v="post_box"/>
-		<icon annotate="true" src="public/post_box.png"/>
+		<icon annotate="true" src="service/post_box.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -2003,5 +2003,5 @@
 		<condition k="amenity" v="library"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="shopping/rental/library.png"/>
+		<icon annotate="true" src="shop/rental/library.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2011,5 +2011,5 @@
 		<condition k="amenity" v="police"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="public/police.png"/>
+		<icon annotate="true" src="service/police.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2019,5 +2019,5 @@
 		<condition k="amenity" v="fire_station"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="public/firebrigade.png"/>
+		<icon annotate="true" src="service/firebrigade.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2043,5 +2043,5 @@
 		<condition k="amenity" v="theatre"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="recreation/theater.png"/>
+		<icon annotate="true" src="leisure/theater.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2051,5 +2051,5 @@
 		<condition k="amenity" v="cinema"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="recreation/cinema.png"/>
+		<icon annotate="true" src="leisure/cinema.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2059,5 +2059,5 @@
 		<condition k="amenity" v="arts_centre"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="public/arts_centre.png"/>
+		<icon annotate="true" src="service/arts_centre.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2067,5 +2067,5 @@
 		<condition k="amenity" v="courthouse"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="public/administration/court_of_law.png"/>
+		<icon annotate="true" src="service/administration/court_of_law.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2075,5 +2075,5 @@
 		<condition k="amenity" v="prison"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="public/administration/prison.png"/>
+		<icon annotate="true" src="service/administration/prison.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2107,5 +2107,5 @@
 		<condition k="amenity" v="bench"/>
 		<area colour="amenity_light#f7efb7"/>
-		<icon annotate="true" src="recreation/bench.png"/>
+		<icon annotate="true" src="leisure/bench.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2146,5 +2146,5 @@
 	<rule>
 		<condition k="amenity" v="signpost"/>
-		<icon annotate="true" src="places/locality.png"/>
+		<icon annotate="true" src="place/locality.png"/>
 		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
 		<scale_min>1</scale_min>
@@ -2156,5 +2156,5 @@
 	<rule>
 		<condition k="shop" v="supermarket"/>
-		<icon annotate="true" src="shopping/supermarket.png"/>
+		<icon annotate="true" src="shop/supermarket.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2164,5 +2164,5 @@
 	<rule>
 		<condition k="shop" v="convenience"/>
-		<icon annotate="true" src="shopping/supermarket.png"/>
+		<icon annotate="true" src="shop/supermarket.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2172,5 +2172,5 @@
 	<rule>
 		<condition k="shop" v="bakery"/>
-		<icon annotate="true" src="shopping/groceries/bakery.png"/>
+		<icon annotate="true" src="shop/groceries/bakery.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2180,5 +2180,5 @@
 	<rule>
 		<condition k="shop" v="butcher"/>
-		<icon annotate="true" src="shopping/groceries/butcher.png"/>
+		<icon annotate="true" src="shop/groceries/butcher.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2188,5 +2188,5 @@
 	<rule>
 		<condition k="shop" v="bicycle"/>
-		<icon annotate="true" src="sports/bicycle.png"/>
+		<icon annotate="true" src="sport/bicycle.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2196,5 +2196,5 @@
 	<rule>
 		<condition k="shop" v="doityourself"/>
-		<icon annotate="true" src="shopping/diy_store.png"/>
+		<icon annotate="true" src="shop/diy_store.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2204,5 +2204,5 @@
 	<rule>
 		<condition k="shop" v="dry_cleaning"/>
-		<icon annotate="true" src="shopping/laundry.png"/>
+		<icon annotate="true" src="shop/laundry.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2212,5 +2212,5 @@
 	<rule>
 		<condition k="shop" v="laundry"/>
-		<icon annotate="true" src="shopping/laundry.png"/>
+		<icon annotate="true" src="shop/laundry.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2220,5 +2220,5 @@
 	<rule>
 		<condition k="shop" v="outdoor"/>
-		<icon annotate="true" src="shopping/sports/outdoor.png"/>
+		<icon annotate="true" src="shop/sports/outdoor.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2228,5 +2228,5 @@
 	<rule>
 		<condition k="shop" v="kiosk"/>
-		<icon annotate="true" src="shopping/kiosk.png"/>
+		<icon annotate="true" src="shop/kiosk.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2236,5 +2236,5 @@
 	<rule>
 		<condition k="shop" v="beverages"/>
-		<icon annotate="true" src="shopping/beverages.png"/>
+		<icon annotate="true" src="shop/beverages.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2244,5 +2244,5 @@
 	<rule>
 		<condition k="shop" v="books"/>
-		<icon annotate="true" src="shopping/rental/library.png"/>
+		<icon annotate="true" src="shop/rental/library.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2276,5 +2276,5 @@
 	<rule>
 		<condition k="shop" v="chemist"/>
-		<icon annotate="true" src="shopping/chemist.png"/>
+		<icon annotate="true" src="shop/chemist.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2284,5 +2284,5 @@
 	<rule>
 		<condition k="shop" v="clothes"/>
-		<icon annotate="true" src="shopping/clothes.png"/>
+		<icon annotate="true" src="shop/clothes.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2292,5 +2292,5 @@
 	<rule>
 		<condition k="shop" v="computer"/>
-		<icon annotate="true" src="shopping/computer.png"/>
+		<icon annotate="true" src="shop/computer.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2300,5 +2300,5 @@
 	<rule>
 		<condition k="shop" v="cycle_repair"/>
-		<icon annotate="true" src="sports/bicycle.png"/>
+		<icon annotate="true" src="sport/bicycle.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2308,5 +2308,5 @@
 	<rule>
 		<condition k="shop" v="department_store"/>
-		<icon annotate="true" src="shopping/mall.png"/>
+		<icon annotate="true" src="shop/mall.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2316,5 +2316,5 @@
 	<rule>
 		<condition k="shop" v="electronics"/>
-		<icon annotate="true" src="shopping/electronics.png"/>
+		<icon annotate="true" src="shop/electronics.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2324,5 +2324,5 @@
 	<rule>
 		<condition k="shop" v="furniture"/>
-		<icon annotate="true" src="shopping/furniture.png"/>
+		<icon annotate="true" src="shop/furniture.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2332,5 +2332,5 @@
 	<rule>
 		<condition k="shop" v="florist"/>
-		<icon annotate="true" src="shopping/florist.png"/>
+		<icon annotate="true" src="shop/florist.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2340,5 +2340,5 @@
 	<rule>
 		<condition k="shop" v="groceries"/>
-		<icon annotate="true" src="shopping/groceries/fruits.png"/>
+		<icon annotate="true" src="shop/groceries/fruits.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2348,5 +2348,5 @@
 	<rule>
 		<condition k="shop" v="garden_centre"/>
-		<icon annotate="true" src="shopping/garden_centre.png"/>
+		<icon annotate="true" src="shop/garden_centre.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2356,5 +2356,5 @@
 	<rule>
 		<condition k="shop" v="hairdresser"/>
-		<icon annotate="true" src="shopping/hairdresser.png"/>
+		<icon annotate="true" src="shop/hairdresser.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2364,5 +2364,5 @@
 	<rule>
 		<condition k="shop" v="hardware"/>
-		<icon annotate="true" src="shopping/diy_store.png"/>
+		<icon annotate="true" src="shop/diy_store.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2372,5 +2372,5 @@
 	<rule>
 		<condition k="shop" v="hifi"/>
-		<icon annotate="true" src="shopping/hifi.png"/>
+		<icon annotate="true" src="shop/hifi.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2380,5 +2380,5 @@
 	<rule>
 		<condition k="shop" v="jewelry"/>
-		<icon annotate="true" src="shopping/jewelry.png"/>
+		<icon annotate="true" src="shop/jewelry.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2388,5 +2388,5 @@
 	<rule>
 		<condition k="shop" v="mall"/>
-		<icon annotate="true" src="shopping/mall.png"/>
+		<icon annotate="true" src="shop/mall.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2404,5 +2404,5 @@
 	<rule>
 		<condition k="shop" v="newsagent"/>
-		<icon annotate="true" src="shopping/kiosk.png"/>
+		<icon annotate="true" src="shop/kiosk.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2412,5 +2412,5 @@
 	<rule>
 		<condition k="shop" v="organic"/>
-		<icon annotate="true" src="shopping/groceries/fruits.png"/>
+		<icon annotate="true" src="shop/groceries/fruits.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2420,5 +2420,5 @@
 	<rule>
 		<condition k="shop" v="optician"/>
-		<icon annotate="true" src="shopping/optician.png"/>
+		<icon annotate="true" src="shop/optician.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2428,5 +2428,5 @@
 	<rule>
 		<condition k="shop" v="shoes"/>
-		<icon annotate="true" src="shopping/shoes.png"/>
+		<icon annotate="true" src="shop/shoes.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2436,5 +2436,5 @@
 	<rule>
 		<condition k="shop" v="tailor"/>
-		<icon annotate="true" src="shopping/tailor.png"/>
+		<icon annotate="true" src="shop/tailor.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2444,5 +2444,5 @@
 	<rule>
 		<condition k="shop" v="travel_agency"/>
-		<icon annotate="true" src="places/island.png"/>
+		<icon annotate="true" src="place/island.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2452,5 +2452,5 @@
 	<rule>
 		<condition k="shop" v="toys"/>
-		<icon annotate="true" src="shopping/toys.png"/>
+		<icon annotate="true" src="shop/toys.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2460,14 +2460,14 @@
 	<rule>
 		<condition k="shop" v="video"/>
-		<icon annotate="true" src="shopping/video.png"/>
-		<area colour="shop#00005f"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<!-- duplicate of shopping_centre? -->
-	<rule>
-		<condition k="shop" v="shopping_center"/>
-		<icon annotate="true" src="shopping/mall.png"/>
+		<icon annotate="true" src="shop/video.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<!-- duplicate of shop_centre? -->
+	<rule>
+		<condition k="shop" v="shop_center"/>
+		<icon annotate="true" src="shop/mall.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2543,5 +2543,5 @@
 	<rule>
 		<condition k="tourism" v="picnic_site"/>
-		<icon annotate="true" src="recreation/picnic.png"/>
+		<icon annotate="true" src="leisure/picnic.png"/>
 		<area colour="tourism#e180a2"/>
 		<scale_min>1</scale_min>
@@ -2559,5 +2559,5 @@
 	<rule>
 		<condition k="tourism" v="theme_park"/>
-		<icon annotate="true" src="recreation/theme_park.png"/>
+		<icon annotate="true" src="leisure/theme_park.png"/>
 		<area colour="tourism#e180a2"/>
 		<scale_min>1</scale_min>
@@ -2575,5 +2575,5 @@
 	<rule>
 		<condition k="tourism" v="zoo"/>
-		<icon annotate="true" src="recreation/zoo.png"/>
+		<icon annotate="true" src="leisure/zoo.png"/>
 		<area colour="tourism#e180a2"/>
 		<scale_min>1</scale_min>
@@ -2583,5 +2583,5 @@
 	<rule>
 		<condition k="tourism" v="artwork"/>
-		<icon annotate="true" src="public/arts_centre.png"/>
+		<icon annotate="true" src="service/arts_centre.png"/>
 		<area colour="tourism#e180a2"/>
 		<scale_min>1</scale_min>
@@ -2773,5 +2773,5 @@
 		<condition k="landuse" v="retail"/>
 		<area colour="retail#dbdbdb"/>
-		<icon src="shopping/mall.png"/>
+		<icon src="shop/mall.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2846,13 +2846,13 @@
 		<condition k="landuse" v="village_green"/>
 		<area colour="green#b1e0c2"/>
-		<icon src="recreation/common.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="landuse" v="recreation_ground"/>
+		<icon src="leisure/common.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="leisure_ground"/>
 		<area colour="green#b1e0c2"/>
-		<icon src="recreation/common.png"/>
+		<icon src="leisure/common.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3167,5 +3167,5 @@
 		<condition k="sport" v="10pin"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/10pin.png"/>
+		<icon src="sport/10pin.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3183,5 +3183,5 @@
 		<condition k="sport" v="australian_football"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/football.png"/>
+		<icon src="sport/football.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3191,5 +3191,5 @@
 		<condition k="sport" v="baseball"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/baseball.png"/>
+		<icon src="sport/baseball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3199,5 +3199,5 @@
 		<condition k="sport" v="basketball"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/basketball.png"/>
+		<icon src="sport/basketball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3207,5 +3207,5 @@
 		<condition k="sport" v="boules"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/boule.png"/>
+		<icon src="sport/boule.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3215,5 +3215,5 @@
 		<condition k="sport" v="bowls"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/boule.png"/>
+		<icon src="sport/boule.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3231,5 +3231,5 @@
 		<condition k="sport" v="cricket"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/cricket.png"/>
+		<icon src="sport/cricket.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3247,5 +3247,5 @@
 		<condition k="sport" v="croquet"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/croquet.png"/>
+		<icon src="sport/croquet.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3255,5 +3255,5 @@
 		<condition k="sport" v="cycling"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/cycling.png"/>
+		<icon src="sport/cycling.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3271,5 +3271,5 @@
 		<condition k="sport" v="equestrian"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/riding.png"/>
+		<icon src="sport/riding.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3279,5 +3279,5 @@
 		<condition k="sport" v="football"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/football.png"/>
+		<icon src="sport/football.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3287,5 +3287,5 @@
 		<condition k="sport" v="golf"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/golf.png"/>
+		<icon src="sport/golf.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3303,5 +3303,5 @@
 		<condition k="sport" v="hockey"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/hockey.png"/>
+		<icon src="sport/hockey.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3311,5 +3311,5 @@
 		<condition k="sport" v="horse_racing"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/riding.png"/>
+		<icon src="sport/riding.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3327,5 +3327,5 @@
 		<condition k="sport" v="multi"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/multi.png"/>
+		<icon src="sport/multi.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3343,5 +3343,5 @@
 		<condition k="sport" v="racquet"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/racquetball.png"/>
+		<icon src="sport/racquetball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3351,5 +3351,5 @@
 		<condition k="sport" v="rugby"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/football.png"/>
+		<icon src="sport/football.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3375,5 +3375,5 @@
 		<condition k="sport" v="soccer"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/soccer.png"/>
+		<icon src="sport/soccer.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3383,5 +3383,5 @@
 		<condition k="sport" v="swimming"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/pool.png"/>
+		<icon src="sport/pool.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3391,5 +3391,5 @@
 		<condition k="sport" v="skiing"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/skiing.png"/>
+		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3399,5 +3399,5 @@
 		<condition k="sport" v="table_tennis"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/table_tennis.png"/>
+		<icon src="sport/table_tennis.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3407,5 +3407,5 @@
 		<condition k="sport" v="tennis"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="sports/tennis.png"/>
+		<icon src="sport/tennis.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3439,5 +3439,5 @@
 		<condition k="sport" v="volleyball"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/volleyball.png"/>
+		<icon annotate="true" src="sport/volleyball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3447,5 +3447,5 @@
 		<condition k="sport" v="beachvolleyball"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/volleyball.png"/>
+		<icon annotate="true" src="sport/volleyball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3455,5 +3455,5 @@
 		<condition k="sport" v="bowling"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/10pin.png"/>
+		<icon annotate="true" src="sport/10pin.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3463,5 +3463,5 @@
 		<condition k="sport" v="handball"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/handball.png"/>
+		<icon annotate="true" src="sport/handball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3487,5 +3487,5 @@
 		<condition k="sport" v="diving"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/diving.png"/>
+		<icon annotate="true" src="sport/diving.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3503,5 +3503,5 @@
 		<condition k="sport" v="archery"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/archery.png"/>
+		<icon annotate="true" src="sport/archery.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3511,5 +3511,5 @@
 		<condition k="sport" v="fishing"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="sports/fishing.png"/>
+		<icon annotate="true" src="sport/fishing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3570,5 +3570,5 @@
 	<rule>
 		<condition k="place" v="continent"/>
-		<icon annotate="true" src="places/settlement/capital.png"/>
+		<icon annotate="true" src="place/settlement/capital.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3578,5 +3578,5 @@
 	<rule>
 		<condition k="place" v="country"/>
-		<icon annotate="true" src="places/settlement/capital.png"/>
+		<icon annotate="true" src="place/settlement/capital.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3586,5 +3586,5 @@
 	<rule>
 		<condition k="place" v="state"/>
-		<icon annotate="true" src="places/settlement/capital.png"/>
+		<icon annotate="true" src="place/settlement/capital.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3594,5 +3594,5 @@
 	<rule>
 		<condition k="place" v="region"/>
-		<icon annotate="true" src="places/settlement/capital.png"/>
+		<icon annotate="true" src="place/settlement/capital.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3602,5 +3602,5 @@
 	<rule>
 		<condition k="place" v="county"/>
-		<icon annotate="true" src="places/settlement/capital.png"/>
+		<icon annotate="true" src="place/settlement/capital.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3610,5 +3610,5 @@
 	<rule>
 		<condition k="place" v="city"/>
-		<icon annotate="true" src="places/settlement/city.png"/>
+		<icon annotate="true" src="place/settlement/city.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3618,5 +3618,5 @@
 	<rule>
 		<condition k="place" v="town"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3626,5 +3626,5 @@
 	<rule>
 		<condition k="place" v="village"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3634,5 +3634,5 @@
 	<rule>
 		<condition k="place" v="hamlet"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3642,5 +3642,5 @@
 	<rule>
 		<condition k="place" v="suburb"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3650,5 +3650,5 @@
 	<rule>
 		<condition k="place" v="locality"/>
-		<icon annotate="true" src="places/locality.png"/>
+		<icon annotate="true" src="place/locality.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3658,5 +3658,5 @@
 	<rule>
 		<condition k="place" v="island"/>
-		<icon annotate="true" src="places/island.png"/>
+		<icon annotate="true" src="place/island.png"/>
 		<area colour="place#8de3cb"/>
 		<scale_min>1</scale_min>
@@ -3667,5 +3667,5 @@
 	<rule>
 		<condition k="openGeoDB:type" v="Stadt"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3674,5 +3674,5 @@
 	<rule>
 		<condition k="openGeoDB:type" v="Kreis"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3681,5 +3681,5 @@
 	<rule>
 		<condition k="openGeoDB:type" v="Gemeinde"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3688,5 +3688,5 @@
 	<rule>
 		<condition k="openGeoDB:type" v="Ort"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3695,5 +3695,5 @@
 	<rule>
 		<condition k="openGeoDB:type" v="District"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3702,5 +3702,5 @@
 	<rule>
 		<condition k="openGeoDB:location" v="locality"/>
-		<icon annotate="true" src="places/settlement/town.png"/>
+		<icon annotate="true" src="place/settlement/town.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>