Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 10798)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 10808)
@@ -65,5 +65,5 @@
 
 relation[restriction=no_left_turn][!setting("alt_turn_icons")] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn_red.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg";
     set icon_z17;
     text: auto;
@@ -75,5 +75,5 @@
 }
 relation[restriction=no_right_turn][!setting("alt_turn_icons")] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn_red.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg";
     set icon_z17;
     text: auto;
@@ -85,5 +85,5 @@
 }
 relation[restriction=no_straight_on][!setting("alt_turn_icons")] {
-    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on_red.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg";
     set icon_z17;
     text: auto;
@@ -277,7 +277,6 @@
 /*****************************/
 
-node["addr:housenumber"],
-node["addr:postcode"] {
-    icon-image: "presets/misc/housenumber.png";
+node["addr:housenumber"] {
+    icon-image: "presets/misc/housenumber_small.svg";
     set icon_z17;
 }
@@ -309,9 +308,9 @@
 }
 node[building=garage] {
-    icon-image: "presets/landuse/garages.png";
+    icon-image: "presets/landuse/garages.svg";
     set icon_z17;
 }
 node[building=garages] {
-    icon-image: "presets/landuse/garages.png";
+    icon-image: "presets/landuse/garages.svg";
     set icon_z17;
 }
@@ -322,21 +321,21 @@
 node[entrance=yes],
 node[entrance=staircase] {
-    icon-image: "presets/misc/entrance-yes.png";
+    icon-image: "presets/misc/entrance_yes.svg";
     set icon_z17;
 }
 node[entrance=main] {
-    icon-image: "presets/misc/entrance-main.png";
+    icon-image: "presets/misc/entrance_main.svg";
     set icon_z17;
 }
 node[entrance=service] {
-    icon-image: "presets/misc/entrance-service.png";
+    icon-image: "presets/misc/entrance_service.svg";
     set icon_z17;
 }
 node[entrance=exit] {
-    icon-image: "presets/misc/entrance-exit.png";
+    icon-image: "presets/misc/entrance_exit.svg";
     set icon_z17;
 }
 node[entrance=emergency] {
-    icon-image: "presets/misc/entrance-emergency.png";
+    icon-image: "presets/misc/entrance_emergency.svg";
     set icon_z17;
 }
@@ -361,5 +360,5 @@
 }
 node[barrier=gate] {
-    icon-image: "presets/barrier/gate.png";
+    icon-image: "presets/barrier/gate.svg";
     set icon_z17;
 }
@@ -381,5 +380,5 @@
 way[barrier=retaining_wall],
 way[barrier=kerb] {
-    repeat-image: "presets/misc/cliff-pattern.png";
+    repeat-image: "presets/misc/cliff_pattern.svg";
     repeat-image-align: top;
 }
@@ -429,6 +428,5 @@
 }
 node[barrier=toll_booth] {
-    icon-image: "presets/barrier/toll_station.png";
-    icon-width: 16;
+    icon-image: "presets/barrier/toll_station.svg";
     set icon_z17;
 }
@@ -438,10 +436,9 @@
 }
 node[barrier=cattle_grid] {
-    icon-image: "presets/barrier/cattle_grid.png";
+    icon-image: "presets/barrier/cattle_grid.svg";
     set icon_z17;
 }
 node[barrier=border_control] {
-    icon-image: "presets/barrier/douane.png";
-    icon-width: 16;
+    icon-image: "presets/barrier/douane.svg";
     set icon_z17;
 }
@@ -691,5 +688,5 @@
 }
 node[highway=street_lamp] {
-    icon-image: "presets/misc/streetlamp.png";
+    icon-image: "presets/misc/streetlamp.svg";
     set icon_z17;
 }
@@ -1302,5 +1299,5 @@
 }
 node[man_made=beacon] {
-    icon-image: "presets/landmark/beacon.png";
+    icon-image: "presets/landmark/beacon.svg";
     set icon_z17;
 }
