Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 10579)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 10706)
@@ -70,5 +70,5 @@
 }
 relation[restriction=no_left_turn][setting("alt_turn_icons")] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg";
     set icon_z17;
     text: auto;
@@ -80,5 +80,5 @@
 }
 relation[restriction=no_right_turn][setting("alt_turn_icons")] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg";
     set icon_z17;
     text: auto;
@@ -90,30 +90,30 @@
 }
 relation[restriction=no_straight_on][setting("alt_turn_icons")] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_u_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg";
     set icon_z17;
     text: auto;
 }
 relation[restriction=only_left_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg";
     set icon_z17;
     text: auto;
 }
 relation[restriction=only_right_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg";
     set icon_z17;
     text: auto;
 }
 relation[restriction=only_straight_on] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg";
     set icon_z17;
     text: auto;
 }
 node[restriction] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
     text: auto;
@@ -155,5 +155,5 @@
 node[cutting?!],
 node[embankment?!] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -188,5 +188,5 @@
 }
 node[traffic_sign][access?!] {
-    icon-image: "presets/vehicle/restriction/access.png";
+    icon-image: "presets/vehicle/restriction/restrictions.svg";
     set icon_z17;
 }
@@ -194,80 +194,80 @@
 node[traffic_sign][access=private][!is_prop_set(icon-image)],
 node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[traffic_sign][bicycle?!] {
-    icon-image: "presets/vehicle/restriction/bicycle.png";
+    icon-image: "presets/vehicle/restriction/bicycle.svg";
     set icon_z17;
 }
 node[traffic_sign][bicycle=designated] {
-    icon-image: "presets/vehicle/restriction/bicycle-designated.png";
+    icon-image: "presets/vehicle/restriction/bicycle-designated.svg";
     set icon_z17;
 }
 node[traffic_sign][foot?!] {
-    icon-image: "presets/vehicle/restriction/foot.png";
+    icon-image: "presets/vehicle/restriction/foot.svg";
     set icon_z17;
 }
 node[traffic_sign][foot=designated] {
-    icon-image: "presets/vehicle/restriction/foot-designated.png";
+    icon-image: "presets/vehicle/restriction/foot-designated.svg";
     set icon_z17;
 }
 node[traffic_sign][goods?!],
 node[traffic_sign][hgv?!] {
-    icon-image: "presets/vehicle/restriction/goods.png";
+    icon-image: "presets/vehicle/restriction/goods.svg";
     set icon_z17;
 }
 node[traffic_sign][horse?!] {
-    icon-image: "presets/vehicle/restriction/horse.png";
+    icon-image: "presets/vehicle/restriction/horse.svg";
     set icon_z17;
 }
 node[traffic_sign][horse=designated] {
-    icon-image: "presets/vehicle/restriction/horse-designated.png";
+    icon-image: "presets/vehicle/restriction/horse-designated.svg";
     set icon_z17;
 }
 node[traffic_sign][motorcycle?!] {
-    icon-image: "presets/vehicle/restriction/motorbike.png";
+    icon-image: "presets/vehicle/restriction/motorbike.svg";
     set icon_z17;
 }
 node[traffic_sign][motorcar?!] {
-    icon-image: "presets/vehicle/restriction/motorcar.png";
+    icon-image: "presets/vehicle/restriction/motorcar.svg";
     set icon_z17;
 }
 node[traffic_sign][psv?!] {
-    icon-image: "presets/vehicle/restriction/psv.png";
+    icon-image: "presets/vehicle/restriction/psv.svg";
     set icon_z17;
 }
 node[traffic_sign][motorboat?!][!is_prop_set(icon-image)],
 node[traffic_sign][boat?!][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[noexit=yes] {
-    icon-image: "presets/vehicle/restriction/dead_end.png";
+    icon-image: "presets/vehicle/restriction/dead_end.svg";
     set icon_z17;
 }
 node[traffic_sign][maxweight] {
-    icon-image: "presets/vehicle/restriction/maxweight.png";
+    icon-image: "presets/vehicle/restriction/maxweight.svg";
     set icon_z17;
 }
 node[traffic_sign][maxheight] {
-    icon-image: "presets/vehicle/restriction/maxheight.png";
+    icon-image: "presets/vehicle/restriction/maxheight.svg";
     set icon_z17;
 }
 node[traffic_sign][maxwidth] {
-    icon-image: "presets/vehicle/restriction/maxwidth.png";
+    icon-image: "presets/vehicle/restriction/maxwidth.svg";
     set icon_z17;
 }
 node[traffic_sign][maxlength] {
-    icon-image: "presets/vehicle/restriction/maxlength.png";
+    icon-image: "presets/vehicle/restriction/maxlength.svg";
     set icon_z17;
 }
 node[traffic_sign][minspeed] {
-    icon-image: "presets/vehicle/restriction/minspeed.png";
+    icon-image: "presets/vehicle/restriction/minspeed.svg";
     set icon_z17;
 }
 node[traffic_sign][maxstay][!is_prop_set(icon-image)],
 node[traffic_sign][toll][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -305,13 +305,13 @@
 }
 node[building][!building?!] {
-    icon-image: "presets/misc/landmark/building.png";
+    icon-image: "presets/landmark/building.svg";
     set icon_z17;
 }
 node[building=garage] {
-    icon-image: "presets/misc/landuse/garages.png";
+    icon-image: "presets/landuse/garages.png";
     set icon_z17;
 }
 node[building=garages] {
-    icon-image: "presets/misc/landuse/garages.png";
+    icon-image: "presets/landuse/garages.png";
     set icon_z17;
 }
@@ -343,5 +343,5 @@
 node[building=entrance],
 node[building:part] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -357,9 +357,9 @@
 }
 node[barrier=bollard] {
-    icon-image: "presets/bollard.png";
+    icon-image: "presets/barrier/bollard.svg";
     set icon_z17;
 }
 node[barrier=gate] {
-    icon-image: "presets/vehicle/gate.png";
+    icon-image: "presets/barrier/gate.png";
     set icon_z17;
 }
@@ -390,37 +390,37 @@
 node[barrier=retaining_wall],
 node[barrier=ditch] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
 node[barrier=kerb] {
-    icon-image: "presets/vehicle/kerb.svg";
+    icon-image: "presets/barrier/kerb.svg";
     set icon_z17;
 }
 node[barrier=block] {
-    icon-image: "presets/vehicle/block.svg";
+    icon-image: "presets/barrier/block.svg";
     set icon_z17;
 }
 node[barrier=chain] {
-    icon-image: "presets/vehicle/chain.svg";
+    icon-image: "presets/barrier/chain.svg";
     set icon_z17;
 }
 node[barrier=stile] {
-    icon-image: "presets/vehicle/stile.svg";
+    icon-image: "presets/barrier/stile.svg";
     set icon_z17;
 }
 node[barrier=turnstile] {
-    icon-image: "presets/vehicle/turnstile.png";
+    icon-image: "presets/barrier/turnstile.svg";
     set icon_z17;
 }
 node[barrier=cycle_barrier] {
-    icon-image: "presets/vehicle/cycle_barrier.png";
+    icon-image: "presets/barrier/cycle_barrier.svg";
     set icon_z17;
 }
 node[barrier=lift_gate] {
-    icon-image: "presets/vehicle/lift_gate.png";
+    icon-image: "presets/barrier/lift_gate.svg";
     set icon_z17;
 }
 node[barrier=swing_gate] {
-    icon-image: "presets/vehicle/swing_gate.png";
+    icon-image: "presets/barrier/swing_gate.svg";
     set icon_z17;
 }
