Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9152)
+++ trunk/data/defaultpresets.xml	(revision 9153)
@@ -378,7 +378,7 @@
   </chunk>
   <!--  Groups -->
-  <group name="Highways" icon="presets/way_secondary.png">
-    <group name="Streets" icon="presets/way_secondary.png">
-        <item name="Motorway" icon="presets/motorway.png" type="way" preset_name_label="true">
+  <group name="Highways" icon="styles/standard/transport/way/way_secondary.svg">
+    <group name="Streets" icon="styles/standard/transport/way/way_secondary.svg">
+        <item name="Motorway" icon="styles/standard/transport/way/way_motorway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway"
@@ -415,5 +415,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Motorway -->
-        <item name="Motorway Link" icon="presets/motorway.png" type="way" preset_name_label="true">
+        <item name="Motorway Link" icon="styles/standard/transport/way/way_motorway_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link"
@@ -442,5 +442,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Motorway Link -->
-        <item name="Trunk" icon="presets/trunk.png" type="way" preset_name_label="true">
+        <item name="Trunk" icon="styles/standard/transport/way/way_trunk.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk"
@@ -477,5 +477,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Trunk -->
-        <item name="Trunk Link" icon="presets/trunk.png" type="way" preset_name_label="true">
+        <item name="Trunk Link" icon="styles/standard/transport/way/way_trunk_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Highway_link" />
@@ -501,5 +501,5 @@
         </item> <!-- Trunk Link -->
         <separator/>
-        <item name="Primary" icon="presets/way_primary.png" type="way,closedway" preset_name_label="true">
+        <item name="Primary" icon="styles/standard/transport/way/way_primary.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary"
@@ -526,5 +526,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary -->
-        <item name="Primary Link" icon="presets/way_primary.png" type="way" preset_name_label="true">
+        <item name="Primary Link" icon="styles/standard/transport/way/way_primary_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -543,5 +543,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary Link -->
-        <item name="Secondary" icon="presets/way_secondary.png" type="way,closedway" preset_name_label="true">
+        <item name="Secondary" icon="styles/standard/transport/way/way_secondary.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
@@ -568,5 +568,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary -->
-        <item name="Secondary Link" icon="presets/way_secondary.png" type="way" preset_name_label="true">
+        <item name="Secondary Link" icon="styles/standard/transport/way/way_secondary_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -584,5 +584,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary Link -->
-        <item name="Tertiary" icon="presets/way_tertiary.png" type="way,closedway" preset_name_label="true">
+        <item name="Tertiary" icon="styles/standard/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=tertiary"
@@ -610,5 +610,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Tertiary -->
-        <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way" preset_name_label="true">
+        <item name="Tertiary Link" icon="styles/standard/transport/way/way_tertiary_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -625,5 +625,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Tertiary Link -->
-        <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
+        <item name="Unclassified" icon="styles/standard/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
@@ -649,5 +649,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Unclassified -->
-        <item name="Residential" icon="presets/residential.png" type="way,closedway" preset_name_label="true">
+        <item name="Residential" icon="styles/standard/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential"
@@ -674,5 +674,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Residential -->
-        <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way" preset_name_label="true">
+        <item name="Bicycle Road" icon="styles/standard/transport/way/way_bicycle_road.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road"
@@ -698,5 +698,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Bicycle Road -->
-        <item name="Living Street" icon="presets/living_street.png" type="way,closedway" preset_name_label="true">
+        <item name="Living Street" icon="styles/standard/transport/way/way_living_street.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street"
@@ -718,5 +718,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Living Street -->
-        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation" preset_name_label="true">
+        <item name="Pedestrian" icon="styles/standard/transport/way/way_pedestrian.svg" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian"
@@ -742,5 +742,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Pedestrian -->
-        <item name="Service" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
+        <item name="Service" icon="styles/standard/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service"
@@ -765,5 +765,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Service -->
-        <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
+        <item name="Parking Aisle" icon="styles/standard/transport/way/way_service_parking_aisle.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
@@ -783,5 +783,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Parking Aisle -->
-        <item name="Escape" icon="presets/way_unclassified.png" type="way" preset_name_label="true">
+        <item name="Escape" icon="styles/standard/transport/way/way_escape.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=escape"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=escape"
@@ -809,5 +809,5 @@
             <text key="name" text="Name" />
         </item> <!-- Raceway -->
-        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
+        <item name="Road (Unknown Type)" icon="styles/standard/transport/way/way_road.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=road"
@@ -827,5 +827,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Road (Unknown Type) -->
-        <item name="Construction" icon="presets/construction.png" type="way,closedway" preset_name_label="true">
+        <item name="Construction" icon="styles/standard/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
@@ -847,5 +847,5 @@
         </item> <!-- Construction -->
         <separator/>
-        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Road Restrictions" icon="styles/standard/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:access"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:access"
@@ -900,5 +900,5 @@
         </item> <!-- Road Restrictions -->
         <separator/>
-        <item name="Roundabout" icon="presets/roundabout.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Roundabout" icon="styles/standard/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
@@ -938,5 +938,5 @@
         </item> <!-- Ford -->
     </group> <!-- Streets -->
-    <group name="Ways" icon="presets/way_unclassified.png">
+    <group name="Ways" icon="styles/standard/transport/way/way_unclassified.svg">
         <item name="Track" icon="presets/track1.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9152)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9153)
@@ -692,5 +692,5 @@
 }
 node:righthandtraffic[highway=mini_roundabout] {
-    icon-image: "vehicle/restriction/roundabout_right.png";
+    icon-image: "vehicle/restriction/mini_roundabout_right.svg";
     set icon_z17;
 }
@@ -919,5 +919,5 @@
 }
 node:righthandtraffic[junction=roundabout] {
-    icon-image: "vehicle/restriction/roundabout_right.png";
+    icon-image: "vehicle/restriction/roundabout_right.svg";
     set icon_z17;
 }