Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 8388)
+++ data/defaultpresets.xml	(working copy)
@@ -3149,8 +3149,8 @@
     </group> <!-- Airport -->
   </group> <!-- Transport -->
   <group name="Facilities" icon="presets/bed.png">
-    <group name="Accommodation" icon="presets/bed.png">
-        <item name="Hotel" icon="styles/standard/accommodation.png" type="node,closedway" preset_name_label="true">
+    <group name="Accommodation" icon="styles/standard/accommodation/hotel.svg">
+        <item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel"
@@ -3169,7 +3169,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hotel -->
-        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
+        <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
@@ -3222,7 +3222,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chalet -->
-        <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
+        <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hostel"
@@ -3240,7 +3240,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hostel -->
-        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
+        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=alpine_hut"
@@ -3257,7 +3257,7 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Alpine Hut -->
         <separator/>
-        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway" preset_name_label="true">
+        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=caravan_site"
@@ -3279,7 +3279,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Caravan Site/RV Park -->
-        <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
+        <item name="Camping Site" icon="styles/standard/accommodation/camping.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=camp_site"
@@ -3300,8 +3300,8 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Camping Site -->
     </group> <!-- Accommodation -->
-    <group name="Food+Drinks" icon="presets/restaurant.png">
-        <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
+    <group name="Food+Drinks" icon="styles/standard/food/restaurant.svg">
+        <item name="Restaurant" icon="styles/standard/food/restaurant.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=restaurant"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=restaurant"
@@ -3323,7 +3323,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Restaurant -->
-        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
+        <item name="Fast Food" icon="styles/standard/food/fast_food.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fast_food"
@@ -3341,7 +3341,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Fast Food -->
-        <item name="Food Court" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
+        <item name="Food Court" icon="styles/standard/food/restaurant.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=food_court"
@@ -3356,7 +3356,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Food Court -->
-        <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
+        <item name="Cafe" icon="styles/standard/food/cafe.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
                   et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=cafe"
@@ -3378,7 +3378,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Cafe -->
-        <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
+        <item name="Pub" icon="styles/standard/food/pub.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=pub"
@@ -3396,7 +3396,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pub -->
-        <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
+        <item name="Beer Garden" icon="styles/standard/food/biergarten.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=biergarten"
@@ -3412,7 +3412,7 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beer Garden -->
-        <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway" preset_name_label="true">
+        <item name="Bar" icon="styles/standard/food/bar.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=bar"
Index: styles/standard/elemstyles.mapcss
===================================================================
--- styles/standard/elemstyles.mapcss	(revision 8388)
+++ styles/standard/elemstyles.mapcss	(working copy)
@@ -2161,12 +2161,12 @@
     fill-color: amenity#ecba52;
 }
 node[amenity=pub] {
-    icon-image: "food/pub.png";
+    icon-image: "food/pub.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=biergarten] {
-    icon-image: "food/biergarten.png";
+    icon-image: "food/biergarten.svg";
     set icon_z17;
     text: auto;
 }
@@ -2186,23 +2186,23 @@
     text: auto;
 }
 node[amenity=cafe] {
-    icon-image: "food/cafe.png";
+    icon-image: "food/cafe.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=restaurant],
 node[amenity=food_court] {
-    icon-image: "food/restaurant.png";
+    icon-image: "food/restaurant.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=fast_food] {
-    icon-image: "food/fastfood.png";
+    icon-image: "food/fast_food.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=bar] {
-    icon-image: "food/bar.png";
+    icon-image: "food/bar.svg";
     set icon_z17;
     text: auto;
 }
@@ -2823,12 +2823,12 @@
     fill-color: hotel#e1a0a2;
 }
 node[tourism=hotel] {
-    icon-image: "accommodation.png";
+    icon-image: "accommodation/hotel.svg";
     set icon_z17;
     text: auto;
 }
 node[tourism=motel] {
-    icon-image: "accommodation/motel.png";
+    icon-image: "accommodation/motel.svg";
     set icon_z17;
     text: auto;
 }
@@ -2838,7 +2838,7 @@
     text: auto;
 }
 node[tourism=hostel] {
-    icon-image: "accommodation/hostel.png";
+    icon-image: "accommodation/hostel.svg";
     set icon_z17;
     text: auto;
 }
@@ -2848,7 +2848,7 @@
     text: auto;
 }
 node[tourism=alpine_hut] {
-    icon-image: "accommodation/alpine_hut_blue.png";
+    icon-image: "accommodation/alpine_hut.png";
     set icon_z17;
     text: auto;
 }
@@ -2858,12 +2858,12 @@
     text: auto;
 }
 node[tourism=camp_site] {
-    icon-image: "accommodation/camping.png";
+    icon-image: "accommodation/camping.svg";
     set icon_z17;
     text: auto;
 }
 node[tourism=caravan_site] {
-    icon-image: "accommodation/camping/caravan.png";
+    icon-image: "accommodation/camping/caravan.svg";
     set icon_z17;
     text: auto;
 }