@@ -429,25 +429,26 @@
 }
 node[barrier=toll_booth] {
-    icon-image: "presets/vehicle/toll_booth.png";
+    icon-image: "presets/barrier/toll_station.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[barrier=entrance] {
-    icon-image: "presets/vehicle/entrance.png";
+    icon-image: "presets/barrier/entrance.svg";
     set icon_z17;
 }
 node[barrier=cattle_grid] {
-    icon-image: "presets/vehicle/cattle_grid.png";
+    icon-image: "presets/barrier/cattle_grid.png";
     set icon_z17;
 }
 node[barrier=border_control] {
-    icon-image: "presets/vehicle/border_control.png";
+    icon-image: "presets/barrier/douane.png";
     set icon_z17;
 }
 node[barrier=sally_port] {
-    icon-image: "presets/vehicle/sally_port.png";
+    icon-image: "presets/barrier/sally_port.svg";
     set icon_z17;
 }
 node[barrier=spikes] {
-    icon-image: "presets/vehicle/spikes.svg";
+    icon-image: "presets/barrier/spikes.svg";
     set icon_z17;
 }
@@ -457,5 +458,5 @@
 node[barrier=jersey_barrier][!is_prop_set(icon-image)],
 node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -744,5 +745,5 @@
 }
 node[highway=ford], node[ford?] {
-    icon-image: "presets/misc/ford.svg";
+    icon-image: "presets/vehicle/ford.svg";
     set icon_z17;
 }
@@ -785,5 +786,5 @@
 }
 node[highway=construction] {
-    icon-image: "presets/misc/construction.png";
+    icon-image: "presets/misc/construction.svg";
     set icon_z17;
 }
@@ -814,5 +815,5 @@
 node[highway=bus_guideway],
 node[highway=platform] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -1025,5 +1026,5 @@
 node[cycleway=track], node[cycleway=opposite_track],
 node[cycleway=opposite] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -1119,5 +1120,5 @@
 node[piste:type=sleigh],
 node[piste:type=snow_park] {
-    icon-image: "presets/sport/skiing.png";
+    icon-image: "presets/sport/skiing.svg";
     set icon_z17;
 }
@@ -1163,5 +1164,5 @@
 node[power=cable],
 node[power=minor_line] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -1232,9 +1233,9 @@
 }
 node[generator:source=nuclear] {
-    icon-image: "presets/power_source-nuclear.svg";
+    icon-image: "presets/power/power_source-nuclear.svg";
     set icon_z17;
 }
 node[generator:source=wind] {
-    icon-image: "presets/power_source-wind.svg";
+    icon-image: "presets/power/power_source-wind.svg";
     set icon_z17;
 }
@@ -1243,21 +1244,21 @@
 node[generator:source=wave],
 node[generator:source=osmotic] {
-    icon-image: "presets/power_source-water.svg";
+    icon-image: "presets/power/power_source-water.svg";
     set icon_z17;
 }
 node[generator:source=geothermal] {
-    icon-image: "presets/power_source-geothermal.svg";
+    icon-image: "presets/power/power_source-geothermal.svg";
     set icon_z17;
 }
 node[generator:source=solar] {
-    icon-image: "presets/power_source-sun.svg";
+    icon-image: "presets/power/power_source-sun.svg";
     set icon_z17;
 }
 node[generator:source=coal] {
-    icon-image: "presets/power_source-coal.svg";
+    icon-image: "presets/power/power_source-coal.svg";
     set icon_z17;
 }
 node[generator:source=gas] {
-    icon-image: "presets/power_source-gas.svg";
+    icon-image: "presets/power/power_source-gas.svg";
     set icon_z17;
 }
@@ -1265,5 +1266,5 @@
 node[generator:source=biofuel],
 node[generator:source=biogas] {
-    icon-image: "presets/power_source-biofuel.svg";
+    icon-image: "presets/power/power_source-biofuel.svg";
     set icon_z17;
 }
@@ -1271,13 +1272,13 @@
 node[generator:source=diesel],
 node[generator:source=gasoline] {
-    icon-image: "presets/power_source-oil.svg";
+    icon-image: "presets/power/power_source-oil.svg";
     set icon_z17;
 }
 node[generator:source=waste] {
-    icon-image: "presets/power_source-waste.svg";
+    icon-image: "presets/power/power_source-waste.svg";
     set icon_z17;
 }
 node[power_source] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -1300,9 +1301,9 @@
 }
 node[man_made=beacon] {
-    icon-image: "presets/misc/landmark/beacon.png";
+    icon-image: "presets/landmark/beacon.png";
     set icon_z17;
 }
 node[man_made=bridge] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -1312,28 +1313,30 @@
 }
 node[man_made=chimney] {
-    icon-image: "presets/misc/landmark/chimney.png";
+    icon-image: "presets/landmark/chimney.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[man_made=flagpole] {
     icon-image: "presets/misc/flag.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[man_made=gasometer] {
-    icon-image: "presets/gasometer.png";
+    icon-image: "presets/landmark/gasometer.svg";
     icon-width: 16;
     set icon_z17;
 }
 node[man_made=silo] {
-    icon-image: "presets/silo.png";
+    icon-image: "presets/landmark/silo.svg";
     icon-width: 16;
     set icon_z17;
 }
 node[man_made=storage_tank] {
-    icon-image: "presets/storage_tank.png";
+    icon-image: "presets/landmark/storage_tank.svg";
     icon-width: 16;
     set icon_z17;
 }
 node[man_made=bunker_silo] {
-    icon-image: "presets/bunker_silo.svg";
+    icon-image: "presets/landmark/bunker_silo.svg";
     set icon_z17;
 }
@@ -1353,13 +1356,13 @@
 }
 node[man_made=lighthouse] {
-    icon-image: "presets/misc/landmark/lighthouse.png";
+    icon-image: "presets/landmark/lighthouse.svg";
     set icon_z17;
 }
 node[man_made=monitoring_station] {
-    icon-image: "presets/misc/landmark/measurement_station.png";
+    icon-image: "presets/landmark/measurement_station.png";
     set icon_z17;
 }
 node[man_made=mineshaft] {
-    icon-image: "presets/misc/landmark/mine.png";
+    icon-image: "presets/landmark/mine.svg";
     set icon_z17;
 }