@@ -1314,26 +1311,21 @@
 }
 node[man_made=chimney] {
-    icon-image: "presets/landmark/chimney.png";
-    icon-width: 16;
+    icon-image: "presets/landmark/chimney.svg";
     set icon_z17;
 }
 node[man_made=flagpole] {
-    icon-image: "presets/misc/flag.png";
-    icon-width: 16;
+    icon-image: "presets/misc/flag.svg";
     set icon_z17;
 }
 node[man_made=gasometer] {
     icon-image: "presets/landmark/gasometer.svg";
-    icon-width: 16;
     set icon_z17;
 }
 node[man_made=silo] {
     icon-image: "presets/landmark/silo.svg";
-    icon-width: 16;
     set icon_z17;
 }
 node[man_made=storage_tank] {
     icon-image: "presets/landmark/storage_tank.svg";
-    icon-width: 16;
     set icon_z17;
 }
@@ -1361,6 +1353,5 @@
 }
 node[man_made=monitoring_station] {
-    icon-image: "presets/misc/monitoring_station.png";
-    icon-height: 16;
+    icon-image: "presets/misc/monitoring_station.svg";
     set icon_z17;
 }
@@ -1451,5 +1442,4 @@
 node[man_made=surveillance] {
     icon-image: "presets/service/surveillance.png";
-    icon-width: 16;
     set icon_z17;
 }
@@ -1459,5 +1449,5 @@
 }
 node[man_made=tower] {
-    icon-image: "presets/landmark/tower.png";
+    icon-image: "presets/landmark/tower.svg";
     set icon_z17;
 }
@@ -1487,6 +1477,5 @@
 }
 node[man_made=water_works] {
-    icon-image: "presets/landmark/water_works.png";
-    icon-width: 16;
+    icon-image: "presets/landmark/water_works.svg";
     set icon_z17;
 }
@@ -1629,23 +1618,21 @@
 }
 node[leisure=sports_centre] {
-    icon-image: "presets/sport/centre.png";
+    icon-image: "presets/sport/sports_centre.svg";
     set icon_z17;
 }
 node[leisure=fitness_centre] {
-    icon-image: "presets/sport/fitness_centre.png";
-    icon-width: 16;
+    icon-image: "presets/sport/fitness_centre.svg";
     set icon_z17;
 }
 node[leisure=stadium] {
-    icon-image: "presets/sport/stadium.png";
+    icon-image: "presets/sport/stadium.svg";
     set icon_z17;
 }
 node[leisure=horse_riding] {
-    icon-image: "presets/leisure/equestrian.png";
-    icon-width: 16;
+    icon-image: "presets/leisure/horse_riding.svg";
     set icon_z17;
 }
 node[leisure=water_park] {
-    icon-image: "presets/leisure/water_park.png";
+    icon-image: "presets/leisure/water_park.svg";
     set icon_z17;
 }
@@ -1658,5 +1645,5 @@
 }
 node[leisure=track] {
-    icon-image: "presets/sport/track.png";
+    icon-image: "presets/sport/track.svg";
     set icon_z17;
 }
@@ -1665,5 +1652,5 @@
 }
 node[leisure=pitch] {
-    icon-image: "presets/sport/pitch.png";
+    icon-image: "presets/sport/pitch.svg";
     set icon_z17;
 }
@@ -1672,5 +1659,5 @@
 }
 node[leisure=marina] {
-    icon-image: "presets/nautical/marina.png";
+    icon-image: "presets/nautical/marina.svg";
     set icon_z17;
 }
@@ -1680,5 +1667,5 @@
 }
 node[leisure=slipway] {
-    icon-image: "presets/nautical/slipway.png";
+    icon-image: "presets/nautical/slipway.svg";
     set icon_z17;
 }
@@ -1694,5 +1681,5 @@
 }
 node[leisure=fishing] {
-    icon-image: "presets/sport/fishing.png";
+    icon-image: "presets/sport/fishing.svg";
     set icon_z17;
 }
@@ -1702,5 +1689,5 @@
 }
 node[leisure=nature_reserve] {
-    icon-image: "presets/leisure/nature_reserve.png";
+    icon-image: "presets/leisure/nature_reserve.svg";
     set icon_z17;
 }
@@ -1714,9 +1701,9 @@
 }
 node[leisure=garden] {
-    icon-image: "presets/leisure/garden.png";
+    icon-image: "presets/leisure/garden.svg";
     set icon_z17;
 }
 node[leisure=common] {
-    icon-image: "presets/leisure/common.png";
+    icon-image: "presets/leisure/common.svg";
     set icon_z17;
 }
