Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 8561)
+++ 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;