@@ -1372,9 +1375,9 @@
 }
 node[man_made=crane] {
-    icon-image: "presets/misc/landmark/crane.png";
+    icon-image: "presets/landmark/crane.svg";
     set icon_z17;
 }
 node[man_made=adit] {
-    icon-image: "presets/misc/landmark/adit.png";
+    icon-image: "presets/landmark/adit.svg";
     set icon_z17;
 }
@@ -1421,9 +1424,9 @@
 node[man_made=embankment],
 node[man_made=pipeline] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
 node[man_made=petroleum_well][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -1441,46 +1444,47 @@
 }
 node[man_made=reservoir_covered] {
-    icon-image: "presets/misc/landmark/reservoir_covered.png";
+    icon-image: "presets/landmark/reservoir_covered.svg";
     set icon_z17;
 }
 node[man_made=surveillance] {
-    icon-image: "presets/surveillance.png";
+    icon-image: "presets/service/surveillance.png";
     icon-width: 16;
     set icon_z17;
 }
 node[man_made=survey_point] {
-    icon-image: "presets/misc/landmark/survey_point.png";
+    icon-image: "presets/landmark/survey_point.svg";
     set icon_z17;
 }
 node[man_made=tower] {
-    icon-image: "presets/misc/landmark/tower.png";
+    icon-image: "presets/landmark/tower.png";
     set icon_z17;
 }
 node[man_made=wastewater_plant] {
-    icon-image: "presets/misc/landmark/wastewater_plant.png";
+    icon-image: "presets/landmark/wastewater_plant.svg";
     set icon_z17;
 }
 node[man_made=watermill] {
-    icon-image: "presets/misc/landmark/watermill.png";
+    icon-image: "presets/landmark/watermill.png";
     set icon_z17;
 }
 node[man_made=water_tower] {
-    icon-image: "presets/misc/landmark/water_tower.svg";
+    icon-image: "presets/landmark/water_tower.svg";
     set icon_z17;
 }
 node[man_made=water_well] {
-    icon-image: "presets/misc/landmark/water_well.png";
+    icon-image: "presets/landmark/water_well.svg";
     set icon_z17;
 }
 node[man_made=windmill] {
-    icon-image: "presets/misc/landmark/windmill.png";
+    icon-image: "presets/landmark/windmill.svg";
     set icon_z17;
 }
 node[man_made=works] {
-    icon-image: "presets/misc/landmark/works.png";
+    icon-image: "presets/landmark/works.svg";
     set icon_z17;
 }
 node[man_made=water_works] {
-    icon-image: "presets/misc/landmark/water_works.png";
+    icon-image: "presets/landmark/water_works.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -1490,5 +1494,5 @@
 }
 node[man_made=cutline] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -1627,5 +1631,5 @@
 }
 node[leisure=fitness_centre] {
-    icon-image: "presets/fitness_centre.png";
+    icon-image: "presets/sport/fitness_centre.png";
     icon-width: 16;
     set icon_z17;
@@ -1636,5 +1640,5 @@
 }
 node[leisure=horse_riding] {
-    icon-image: "presets/equestrian.png";
+    icon-image: "presets/leisure/equestrian.png";
     icon-width: 16;
     set icon_z17;
@@ -1700,9 +1704,9 @@
 }
 node[leisure=park] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
 node[leisure=playground] {
-    icon-image: "presets/leisure/playground.png";
+    icon-image: "presets/leisure/playground.svg";
     set icon_z17;
 }
@@ -1727,5 +1731,5 @@
 }
 node[leisure=swimming_pool] {
-    icon-image: "presets/sport/pool.png";
+    icon-image: "presets/sport/swimming.svg";
     set icon_z17;
 }