@@ -1726,5 +1713,5 @@
 }
 node[leisure=picnic_table] {
-    icon-image: "presets/leisure/picnic.png";
+    icon-image: "presets/leisure/picnic.svg";
     set icon_z17;
 }
@@ -1752,16 +1739,13 @@
 }
 node[leisure=dog_park] {
-    icon-image: "presets/leisure/dogpark.png";
-    icon-width: 16;
+    icon-image: "presets/leisure/dogpark.svg";
     set icon_z17;
 }
 node[leisure=ice_rink] {
-    icon-image: "presets/sport/ice_hockey.png";
-    icon-width: 16;
+    icon-image: "presets/sport/ice_hockey.svg";
     set icon_z17;
 }
 node[leisure=sauna] {
-    icon-image: "presets/leisure/sauna.png";
-    icon-width: 16;
+    icon-image: "presets/leisure/sauna.svg";
     set icon_z17;
 }
@@ -1927,14 +1911,13 @@
 }
 node[shop=convenience] {
-    icon-image: "presets/shop/convenience.png";
-    icon-width: 16;
+    icon-image: "presets/shop/convenience.svg";
     set icon_z17;
 }
 node[shop=bakery] {
-    icon-image: "presets/shop/groceries/bakery.png";
+    icon-image: "presets/shop/groceries/bakery.svg";
     set icon_z17;
 }
 node[shop=butcher] {
-    icon-image: "presets/shop/groceries/butcher.png";
+    icon-image: "presets/shop/groceries/butcher.svg";
     set icon_z17;
 }
@@ -1973,6 +1956,5 @@
 }
 node[shop=boutique] {
-    icon-image: "presets/shop/boutique.png";
-    icon-width: 16;
+    icon-image: "presets/shop/boutique.svg";
     set icon_z17;
 }
@@ -2011,11 +1993,9 @@
 }
 node[shop=copyshop] {
-    icon-image: "presets/shop/copyshop.png";
-    icon-width: 16;
+    icon-image: "presets/shop/copyshop.svg";
     set icon_z17;
 }
 node[shop=curtain] {
-    icon-image: "presets/shop/curtain.png";
-    icon-width: 16;
+    icon-image: "presets/shop/curtain.svg";
     set icon_z17;
 }
@@ -2029,6 +2009,5 @@
 }
 node[shop=deli] {
-    icon-image: "presets/shop/groceries/deli.png";
-    icon-width: 16;
+    icon-image: "presets/shop/groceries/deli.svg";
     set icon_z17;
 }
@@ -2038,6 +2017,5 @@
 }
 node[shop=erotic] {
-    icon-image: "presets/shop/erotic.png";
-    icon-width: 16;
+    icon-image: "presets/shop/erotic.svg";
     set icon_z17;
 }
@@ -2047,6 +2025,5 @@
 }
 node[shop=fabric] {
-    icon-image: "presets/shop/fabric.png";
-    icon-width: 16;
+    icon-image: "presets/shop/fabric.svg";
     set icon_z17;
 }
@@ -2056,6 +2033,5 @@
 }
 node[shop=frame] {
-    icon-image: "presets/shop/frame.png";
-    icon-width: 16;
+    icon-image: "presets/shop/frame.svg";
     set icon_z17;
 }
@@ -2065,6 +2041,5 @@
 }
 node[shop=greengrocer] {
-    icon-image: "presets/shop/groceries/greengrocer.png";
-    icon-width: 16;
+    icon-image: "presets/shop/groceries/greengrocer.svg";
     set icon_z17;
 }
@@ -2078,11 +2053,9 @@
 }
 node[shop=hardware] {
-    icon-image: "presets/shop/hardware.png";
-    icon-width: 16;
+    icon-image: "presets/shop/hardware.svg";
     set icon_z17;
 }
 node[shop=hearing_aids] {
-    icon-image: "presets/shop/hearing_aids.png";
-    icon-height: 16;
+    icon-image: "presets/shop/hearing_aids.svg";
     set icon_z17;
 }
@@ -2100,6 +2073,5 @@
 }
 node[shop=kitchen] {
-    icon-image: "presets/shop/kitchen.png";
-    icon-width: 16;
+    icon-image: "presets/shop/kitchen.svg";
     set icon_z17;
 }
