Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8591)
+++ trunk/data/defaultpresets.xml	(revision 8592)
@@ -3197,5 +3197,5 @@
   <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">
+        <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"
@@ -3218,5 +3218,5 @@
             <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"
@@ -3277,5 +3277,5 @@
             <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"
@@ -3887,5 +3887,5 @@
     </group> <!-- Leisure -->
     <group name="Culture" icon="presets/theater.png">
-        <item name="Museum" icon="styles/standard/sightseeing/museum.png" type="node,closedway" preset_name_label="true">
+        <item name="Museum" icon="styles/standard/sightseeing/museum.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=museum"
@@ -4187,5 +4187,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Embassy -->
-        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Courthouse" icon="styles/standard/service/administration/courthouse.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
@@ -4199,5 +4199,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Courthouse -->
-        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Prison" icon="styles/standard/service/administration/prison.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
@@ -4582,5 +4582,5 @@
             -->
         </item> <!-- Automated Defibrillator -->
-        <item name="Clock" icon="styles/standard/service/clock.png" type="node" preset_name_label="true">
+        <item name="Clock" icon="styles/standard/service/clock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -5548,5 +5548,5 @@
         </item> <!-- Embankment -->
         <separator/>
-        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.png" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_tower"
@@ -6315,6 +6315,6 @@
   </group> <!-- Man Made -->
   <group name="Shops" icon="styles/standard/shop/mall.png">
-    <group name="Food" icon="styles/standard/shop/supermarket.png">
-        <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway" preset_name_label="true">
+    <group name="Food" icon="styles/standard/shop/supermarket.svg">
+        <item name="Supermarket" icon="styles/standard/shop/supermarket.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=supermarket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
@@ -6906,5 +6906,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->
-        <item name="Newspaper Stand" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
+        <item name="Newspaper Stand" icon="styles/standard/shop/news.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 8591)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 8592)
@@ -1435,5 +1435,5 @@
 }
 node[man_made=water_tower] {
-    icon-image: "misc/landmark/water_tower.png";
+    icon-image: "misc/landmark/water_tower.svg";
     set icon_z17;
     text: auto;
@@ -1750,5 +1750,5 @@
 }
 node[shop=supermarket] {
-    icon-image: "shop/supermarket.png";
+    icon-image: "shop/supermarket.svg";
     set icon_z17;
     text: auto;
@@ -1972,5 +1972,5 @@
 }
 node[shop=newsagent] {
-    icon-image: "shop/kiosk.png";
+    icon-image: "shop/news.svg";
     set icon_z17;
     text: auto;
@@ -2342,5 +2342,5 @@
 }
 node[amenity=clock] {
-    icon-image: "service/clock.png";
+    icon-image: "service/clock.svg";
     set icon_z17;
     text: auto;
@@ -2689,10 +2689,10 @@
 }
 node[amenity=courthouse] {
-    icon-image: "service/administration/court_of_law.png";
+    icon-image: "service/administration/courthouse.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=prison] {
-    icon-image: "service/administration/prison.png";
+    icon-image: "service/administration/prison.svg";
     set icon_z17;
     text: auto;
@@ -2845,10 +2845,10 @@
 }
 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;
@@ -2860,5 +2860,5 @@
 }
 node[tourism=hostel] {
-    icon-image: "accommodation/hostel.png";
+    icon-image: "accommodation/hostel.svg";
     set icon_z17;
     text: auto;
@@ -2933,5 +2933,5 @@
 }
 node[tourism=museum] {
-    icon-image: "sightseeing/museum.png";
+    icon-image: "sightseeing/museum.svg";
     set icon_z17;
     text: auto;