@@ -1746,5 +1750,5 @@
 }
 node[leisure=dog_park] {
-    icon-image: "presets/dogpark.png";
+    icon-image: "presets/leisure/dogpark.png";
     icon-width: 16;
     set icon_z17;
@@ -1752,8 +1756,10 @@
 node[leisure=ice_rink] {
     icon-image: "presets/sport/ice_hockey.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[leisure=sauna] {
     icon-image: "presets/leisure/sauna.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -1920,4 +1926,5 @@
 node[shop=convenience] {
     icon-image: "presets/shop/convenience.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -1931,9 +1938,9 @@
 }
 node[shop=bicycle] {
-    icon-image: "presets/sport/bicycle.png";
+    icon-image: "presets/shop/bicycle.svg";
     set icon_z17;
 }
 node[shop=doityourself] {
-    icon-image: "presets/shop/diy_store.png";
+    icon-image: "presets/shop/diy_store.svg";
     icon-width: 16;
     icon-height: 16;
@@ -1942,21 +1949,21 @@
 node[shop=dry_cleaning],
 node[shop=laundry] {
-    icon-image: "presets/shop/laundry.png";
+    icon-image: "presets/shop/laundry.svg";
     set icon_z17;
 }
 node[shop=outdoor] {
-    icon-image: "presets/shop/outdoor.png";
+    icon-image: "presets/shop/outdoor.svg";
     set icon_z17;
 }
 node[shop=kiosk] {
-    icon-image: "presets/shop/kiosk.png";
+    icon-image: "presets/shop/kiosk.svg";
     set icon_z17;
 }
 node[shop=beverages] {
-    icon-image: "presets/shop/beverages.png";
+    icon-image: "presets/shop/beverages.svg";
     set icon_z17;
 }
 node[shop=alcohol] {
-    icon-image: "presets/shop/alcohol.png";
+    icon-image: "presets/shop/alcohol.svg";
     set icon_z17;
 }
@@ -1967,21 +1974,22 @@
 node[shop=boutique] {
     icon-image: "presets/shop/boutique.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=car],
 node[shop=car_dealer] {
-    icon-image: "presets/vehicle.png";
+    icon-image: "presets/shop/vehicle.svg";
     set icon_z17;
 }
 node[shop=car_repair] {
-    icon-image: "presets/vehicle/repair_shop.png";
+    icon-image: "presets/vehicle/repair_shop.svg";
     set icon_z17;
 }
 node[shop=tyres] {
-    icon-image: "presets/vehicle/tyres.png";
+    icon-image: "presets/vehicle/tyres.svg";
     set icon_z17;
 }
 node[shop=chemist] {
-    icon-image: "presets/shop/chemist.png";
+    icon-image: "presets/shop/chemist.svg";
     set icon_z17;
 }
@@ -1991,81 +1999,90 @@
 }
 node[shop=clothes] {
-    icon-image: "presets/shop/clothes.png";
+    icon-image: "presets/shop/clothes.svg";
     set icon_z17;
 }
 node[shop=computer] {
-    icon-image: "presets/shop/computer.png";
+    icon-image: "presets/shop/computer.svg";
     set icon_z17;
 }
 node[shop=confectionery] {
-    icon-image: "presets/shop/groceries/confectionery.png";
+    icon-image: "presets/shop/groceries/confectionery.svg";
     set icon_z17;
 }
 node[shop=copyshop] {
     icon-image: "presets/shop/copyshop.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=curtain] {
     icon-image: "presets/shop/curtain.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=cycle_repair] {
-    icon-image: "presets/sport/bicycle.png";
+    icon-image: "presets/shop/bicycle.svg";
     set icon_z17;
 }
 node[shop=department_store] {
-    icon-image: "presets/shop/mall.png";
+    icon-image: "presets/shop/mall.svg";
     set icon_z17;
 }
 node[shop=deli] {
     icon-image: "presets/shop/groceries/deli.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=electronics] {
-    icon-image: "presets/shop/electronics.png";
+    icon-image: "presets/shop/electronics.svg";
     set icon_z17;
 }
 node[shop=erotic] {
     icon-image: "presets/shop/erotic.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=furniture] {
-    icon-image: "presets/shop/furniture.png";
+    icon-image: "presets/shop/furniture.svg";
     set icon_z17;
 }
 node[shop=fabric] {
     icon-image: "presets/shop/fabric.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=florist] {
-    icon-image: "presets/shop/florist.png";
+    icon-image: "presets/shop/florist.svg";
     set icon_z17;
 }
 node[shop=frame] {
     icon-image: "presets/shop/frame.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=gift] {
-    icon-image: "presets/present.svg";
+    icon-image: "presets/shop/present.svg";
     set icon_z17;
 }
 node[shop=greengrocer] {
     icon-image: "presets/shop/groceries/greengrocer.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=garden_centre] {
-    icon-image: "presets/shop/garden_centre.png";
+    icon-image: "presets/shop/garden_centre.svg";
     set icon_z17;
 }
 node[shop=hairdresser] {
-    icon-image: "presets/shop/hairdresser.png";
+    icon-image: "presets/shop/hairdresser.svg";
     set icon_z17;
 }
 node[shop=hardware] {
     icon-image: "presets/shop/hardware.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=hearing_aids] {
     icon-image: "presets/shop/hearing_aids.png";
+    icon-height: 16;
     set icon_z17;
 }
@@ -2079,25 +2096,28 @@
 }
 node[shop=jewelry] {
-    icon-image: "presets/shop/jewelry.png";
+    icon-image: "presets/shop/jewelry.svg";
     set icon_z17;
 }
 node[shop=kitchen] {
     icon-image: "presets/shop/kitchen.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=mall] {
-    icon-image: "presets/shop/mall.png";
+    icon-image: "presets/shop/mall.svg";
     set icon_z17;
 }
 node[shop=mobile_phone] {
     icon-image: "presets/shop/mobile_phone.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=motorcycle] {
-    icon-image: "presets/vehicle/motorbike.png";
+    icon-image: "presets/vehicle/motorbike.svg";
     set icon_z17;
 }
 node[shop=musical_instrument] {
     icon-image: "presets/shop/musical_instrument.png";
+    icon-height: 16;
     set icon_z17;
 }
@@ -2116,45 +2136,50 @@
 node[shop=paint] {
     icon-image: "presets/shop/paint.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=pawnbroker] {
-    icon-image: "presets/pawnbroker.svg";
+    icon-image: "presets/shop/pawnbroker.svg";
     set icon_z17;
 }
 node[shop=seafood] {
     icon-image: "presets/shop/groceries/seafood.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=shoes] {
-    icon-image: "presets/shop/shoes.png";
+    icon-image: "presets/shop/shoes.svg";
     set icon_z17;
 }
 node[shop=sports] {
-    icon-image: "presets/sport/multi.png";
+    icon-image: "presets/sport/multi.svg";
     set icon_z17;
 }
 node[shop=stationery] {
     icon-image: "presets/shop/stationery.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[shop=tailor] {
-    icon-image: "presets/shop/tailor.png";
+    icon-image: "presets/shop/tailor.svg";
     set icon_z17;
 }
 node[shop=travel_agency] {
-    icon-image: "presets/travel.png";
+    icon-image: "presets/shop/travel.png";
     icon-width: 16;
     set icon_z17;
 }
 node[shop=toys] {
-    icon-image: "presets/shop/toys.png";
+    icon-image: "presets/shop/toys.svg";
     set icon_z17;
 }
 node[shop=vacuum_cleaner] {
     icon-image: "presets/shop/vacuum_cleaner.png";
+    icon-height: 16;
     set icon_z17;
 }
 node[shop=variety_store] {
     icon-image: "presets/shop/variety_store.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -2164,14 +2189,14 @@
 }
 node[shop=bookmaker] {
-    icon-image: "presets/lottery.svg";
+    icon-image: "presets/shop/lottery.svg";
     set icon_z17;
 }
 node[shop=lottery] {
-    icon-image: "presets/lottery.svg";
+    icon-image: "presets/shop/lottery.svg";
     set icon_z17;
 }
 /* duplicate of shopping_centre? */
 node[shop=shopping_centre] {
-    icon-image: "presets/shop/mall.png";
+    icon-image: "presets/shop/mall.svg";
     set icon_z17;
 }
@@ -2241,5 +2266,5 @@
 }
 node[shop=farm] {
-    icon-image: "presets/apple.png";
+    icon-image: "presets/shop/apple.png";
     set icon_z17;
 }
@@ -2273,13 +2298,13 @@
 }
 node[emergency=phone] {
-    icon-image: "presets/vehicle/emergency_phone.png";
+    icon-image: "presets/vehicle/emergency_phone.svg";
     set icon_z17;
 }
 node[emergency=defibrillator] {
-    icon-image: "presets/aed.svg";
+    icon-image: "presets/emergency/aed.svg";
     set icon_z17;
 }
 node[emergency=fire_hydrant] {
-    icon-image: "presets/service/fire_hydrant.png";
+    icon-image: "presets/service/fire_hydrant.svg";
     set icon_z17;
 }
@@ -2349,4 +2374,5 @@
 node[amenity=cafe] {
     icon-image: "presets/food/cafe.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -2365,5 +2391,5 @@
 }
 node[amenity=bar] {
-    icon-image: "presets/food/bar.png";
+    icon-image: "presets/food/bar.svg";
     set icon_z17;
 }
@@ -2396,27 +2422,27 @@
 }
 node[amenity=parking] {
-    icon-image: "presets/vehicle/parking.png";
+    icon-image: "presets/vehicle/parking/parking.svg";
     set icon_z17;
 }
 node[amenity=parking_entrance] {
-    icon-image: "presets/vehicle/parking.png";
+    icon-image: "presets/vehicle/parking/parking.svg";
     set icon_z17;
 }
 node[amenity=parking_entrance][parking=multi-storey],
 node[amenity=parking][parking=multi-storey] {
-    icon-image: "presets/vehicle/parking/multi-storey.png";
+    icon-image: "presets/vehicle/parking/multi-storey.svg";
     set icon_z17;
 }
 node[amenity=parking_entrance][parking=underground],
 node[amenity=parking][parking=underground] {
-    icon-image: "presets/vehicle/parking/underground.png";
+    icon-image: "presets/vehicle/parking/underground.svg";
     set icon_z17;
 }
 node[amenity=motorcycle_parking] {
-    icon-image: "presets/vehicle/parking/motorbike.png";
+    icon-image: "presets/vehicle/parking/motorbike.svg";
     set icon_z17;
 }
 node[amenity=bicycle_parking] {
-    icon-image: "presets/vehicle/parking/bicycle.png";
+    icon-image: "presets/vehicle/parking/bicycle.svg";
     set icon_z17;
 }