@@ -2109,6 +2081,5 @@
 }
 node[shop=mobile_phone] {
-    icon-image: "presets/shop/mobile_phone.png";
-    icon-width: 16;
+    icon-image: "presets/shop/mobile_phone.svg";
     set icon_z17;
 }
@@ -2118,6 +2089,5 @@
 }
 node[shop=musical_instrument] {
-    icon-image: "presets/shop/musical_instrument.png";
-    icon-height: 16;
+    icon-image: "presets/shop/musical_instrument.svg";
     set icon_z17;
 }
@@ -2135,6 +2105,5 @@
 }
 node[shop=paint] {
-    icon-image: "presets/shop/paint.png";
-    icon-width: 16;
+    icon-image: "presets/shop/paint.svg";
     set icon_z17;
 }
@@ -2144,6 +2113,5 @@
 }
 node[shop=seafood] {
-    icon-image: "presets/shop/groceries/seafood.png";
-    icon-width: 16;
+    icon-image: "presets/shop/groceries/seafood.svg";
     set icon_z17;
 }
@@ -2157,6 +2125,5 @@
 }
 node[shop=stationery] {
-    icon-image: "presets/shop/stationery.png";
-    icon-width: 16;
+    icon-image: "presets/shop/stationery.svg";
     set icon_z17;
 }
@@ -2166,6 +2133,5 @@
 }
 node[shop=travel_agency] {
-    icon-image: "presets/shop/travel.png";
-    icon-width: 16;
+    icon-image: "presets/shop/travel_agency.svg";
     set icon_z17;
 }
@@ -2175,15 +2141,13 @@
 }
 node[shop=vacuum_cleaner] {
-    icon-image: "presets/shop/vacuum_cleaner.png";
-    icon-height: 16;
+    icon-image: "presets/shop/vacuum_cleaner.svg";
     set icon_z17;
 }
 node[shop=variety_store] {
-    icon-image: "presets/shop/variety_store.png";
-    icon-width: 16;
+    icon-image: "presets/shop/variety_store.svg";
     set icon_z17;
 }
 node[shop=video] {
-    icon-image: "presets/shop/video.png";
+    icon-image: "presets/shop/video.svg";
     set icon_z17;
 }
@@ -2222,5 +2186,5 @@
 }
 node[shop=video_games] {
-    icon-image: "presets/shop/video_games.png";
+    icon-image: "presets/shop/video_games.svg";
     set icon_z17;
 }
@@ -2266,5 +2230,5 @@
 }
 node[shop=farm] {
-    icon-image: "presets/shop/groceries/apple.png";
+    icon-image: "presets/shop/groceries/farm.svg";
     set icon_z17;
 }
@@ -2345,19 +2309,17 @@
 }
 node[amenity=pub] {
-    icon-image: "presets/food/pub.png";
-    icon-height: 16;
+    icon-image: "presets/food/pub.svg";
     set icon_z17;
 }
 node[amenity=biergarten] {
-    icon-image: "presets/food/biergarten.png";
-    icon-width: 16;
+    icon-image: "presets/food/biergarten.svg";
     set icon_z17;
 }
 node[amenity=nightclub] {
-    icon-image: "presets/leisure/discoball.svg";
+    icon-image: "presets/leisure/nightclub.svg";
     set icon_z17;
 }
 node[amenity=stripclub] {
-    icon-image: "presets/leisure/nightclub.png";
+    icon-image: "presets/leisure/stripclub.svg";
     set icon_z17;
 }
@@ -2367,10 +2329,9 @@
 }
 node[amenity=brothel] {
-    icon-image: "presets/leisure/stripclub.png";
+    icon-image: "presets/leisure/brothel.svg";
     set icon_z17;
 }
 node[amenity=cafe] {
-    icon-image: "presets/food/cafe.png";
-    icon-width: 16;
+    icon-image: "presets/food/cafe.svg";
     set icon_z17;
 }
@@ -2380,10 +2341,9 @@
 }
 node[amenity=food_court] {
-    icon-image: "presets/food/food_court.png";
-    icon-width: 16;
+    icon-image: "presets/food/food_court.svg";
     set icon_z17;
 }
 node[amenity=fast_food] {
-    icon-image: "presets/food/fastfood.png";
+    icon-image: "presets/food/fast_food.svg";
     set icon_z17;
 }
@@ -2393,5 +2353,5 @@
 }
 node[amenity=ice_cream] {
-    icon-image: "presets/food/icecream.png";
+    icon-image: "presets/food/ice_cream.svg";
     set icon_z17;
 }
@@ -2482,5 +2442,5 @@
 }
 node[amenity=charging_station] {
-    icon-image: "presets/vehicle/charging_station.png";
+    icon-image: "presets/vehicle/charging_station.svg";
     set icon_z17;
 }
@@ -2539,15 +2499,13 @@
 }
 node[amenity=townhall] {
-    icon-image: "presets/service/townhall.png";
+    icon-image: "presets/service/townhall.svg";
     set icon_z17;
 }
 node[amenity=embassy] {
-    icon-image: "presets/service/embassy.png";
-    icon-width: 16;
+    icon-image: "presets/service/embassy.svg";
     set icon_z17;
 }
 node[amenity=community_centre] {
-    icon-image: "presets/service/community_centre.png";
-    icon-width: 16;
+    icon-image: "presets/service/community_centre.svg";
     set icon_z17;
 }
@@ -2557,5 +2515,5 @@
 }
 node[amenity=drinking_water] {
-    icon-image: "presets/food/drinking_water.png";
+    icon-image: "presets/food/drinking_water.svg";
     set icon_z17;
 }
@@ -2565,5 +2523,5 @@
 }
 node[amenity=fountain] {
-    icon-image: "presets/misc/fountain.png";
+    icon-image: "presets/misc/fountain.svg";
     set icon_z17;
 }
@@ -2645,26 +2603,25 @@
 }
 node[amenity=post_office] {
-    icon-image: "presets/service/post_office.png";
+    icon-image: "presets/service/post_office.svg";
     set icon_z17;
 }
 node[amenity=post_box] {
-    icon-image: "presets/service/post_box.png";
+    icon-image: "presets/service/post_box.svg";
     set icon_z17;
 }
 node[amenity=studio] {
-    icon-image: "presets/service/studio.png";
+    icon-image: "presets/service/studio.svg";
     set icon_z17;
 }
 node[amenity=school] {
-    icon-image: "presets/education/school.png";
-    icon-width: 16;
+    icon-image: "presets/education/school.svg";
     set icon_z17;
 }
 node[amenity=university] {
-    icon-image: "presets/education/university.png";
+    icon-image: "presets/education/university.svg";
     set icon_z17;
 }
 node[amenity=college] {
-    icon-image: "presets/education/college.png";
+    icon-image: "presets/education/college.svg";
     set icon_z17;
 }
@@ -2674,5 +2631,5 @@
 }
 node[amenity=driving_school] {
-    icon-image: "presets/education/driving_school.png";
+    icon-image: "presets/education/driving_school.svg";
     set icon_z17;
 }
@@ -2757,5 +2714,5 @@
 }
 node[amenity=library] {
-    icon-image: "presets/shop/library.png";
+    icon-image: "presets/education/library.svg";
     set icon_z17;
 }
@@ -2781,6 +2738,5 @@
 }
 node[amenity=theatre] {
-    icon-image: "presets/leisure/theater.png";
-    icon-width: 16;
+    icon-image: "presets/leisure/theater.svg";
     set icon_z17;
 }
@@ -2790,5 +2746,5 @@
 }
 node[amenity=arts_centre] {
-    icon-image: "presets/service/arts_centre.png";
+    icon-image: "presets/sightseeing/arts_centre.svg";
     set icon_z17;
 }
@@ -2818,10 +2774,9 @@
 }
 node[amenity=bench] {
-    icon-image: "presets/leisure/bench.png";
+    icon-image: "presets/leisure/bench.svg";
     set icon_z17;
 }
 node[amenity=bbq] {
-    icon-image: "presets/leisure/bbq.png";
-    icon-width: 16;
+    icon-image: "presets/leisure/bbq.svg";
     set icon_z17;
 }