@@ -2426,9 +2452,9 @@
 }
 node[amenity=parking_space][wheelchair?] {
-    icon-image: "presets/vehicle/parking/handicapped.png";
+    icon-image: "presets/vehicle/parking/handicapped.svg";
     set icon_z17;
 }
 node[amenity=bicycle_rental] {
-    icon-image: "presets/vehicle/rental/bicycle.png";
+    icon-image: "presets/vehicle/bicycle_rental.svg";
     set icon_z17;
 }
@@ -2438,25 +2464,25 @@
 }
 node[amenity=car_rental] {
-    icon-image: "presets/vehicle/rental/car.png";
+    icon-image: "presets/vehicle/car_rental.svg";
     set icon_z17;
 }
 node[amenity=car_sharing] {
-    icon-image: "presets/vehicle/car_sharing.png";
+    icon-image: "presets/vehicle/car_sharing.svg";
     set icon_z17;
 }
 node[amenity=car_wash] {
-    icon-image: "presets/vehicle/car_wash.png";
+    icon-image: "presets/vehicle/car_wash.svg";
     set icon_z17;
 }
 node[amenity=taxi] {
-    icon-image: "presets/transport/taxi.png";
+    icon-image: "presets/transport/taxi.svg";
     set icon_z17;
 }
 node[amenity=fuel] {
-    icon-image: "presets/vehicle/fuel.png";
+    icon-image: "presets/vehicle/fuel.svg";
     set icon_z17;
 }
 node[amenity=charging_station] {
-    icon-image: "presets/vehicle/fuel/charging_station.png";
+    icon-image: "presets/vehicle/charging_station.png";
     set icon_z17;
 }
@@ -2466,5 +2492,5 @@
 }
 node[amenity=telephone] {
-    icon-image: "presets/service/telephone.png";
+    icon-image: "presets/service/telephone.svg";
     set icon_z17;
 }
@@ -2480,5 +2506,5 @@
 }
 node[amenity=toilets] {
-    icon-image: "presets/service/toilets.png";
+    icon-image: "presets/service/toilets.svg";
     set icon_z17;
 }
@@ -2498,5 +2524,5 @@
 }
 node[amenity=waste_basket] {
-    icon-image: "presets/service/recycling/trash-bin.png";
+    icon-image: "presets/service/recycling/trash-bin.svg";
     set icon_z17;
 }
@@ -2515,13 +2541,15 @@
 }
 node[amenity=townhall] {
-    icon-image: "presets/townhall.png";
+    icon-image: "presets/service/townhall.png";
     set icon_z17;
 }
 node[amenity=embassy] {
-    icon-image: "presets/service/administration/embassy.png";
+    icon-image: "presets/service/embassy.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[amenity=community_centre] {
     icon-image: "presets/service/community_centre.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -2535,5 +2563,5 @@
 }
 node[amenity=water_point] {
-    icon-image: "presets/accommodation/camping/water.png";
+    icon-image: "presets/accommodation/water.svg";
     set icon_z17;
 }
@@ -2555,65 +2583,65 @@
 }
 node[amenity=place_of_worship] {
-    icon-image: "presets/religion.png";
+    icon-image: "presets/religion/religion.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=bahai] {
-    icon-image: "presets/religion/bahai.png";
+    icon-image: "presets/religion/bahai.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=buddhist] {
-    icon-image: "presets/religion/buddhism.png";
+    icon-image: "presets/religion/buddhism.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=christian] {
-    icon-image: "presets/religion/church.png";
+    icon-image: "presets/religion/church.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=hindu] {
-    icon-image: "presets/religion/hinduism.png";
+    icon-image: "presets/religion/hinduism.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=jain] {
-    icon-image: "presets/religion/jainism.png";
+    icon-image: "presets/religion/jainism.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=jewish] {
-    icon-image: "presets/religion/jewish.png";
+    icon-image: "presets/religion/jewish.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=muslim] {
-    icon-image: "presets/religion/muslim.png";
+    icon-image: "presets/religion/muslim.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=sikh] {
-    icon-image: "presets/religion/sikhism.png";
+    icon-image: "presets/religion/sikhism.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=shinto] {
-    icon-image: "presets/religion/shinto.png";
+    icon-image: "presets/religion/shinto.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=taoist] {
-    icon-image: "presets/religion/taoism.png";
+    icon-image: "presets/religion/taoism.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[amenity=grave_yard] {
-    icon-image: "presets/rendering/landuse/cemetery.png";
+    icon-image: "presets/misc/landuse/graveyard.svg";
     set icon_z17;
 }
 node[amenity=crematorium][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -2632,4 +2660,5 @@
 node[amenity=school] {
     icon-image: "presets/education/school.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -2643,5 +2672,5 @@
 }
 node[amenity=kindergarten] {
-    icon-image: "presets/education/kindergarten.png";
+    icon-image: "presets/education/kindergarten.svg";
     set icon_z17;
 }
@@ -2734,5 +2763,5 @@
 }
 node[amenity=police] {
-    icon-image: "presets/service/police.png";
+    icon-image: "presets/service/police.svg";
     set icon_z17;
 }
@@ -2742,9 +2771,9 @@
 }
 node[amenity=fire_station] {
-    icon-image: "presets/service/firebrigade.png";
+    icon-image: "presets/service/firebrigade.svg";
     set icon_z17;
 }
 node[amenity=bus_station] {
-    icon-image: "presets/transport/bus.png";
+    icon-image: "presets/transport/bus_old.svg";
     set icon_z17;
 }
@@ -2754,10 +2783,10 @@
 }
 node[amenity=theatre] {
-    icon-image: "presets/theater.png";
+    icon-image: "presets/leisure/theater.png";
     icon-width: 16;
     set icon_z17;
 }
 node[amenity=cinema] {
-    icon-image: "presets/leisure/cinema.png";
+    icon-image: "presets/leisure/cinema.svg";
     set icon_z17;
 }
@@ -2767,21 +2796,21 @@
 }
 node[amenity=courthouse] {
-    icon-image: "presets/service/administration/courthouse.svg";
+    icon-image: "presets/service/courthouse.svg";
     set icon_z17;
 }
 node[amenity=prison] {
-    icon-image: "presets/service/administration/prison.svg";
+    icon-image: "presets/service/prison.svg";
     set icon_z17;
 }
 node[amenity=bank] {
-    icon-image: "presets/money/bank.png";
+    icon-image: "presets/money/bank.svg";
     set icon_z17;
 }
 node[amenity=bureau_de_change] {
-    icon-image: "presets/money/exchange.png";
+    icon-image: "presets/money/exchange.svg";
     set icon_z17;
 }
 node[amenity=atm] {
-    icon-image: "presets/money/atm.png";
+    icon-image: "presets/money/atm.svg";
     set icon_z17;
 }
@@ -2796,4 +2825,5 @@
 node[amenity=bbq] {
     icon-image: "presets/leisure/bbq.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -2828,17 +2858,17 @@
 }
 node[amenity=hunting_stand] {
-    icon-image: "presets/hunting_stand.png";
+    icon-image: "presets/landmark/hunting_stand.png";
     set icon_z17;
 }
 node[amenity=marketplace] {
-    icon-image: "presets/place/marketplace.png";
+    icon-image: "presets/shop/marketplace.png";
     set icon_z17;
 }
 node[amenity=wlan] {
-    icon-image: "presets/wlan.png";
+    icon-image: "presets/misc/wlan.svg";
     set icon_z17;
 }
 node[amenity=vending_machine] {
-    icon-image: "presets/transport/ticket-machine.png";
+    icon-image: "presets/transport/ticket-machine.svg";
     set icon_z17;
 }
@@ -2879,24 +2909,24 @@
 }
 node[craft=carpenter][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=shoemaker][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=photographer][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=metal_construction][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }node[craft=electrician][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=brewery][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -2906,17 +2936,17 @@
 }
 node[craft=sawmill][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=gardener][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=winery][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=hvac][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -2926,9 +2956,9 @@
 }
 node[craft=stonemason][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=handicraft][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -2938,25 +2968,25 @@
 }
 node[craft=key_cutter][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=caterer][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=roofer][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=beekeeper][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=blacksmith][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[craft=locksmith][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -2966,5 +2996,5 @@
 }
 node[craft=upholsterer][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -2998,5 +3028,5 @@
 }
 node[tourism=guest_house] {
-    icon-image: "presets/accommodation/guest_house.png";
+    icon-image: "presets/accommodation/guest_house.svg";
     set icon_z17;
 }
@@ -3006,5 +3036,5 @@
 }
 node[tourism=chalet] {
-    icon-image: "presets/accommodation/chalet.png";
+    icon-image: "presets/accommodation/chalet.svg";
     set icon_z17;
 }
@@ -3018,9 +3048,9 @@
 }
 node[tourism=camp_site] {
-    icon-image: "presets/accommodation/camping.png";
+    icon-image: "presets/accommodation/camping.svg";
     set icon_z17;
 }
 node[tourism=caravan_site] {
-    icon-image: "presets/accommodation/camping/caravan.png";
+    icon-image: "presets/accommodation/caravan.svg";
     set icon_z17;
 }
@@ -3038,18 +3068,18 @@
 }
 node[tourism=viewpoint] {
-    icon-image: "presets/sightseeing/viewpoint.png";
+    icon-image: "presets/sightseeing/viewpoint.svg";
     set icon_z17;
 }
 node[tourism=theme_park] {
-    icon-image: "presets/leisure/theme_park.png";
+    icon-image: "presets/leisure/theme_park.svg";
     set icon_z17;
 }
 node[tourism=attraction] {
-    icon-image: "presets/sightseeing.png";
+    icon-image: "presets/sightseeing/attraction.svg";
     icon-width: 16;
     set icon_z17;
 }
 node[tourism=zoo] {
-    icon-image: "presets/leisure/zoo.png";
+    icon-image: "presets/leisure/zoo.svg";
     set icon_z17;
 }
@@ -3078,9 +3108,9 @@
 }
 node[tourism=information] {
-    icon-image: "presets/misc/information.png";
+    icon-image: "presets/misc/information/information.svg";
     set icon_z17;
 }
 node[tourism=information][information=guidepost] {
-    icon-image: "presets/misc/information/guidepost.png";
+    icon-image: "presets/misc/information/guidepost.svg";
     set icon_z17;
 }
@@ -3089,13 +3119,13 @@
 }
 node[tourism=information][information=office] {
-    icon-image: "presets/misc/information/informationoffice.png";
+    icon-image: "presets/misc/information/informationoffice.svg";
     set icon_z17;
 }
 node[tourism=information][information=map] {
-    icon-image: "presets/misc/information/map.png";
+    icon-image: "presets/misc/information/map.svg";
     set icon_z17;
 }
 node[tourism=information][information=board] {
-    icon-image: "presets/misc/information/board.png";
+    icon-image: "presets/misc/information/board.svg";
     set icon_z17;
 }
@@ -3122,37 +3152,38 @@
 }
 node[historic=monument] {
-    icon-image: "presets/sightseeing/monument.png";
+    icon-image: "presets/sightseeing/monument.svg";
     set icon_z17;
 }
 node[historic=memorial] {
-    icon-image: "presets/sightseeing/memorial.png";
+    icon-image: "presets/sightseeing/memorial.svg";
     set icon_z17;
 }
 node[historic=archaeological_site] {
-    icon-image: "presets/sightseeing/archaeological.png";
+    icon-image: "presets/sightseeing/archaeological.svg";
     set icon_z17;
 }
 node[historic=ruins] {
-    icon-image: "presets/sightseeing/ruins.png";
+    icon-image: "presets/sightseeing/ruins.svg";
     set icon_z17;
 }
 node[historic=battlefield] {
-    icon-image: "presets/sightseeing/battlefield.png";
+    icon-image: "presets/sightseeing/battlefield.svg";
     set icon_z17;
 }
 node[geological=palaeontological_site] {
-    icon-image: "presets/historic/palaeontological_site.png";
+    icon-image: "presets/sightseeing/palaeontological_site.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[historic=wayside_cross] {
-    icon-image: "presets/religion/wayside_cross.png";
+    icon-image: "presets/religion/wayside_cross.svg";
     set icon_z17;
 }
 node[historic=wayside_shrine] {
-    icon-image: "presets/religion/wayside_shrine.png";
+    icon-image: "presets/religion/wayside_shrine.svg";
     set icon_z17;
 }
 node[historic=boundary_stone] {
-    icon-image: "presets/historic/boundary_stone.png";
+    icon-image: "presets/misc/boundary_stone.png";
     set icon_z17;
 }
@@ -3252,5 +3283,5 @@
 }
 node[landuse] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -3268,21 +3299,21 @@
 }
 node[military=airfield] {
-    icon-image: "presets/transport/airport/airfield.png";
+    icon-image: "presets/transport/airport/airfield.svg";
     set icon_z17;
 }
 node[military=bunker] {
-    icon-image: "presets/misc/landmark/bunker.png";
+    icon-image: "presets/landmark/bunker.svg";
     set icon_z17;
 }
 node[military=barracks][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[military=danger_area] {
-    icon-image: "presets/misc/danger.png";
+    icon-image: "presets/misc/danger.svg";
     set icon_z17;
 }
 node[military=range] {
-    icon-image: "presets/misc/landmark/range.png";
+    icon-image: "presets/sport/range.svg";
     set icon_z17;
 }
@@ -3296,13 +3327,14 @@
 }
 node[railway=station] {
-    icon-image: "presets/transport/railway_station.png";
+    icon-image: "presets/transport/railway_station.svg";
     set icon_z17;
 }
 node[railway=halt] {
-    icon-image: "presets/station16.png";
+    icon-image: "presets/transport/station.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[railway=tram_stop] {
-    icon-image: "presets/transport/tram.png";
+    icon-image: "presets/transport/tram.svg";
     set icon_z17;
 }