@@ -2840,13 +2795,13 @@
 }
 node[amenity=shelter][shelter_type=public_transport] {
-    icon-image: "presets/accommodation/shelter_public_transport_brown.png";
+    icon-image: "presets/accommodation/shelter_public_transport.svg";
     set icon_z17;
 }
 node[amenity=shelter][shelter_type=picnic_shelter] {
-    icon-image: "presets/accommodation/shelter_picnic_brown.png";
+    icon-image: "presets/accommodation/shelter_picnic.svg";
     set icon_z17;
 }
 node[amenity=shelter][shelter_type=basic_hut] {
-    icon-image: "presets/accommodation/basic_hut_blue.png";
+    icon-image: "presets/accommodation/basic_hut.svg";
     set icon_z17;
 }
@@ -2856,9 +2811,9 @@
 }
 node[amenity=hunting_stand] {
-    icon-image: "presets/landmark/hunting_stand.png";
+    icon-image: "presets/landmark/hunting_stand.svg";
     set icon_z17;
 }
 node[amenity=marketplace] {
-    icon-image: "presets/shop/marketplace.png";
+    icon-image: "presets/shop/marketplace.svg";
     set icon_z17;
 }
@@ -2872,5 +2827,5 @@
 }
 node[vending=excrement_bags] {
-    icon-image: "presets/service/excrement_bags.png";
+    icon-image: "presets/service/excrement_bags.svg";
     set icon_z17;
 }
@@ -2930,5 +2885,5 @@
 }
 node[craft=plumber] {
-    icon-image: "presets/craft/plumber.png";
+    icon-image: "presets/craft/plumber.svg";
     set icon_z17;
 }
@@ -2950,5 +2905,5 @@
 }
 node[craft=painter] {
-    icon-image: "presets/craft/painter.png";
+    icon-image: "presets/craft/painter.svg";
     set icon_z17;
 }
@@ -2962,5 +2917,5 @@
 }
 node[craft=pottery] {
-    icon-image: "presets/craft/pottery.png";
+    icon-image: "presets/craft/pottery.svg";
     set icon_z17;
 }
@@ -2990,5 +2945,5 @@
 }
 node[craft=window_construction] {
-    icon-image: "presets/craft/window_construction.png";
+    icon-image: "presets/craft/window_construction.svg";
     set icon_z17;
 }
@@ -2998,5 +2953,5 @@
 }
 node[craft=tiler] {
-    icon-image: "presets/craft/tiler.png";
+    icon-image: "presets/craft/tiler.svg";
     set icon_z17;
 }
@@ -3038,9 +2993,9 @@
 }
 node[tourism=alpine_hut] {
-    icon-image: "presets/accommodation/alpine_hut_blue.png";
+    icon-image: "presets/accommodation/alpine_hut.svg";
     set icon_z17;
 }
 node[tourism=wilderness_hut] {
-    icon-image: "presets/accommodation/wilderness_hut_blue.png";
+    icon-image: "presets/accommodation/wilderness_hut.svg";
     set icon_z17;
 }
@@ -3062,5 +3017,5 @@
 }
 node[tourism=picnic_site] {
-    icon-image: "presets/leisure/picnic.png";
+    icon-image: "presets/leisure/picnic.svg";
     set icon_z17;
 }
@@ -3075,5 +3030,4 @@
 node[tourism=attraction] {
     icon-image: "presets/sightseeing/attraction.svg";
-    icon-width: 16;
     set icon_z17;
 }
@@ -3090,5 +3044,5 @@
 }
 node[tourism=artwork] {
-    icon-image: "presets/service/arts_centre.png";
+    icon-image: "presets/sightseeing/arts_centre.svg";
     set icon_z17;
 }
@@ -3183,5 +3137,5 @@
 }
 node[historic=boundary_stone] {
-    icon-image: "presets/misc/boundary_stone.png";
+    icon-image: "presets/landmark/boundary_stone.svg";
     set icon_z17;
 }
@@ -3332,5 +3286,5 @@
 }
 node[railway=halt] {
-    icon-image: "presets/transport/station16.png";
+    icon-image: "presets/transport/railway_halt.svg";
     set icon_z17;
 }
@@ -3340,5 +3294,5 @@
 }
 node[railway=subway_entrance] {
-    icon-image: "presets/transport/underground.png";
+    icon-image: "presets/transport/underground.svg";
     set icon_z17;
 }
@@ -3349,5 +3303,4 @@
 node[railway=level_crossing] {
     icon-image: "presets/transport/railway/level_crossing.svg";
-    icon-width: 16;
     set icon_z17;
 }
@@ -3477,5 +3430,4 @@
 node[railway=switch] {
     icon-image: "presets/transport/railway/switch.svg";
-    icon-width: 16;
     set icon_z17;
 }
@@ -3569,5 +3521,5 @@
 }
 node[aeroway=parking_position] {
-    icon-image: "presets/transport/airport/parking_position.png";
+    icon-image: "presets/transport/airport/parking_position.svg";
     set icon_z17;
 }
@@ -3665,9 +3617,9 @@
 
 node[highway=bus_stop] {
-    icon-image: "presets/transport/bus_small.png";
+    icon-image: "presets/transport/bus_small.svg";
     set icon_z17;
 }
 node[public_transport=stop_position] {
-    icon-image: "presets/transport/railway_small.png";
+    icon-image: "presets/transport/stop_position.svg";
     set icon_z17;
 }
@@ -3750,5 +3702,5 @@
 }
 node[sport="9pin"] {
-    icon-image: "presets/sport/10pin.svg";
+    icon-image: "presets/sport/9pin.svg";
     set icon_z17;
 }
@@ -3758,6 +3710,5 @@
 }
 node[sport=athletics] {
-    icon-image: "presets/sport/athletics.png";
-    icon-width: 16;
+    icon-image: "presets/sport/athletics.svg";
     set icon_z17;
 }
@@ -3811,5 +3762,5 @@
 }
 node[sport=chess] {
-    icon-image: "presets/sport/chess.png";
+    icon-image: "presets/sport/chess.svg";
     set icon_z17;
 }
@@ -3847,10 +3798,9 @@
 }
 node[sport=dog_racing] {
-    icon-image: "presets/leisure/dog.png";
+    icon-image: "presets/sport/dog_racing.svg";
     set icon_z17;
 }
 node[sport=equestrian] {
-    icon-image: "presets/leisure/equestrian.png";
-    icon-width: 16;
+    icon-image: "presets/sport/equestrian.svg";
     set icon_z17;
 }
@@ -3864,11 +3814,9 @@
 }
 node[sport=field_hockey] {
-    icon-image: "presets/sport/field_hockey.png";
-    icon-width: 16;
+    icon-image: "presets/sport/field_hockey.svg";
     set icon_z17;
 }
 node[sport=ice_hockey] {
-    icon-image: "presets/sport/ice_hockey.png";
-    icon-width: 16;
+    icon-image: "presets/sport/ice_hockey.svg";
     set icon_z17;
 }
@@ -3878,6 +3826,5 @@
 }
 node[sport=karting] {
-    icon-image: "presets/sport/karting.png";
-    icon-width: 16;
+    icon-image: "presets/sport/karting.svg";
     set icon_z17;
 }
@@ -3887,5 +3834,5 @@
 }
 node[sport=motor] {
-    icon-image: "presets/sport/motor.png";
+    icon-image: "presets/sport/motor.svg";
     set icon_z17;
 }
@@ -3903,6 +3850,5 @@
 }
 node[sport=pelota] {
-    icon-image: "presets/sport/pelota.png";
-    icon-width: 16;
+    icon-image: "presets/sport/pelota.svg";
     set icon_z17;
 }
@@ -3912,6 +3858,5 @@
 }
 node[sport=ice_skating] {
-    icon-image: "presets/sport/skating.png";
-    icon-width: 16;
+    icon-image: "presets/sport/ice_skating.svg";
     set icon_z17;
 }
@@ -3971,5 +3916,4 @@
 node[sport=shooting] {
     icon-image: "presets/sport/range.svg";
-    icon-width: 16;
     set icon_z17;
 }
@@ -3979,6 +3923,5 @@
 }
 node[sport=beachvolleyball] {
-    icon-image: "presets/sport/beachvolleyball.png";
-    icon-width: 16;
+    icon-image: "presets/sport/beachvolleyball.svg";
     set icon_z17;
 }
@@ -3988,5 +3931,5 @@
 }
 node[sport=bowling] {
-    icon-image: "presets/sport/10pin.svg";
+    icon-image: "presets/sport/9pin.svg";
     set icon_z17;
 }