@@ -3462,5 +3494,5 @@
 node[railway=platform], node[railway=funicular],
 node[service=yard], node[service=siding], node[service=spur] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -3501,5 +3533,5 @@
 }
 node[aeroway=aerodrome][military!=airfield] {
-    icon-image: "presets/transport/airport.png";
+    icon-image: "presets/transport/airport.svg";
     set icon_z17;
 }
@@ -3508,5 +3540,5 @@
 }
 node[aeroway=terminal] {
-    icon-image: "presets/transport/airport/terminal.png";
+    icon-image: "presets/transport/airport/terminal.svg";
     set icon_z17;
 }
@@ -3515,5 +3547,5 @@
 }
 node[aeroway=helipad] {
-    icon-image: "presets/transport/airport/helipad.png";
+    icon-image: "presets/transport/airport/helipad.svg";
     set icon_z17;
 }
@@ -3547,17 +3579,17 @@
 node[aeroway=runway],
 node[aeroway=taxiway] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
 node[aeroway=hangar] {
-    icon-image: "presets/transport/airport/hangar.png";
+    icon-image: "presets/transport/airport/hangar.svg";
     set icon_z17;
 }
 node[aeroway=gate] {
-    icon-image: "presets/transport/airport/gate.png";
+    icon-image: "presets/transport/airport/gate.svg";
     set icon_z17;
 }
 node[aeroway=windsock] {
-    icon-image: "presets/transport/airport/windsock.png";
+    icon-image: "presets/transport/airport/windsock.svg";
     set icon_z17;
 }
@@ -3606,5 +3638,5 @@
 }
 node[aerialway=station] {
-    icon-image: "presets/transport/aerialway/station.png";
+    icon-image: "presets/transport/aerialway/station.svg";
     set icon_z17;
 }
@@ -3624,5 +3656,5 @@
 node[aerialway=rope_tow],
 node[aerialway=goods] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -3673,5 +3705,5 @@
 }
 node[public_transport=stop_position][aerialway=yes] {
-    icon-image: "presets/transport/aerialway/station.png";
+    icon-image: "presets/transport/aerialway/station.svg";
     set icon_z17;
 }
@@ -3718,13 +3750,14 @@
 }
 node[sport="9pin"] {
-    icon-image: "presets/sport/10pin.png";
+    icon-image: "presets/sport/10pin.svg";
     set icon_z17;
 }
 node[sport="10pin"] {
-    icon-image: "presets/sport/10pin.png";
+    icon-image: "presets/sport/10pin.svg";
     set icon_z17;
 }
 node[sport=athletics] {
     icon-image: "presets/sport/athletics.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -3735,5 +3768,5 @@
 node[sport=soccer],
 node[sport=gaelic_games] {
-    icon-image: "presets/sport/soccer.png";
+    icon-image: "presets/sport/soccer.svg";
     set icon_z17;
 }
@@ -3743,5 +3776,5 @@
 node[sport=rugby_league],
 node[sport=rugby_union] {
-    icon-image: "presets/sport/football.png";
+    icon-image: "presets/sport/football.svg";
     icon-width: 20;
     icon-height: 20;
@@ -3760,9 +3793,9 @@
 }
 node[sport=baseball] {
-    icon-image: "presets/sport/baseball.png";
+    icon-image: "presets/sport/baseball.svg";
     set icon_z17;
 }
 node[sport=basketball] {
-    icon-image: "presets/sport/basketball.png";
+    icon-image: "presets/sport/basketball.svg";
     icon-width: 16;
     icon-height: 16;
@@ -3770,9 +3803,9 @@
 }
 node[sport=boules] {
-    icon-image: "presets/sport/boule.png";
+    icon-image: "presets/sport/boule.svg";
     set icon_z17;
 }
 node[sport=bowls] {
-    icon-image: "presets/sport/boule.png";
+    icon-image: "presets/sport/boule.svg";
     set icon_z17;
 }
@@ -3786,13 +3819,13 @@
 }
 node[sport=climbing] {
-    icon-image: "presets/sport/climbing.png";
+    icon-image: "presets/sport/climbing.svg";
     set icon_z17;
 }
 node[sport=cricket] {
-    icon-image: "presets/sport/cricket.png";
+    icon-image: "presets/sport/cricket.svg";
     set icon_z17;
 }
 node[sport=croquet] {
-    icon-image: "presets/sport/croquet.png";
+    icon-image: "presets/sport/croquet.svg";
     set icon_z17;
 }
@@ -3814,5 +3847,5 @@
 }
 node[sport=cycling] {
-    icon-image: "presets/sport/cycling.png";
+    icon-image: "presets/sport/cycling.svg";
     set icon_z17;
 }
@@ -3822,5 +3855,5 @@
 }
 node[sport=equestrian] {
-    icon-image: "presets/equestrian.png";
+    icon-image: "presets/leisure/equestrian.png";
     icon-width: 16;
     set icon_z17;
@@ -3831,25 +3864,28 @@
 }
 node[sport=gymnastics] {
-    icon-image: "presets/gymnastics.svg";
+    icon-image: "presets/sport/gymnastics.svg";
     set icon_z17;
 }
 node[sport=field_hockey] {
     icon-image: "presets/sport/field_hockey.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[sport=ice_hockey] {
     icon-image: "presets/sport/ice_hockey.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[sport=horse_racing] {
-    icon-image: "presets/sport/riding.png";
+    icon-image: "presets/sport/riding.svg";
     set icon_z17;
 }
 node[sport=karting] {
     icon-image: "presets/sport/karting.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[sport=motocross] {
-    icon-image: "presets/sport/motocross.png";
+    icon-image: "presets/sport/motocross.svg";
     set icon_z17;
 }
@@ -3867,17 +3903,19 @@
 }
 node[sport=multi] {
-    icon-image: "presets/sport/multi.png";
+    icon-image: "presets/sport/multi.svg";
     set icon_z17;
 }
 node[sport=pelota] {
     icon-image: "presets/sport/pelota.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[sport=racquet] {
-    icon-image: "presets/sport/racquetball.png";
+    icon-image: "presets/sport/racquetball.svg";
     set icon_z17;
 }
 node[sport=ice_skating] {
     icon-image: "presets/sport/skating.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -3887,9 +3925,9 @@
 }
 node[sport=skating] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
 node[sport=skateboard] {
-    icon-image: "presets/sport/skateboard.png";
+    icon-image: "presets/sport/skateboard.svg";
     set icon_z17;
 }
@@ -3898,5 +3936,5 @@
 }
 node[sport=swimming] {
-    icon-image: "presets/sport/pool.png";
+    icon-image: "presets/sport/swimming.svg";
     set icon_z17;
 }
@@ -3907,13 +3945,13 @@
 }
 node[sport=table_tennis] {
-    icon-image: "presets/sport/table_tennis.png";
+    icon-image: "presets/sport/table_tennis.svg";
     set icon_z17;
 }
 node[sport=tennis] {
-    icon-image: "presets/sport/tennis.png";
+    icon-image: "presets/sport/tennis.svg";
     set icon_z17;
 }
 node[sport=paintball][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -3932,18 +3970,19 @@
 }
 node[sport=squash][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
 node[sport=shooting] {
-    icon-image: "presets/range.png";
+    icon-image: "presets/sport/range.svg";
     icon-width: 16;
     set icon_z17;
 }
 node[sport=volleyball] {
-    icon-image: "presets/sport/volleyball.png";
+    icon-image: "presets/sport/volleyball.svg";
     set icon_z17;
 }
 node[sport=beachvolleyball] {
     icon-image: "presets/sport/beachvolleyball.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -3953,17 +3992,17 @@
 }
 node[sport=bowling] {
-    icon-image: "presets/sport/10pin.png";
+    icon-image: "presets/sport/10pin.svg";
     set icon_z17;
 }
 node[sport=handball] {
-    icon-image: "presets/sport/handball.png";
+    icon-image: "presets/sport/handball.svg";
     set icon_z17;
 }
 node[sport=rowing] {
-    icon-image: "presets/sport/rowing.png";
+    icon-image: "presets/sport/rowing.svg";
     set icon_z17;
 }
 node[sport=sailing][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -3973,5 +4012,5 @@
 }
 node[sport=badminton][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }
@@ -3983,5 +4022,5 @@
 }
 node[sport=archery] {
-    icon-image: "presets/sport/archery.png";
+    icon-image: "presets/sport/archery.svg";
     set icon_z17;
 }
@@ -3991,9 +4030,9 @@
 }
 node[sport=model_aerodrome] {
-    icon-image: "presets/transport/airport.png";
+    icon-image: "presets/transport/airport.svg";
     set icon_z17;
 }
 node[sport=rc_car] {
-    icon-image: "presets/transport/car.png";
+    icon-image: "presets/sport/rc_car.svg";
     set icon_z17;
 }
@@ -4007,14 +4046,14 @@
 }
 node[natural=spring] {
-    icon-image: "presets/misc/landmark/spring.svg";
+    icon-image: "presets/landmark/spring.svg";
     set icon_z17;
 }
 node[natural=saddle] {
-    icon-image: "presets/saddle.svg";
+    icon-image: "presets/landmark/saddle.svg";
     set icon_z0;
     set text_z0;
 }
 node[natural=peak] {
-    icon-image: "presets/peak.svg";
+    icon-image: "presets/landmark/peak.svg";
     set icon_z0;
     set text_z0;
@@ -4029,5 +4068,5 @@
 }
 node[natural=volcano] {
-    icon-image: "presets/misc/landmark/volcano_small.png";
+    icon-image: "presets/landmark/volcano.svg";
     set icon_z0;
     set text_z0;
@@ -4128,23 +4167,23 @@
 }
 node[natural=cave_entrance] {
-    icon-image: "presets/misc/landmark/cave_entrance.png";
+    icon-image: "presets/landmark/cave_entrance.png";
     set icon_z17;
 }
 node[natural=tree] {
-    icon-image: "presets/misc/landmark/trees.png";
+    icon-image: "presets/landmark/trees.svg";
     set icon_z17;
 }
 node[natural=tree][type=conifer],
 node[natural=tree][leaf_type=needleleaved] {
-    icon-image: "presets/misc/landmark/trees_conifer.png";
+    icon-image: "presets/landmark/trees_conifer.svg";
     set icon_z17;
 }
 node[natural=tree][type=broad_leaved],
 node[natural=tree][leaf_type=broadleaved] {
-    icon-image: "presets/misc/landmark/trees_broad_leaved.png";
+    icon-image: "presets/landmark/trees_broad_leaved.svg";
     set icon_z17;
 }
 node[natural=tree][type=palm] {
-    icon-image: "presets/misc/landmark/trees_palm.png";
+    icon-image: "presets/landmark/trees_palm.png";
     set icon_z17;
 }
@@ -4167,5 +4206,5 @@
 node[natural=ridge],
 node[natural=valley] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -4212,9 +4251,9 @@
 }
 node[waterway=lock_gate] {
-    icon-image: "presets/nautical/lock_gate.png";
+    icon-image: "presets/nautical/lock_gate.svg";
     set icon_z17;
 }
 node[waterway=turning_point] {
-    icon-image: "presets/nautical/turning.png";
+    icon-image: "presets/nautical/turning.svg";
     set icon_z17;
 }
@@ -4229,5 +4268,5 @@
 node[waterway=waste_disposal],
 node[waterway=mooring] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -4276,5 +4315,5 @@
 node[waterway=stream],
 node[waterway=ditch], node[waterway=drain] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -4297,5 +4336,5 @@
 node[route=tour],
 node[route=pub_crawl] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -4306,5 +4345,5 @@
 
 node[mountain_pass?] {
-    icon-image: "presets/misc/landmark/mountain_pass.svg";
+    icon-image: "presets/landmark/mountain_pass.svg";
     set icon_z0;
     set text_z0;
@@ -4382,5 +4421,5 @@
 node[boundary=political],
 node[boundary=national_park] {
-    icon-image: "presets/misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
@@ -4543,5 +4582,5 @@
 node|z15-[place=locality],
 node|z-14[place=locality][!setting("hide_icons")] {
-    icon-image: "presets/place/locality.png";
+    icon-image: "presets/place/locality.svg";
     font-weight: bold;
     text-color:black;
@@ -4550,8 +4589,8 @@
 }
 node[place=island] {
-    icon-image: "presets/place/island.png";
+    icon-image: "presets/place/island.svg";
 }
 node[place=islet] {
-    icon-image: "presets/place/islet.png";
+    icon-image: "presets/place/islet.svg";
 }
 
Index: trunk/styles/standard/potlatch2.mapcss
===================================================================
--- trunk/styles/standard/potlatch2.mapcss	(revision 10579)
+++ trunk/styles/standard/potlatch2.mapcss	(revision 10706)
@@ -27,23 +27,23 @@
 
 relation[restriction=no_left_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg";
 }
 relation[restriction=no_right_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg";
 }
 relation[restriction=no_straight_on] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg";
 }
 relation[restriction=no_u_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg";
 }
 relation[restriction=only_left_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg";
 }
 relation[restriction=only_right_turn] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg";
 }
 relation[restriction=only_straight_on] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg";
 }