@@ -4022,5 +3965,5 @@
 }
 node[sport=fishing] {
-    icon-image: "presets/sport/fishing.png";
+    icon-image: "presets/sport/fishing.svg";
     set icon_z17;
 }
@@ -4072,5 +4015,5 @@
 }
 way[natural=cliff] {
-    repeat-image: "presets/misc/cliff-pattern.png";
+    repeat-image: "presets/misc/cliff_pattern.svg";
     repeat-image-align: top;
     width: 1;
@@ -4170,5 +4113,5 @@
 }
 node[natural=cave_entrance] {
-    icon-image: "presets/landmark/cave_entrance.png";
+    icon-image: "presets/landmark/cave_entrance.svg";
     set icon_z17;
 }
@@ -4246,5 +4189,5 @@
 }
 node[waterway=dock] {
-    icon-image: "presets/nautical/boatyard.png";
+    icon-image: "presets/nautical/boatyard.svg";
     set icon_z17;
 }
@@ -4261,5 +4204,5 @@
 }
 node[waterway=boatyard] {
-    icon-image: "presets/nautical/boatyard.png";
+    icon-image: "presets/nautical/boatyard.svg";
     set icon_z17;
 }
@@ -4271,5 +4214,5 @@
 }
 node[mooring] {
-    icon-image: "presets/nautical/marina.png";
+    icon-image: "presets/nautical/marina.svg";
     set icon_z17;
 }
@@ -4278,6 +4221,5 @@
 }
 node[waterway=fuel] {
-    icon-image: "presets/nautical/marine_fuel.png";
-    icon-width: 16;
+    icon-image: "presets/nautical/marine_fuel.svg";
     set icon_z17;
 }
@@ -4544,37 +4486,37 @@
 node[place=region],
 node[place=county] {
-    icon-image: "presets/place/settlement/capital.png";
+    icon-image: "presets/place/capital.svg";
     z-index: 2.9;
 }
 node[place=city] {
-    icon-image: "presets/place/settlement/city.png";
+    icon-image: "presets/place/city.svg";
     z-index: 2.8;
 }
 node[place=town] {
-    icon-image: "presets/place/settlement/town.png";
+    icon-image: "presets/place/town.svg";
     z-index: 2.7;
 }
 node[place=suburb] {
-    icon-image: "presets/place/settlement/suburb.png";
+    icon-image: "presets/place/suburb.svg";
     z-index: 2.6;
 }
 node[place=village] {
-    icon-image: "presets/place/settlement/village.png";
+    icon-image: "presets/place/village.svg";
     z-index: 2.5;
 }
 node[place=neighbourhood] {
-    icon-image: "presets/place/settlement/neighbourhood.png";
+    icon-image: "presets/place/neighbourhood.svg";
     z-index: 2.4;
 }
 node[place=hamlet] {
-    icon-image: "presets/place/settlement/hamlet.png";
+    icon-image: "presets/place/hamlet.svg";
     z-index: 2.3;
 }
 node[place=isolated_dwelling] {
-    icon-image: "presets/place/settlement/isolated_dwelling.png";
+    icon-image: "presets/place/isolated_dwelling.svg";
     z-index: 2.2;
 }
 node[place=farm] {
-    icon-image: "presets/place/settlement/farm.png";
+    icon-image: "presets/place/farm.svg";
     z-index: 2.1;
 }
@@ -4603,10 +4545,10 @@
 node|z-15[FIXME][!setting("hide_icons")]::core_note_fixme {
     object-z-index: 10;
-    icon-image: "presets/misc/fixme-annotation.png";
+    icon-image: "presets/misc/fixme_annotation.svg";
 }
 node|z16-[note]::core_note_fixme,
 node|z-15[note][!setting("hide_icons")]::core_note_fixme {
     object-z-index: 10;
-    icon-image: "presets/misc/note-annotation.png";
+    icon-image: "presets/misc/note_annotation.svg";
 }
 node|z16-[note][fixme]::core_note_fixme,
@@ -4614,5 +4556,5 @@
 node|z16-[note][FIXME]::core_note_fixme,
 node|z-15[note][FIXME][!setting("hide_icons")]::core_note_fixme {
-    icon-image: "presets/misc/note-fixme-annotation.png";
+    icon-image: "presets/misc/note_fixme_annotation.svg";
 }