Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9149)
+++ trunk/data/defaultpresets.xml	(revision 9150)
@@ -1716,6 +1716,6 @@
         </item> <!-- Sally Port -->
     </group> <!-- Barriers -->
-    <group name="Passageways" icon="presets/tunnel.png">
-        <item name="Tunnel" icon="presets/tunnel.png" type="way" preset_name_label="true">
+    <group name="Passageways" icon="styles/standard/transport/passage/tunnel.svg">
+        <item name="Tunnel" icon="styles/standard/transport/passage/tunnel.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:tunnel"
@@ -1744,5 +1744,5 @@
             </optional>
         </item> <!-- Tunnel -->
-        <item name="Building Passage" icon="presets/tunnel.png" type="way" preset_name_label="true">
+        <item name="Building Passage" icon="styles/standard/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1763,5 +1763,5 @@
             </optional>
         </item> <!-- Building Passage -->
-        <item name="Arcade" type="way" preset_name_label="true">
+        <item name="Arcade" icon="styles/standard/transport/passage/arcade.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:covered"
@@ -1782,5 +1782,5 @@
             </optional>
         </item> <!-- Arcade -->
-        <item name="Colonnade" type="way" preset_name_label="true">
+        <item name="Colonnade" icon="styles/standard/transport/passage/colonnade.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
@@ -1799,5 +1799,5 @@
             </optional>
         </item> <!-- Colonnade -->
-        <item name="Avalanche Protector" type="way" preset_name_label="true">
+        <item name="Avalanche Protector" icon="styles/standard/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1821,7 +1821,7 @@
     </group> <!-- Passageways -->
   </group> <!-- Highways -->
-  <group name="Water" name_context="main group" icon="presets/waterway.png">
-    <group name="Water" name_context="sub group" icon="presets/waterway.png">
-        <item name="Drain" icon="presets/waterway.png" type="way" preset_name_label="true">
+  <group name="Water" name_context="main group" icon="styles/standard/nautical/waterway_river.svg">
+    <group name="Water" name_context="sub group" icon="styles/standard/nautical/waterway_river.svg">
+        <item name="Drain" icon="styles/standard/nautical/waterway_drain.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=drain"
@@ -1838,5 +1838,5 @@
             </optional>
         </item> <!-- Drain -->
-        <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
+        <item name="Ditch" icon="styles/standard/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=ditch"
@@ -1852,5 +1852,5 @@
             </optional>
         </item> <!-- Ditch -->
-        <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
+        <item name="Stream" icon="styles/standard/nautical/waterway_stream.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=stream"
@@ -1871,5 +1871,5 @@
             <reference ref="water_access" />
         </item> <!-- Stream -->
-        <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
+        <item name="River" icon="styles/standard/nautical/waterway_river.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=river"
@@ -1889,5 +1889,5 @@
             <reference ref="water_access" />
         </item> <!-- River -->
-        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
+        <item name="Canal" icon="styles/standard/nautical/waterway_canal.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=canal"
@@ -1959,5 +1959,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Dam -->
-        <item name="Groyne" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
+        <item name="Groyne" icon="styles/standard/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=groyne"
@@ -1967,5 +1967,5 @@
             <key key="man_made" value="groyne" />
         </item> <!-- Groyne -->
-        <item name="Breakwater" icon="presets/breakwater.png" type="way,closedway" preset_name_label="true">
+        <item name="Breakwater" icon="styles/standard/nautical/breakwater.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=breakwater"
@@ -1980,5 +1980,5 @@
         </item> <!-- Breakwater -->
         <separator/>
-        <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
+        <item name="Culvert" icon="styles/standard/transport/passage/tunnel_culvert.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tunnel=culvert"
@@ -2053,5 +2053,5 @@
             <reference ref="water_access" />
         </item> <!-- Water -->
-        <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
+        <item name="Coastline" icon="styles/standard/nautical/coast_line.svg" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=coastline"
@@ -2067,5 +2067,5 @@
             <text key="name" text="Name" />
         </item> <!-- Coastline -->
-        <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
+        <item name="Riverbank" icon="styles/standard/nautical/waterway_riverbank.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=riverbank"
@@ -2086,5 +2086,5 @@
         </item> <!-- Riverbank -->
         <separator/>
-        <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
+        <item name="Wetland" icon="styles/standard/misc/landuse/wetland.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
@@ -2104,5 +2104,5 @@
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
         </item> <!-- Wetland -->
-        <item name="Mud" icon="presets/mud.png" type="closedway,relation" preset_name_label="true">
+        <item name="Mud" icon="styles/standard/misc/landuse/mud.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
@@ -2115,5 +2115,5 @@
             <text key="name" text="Name" />
         </item> <!-- Mud -->
-        <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
+        <item name="Beach" icon="styles/standard/nautical/beach.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=beach"
@@ -2135,5 +2135,5 @@
             </optional>
         </item> <!-- Beach -->
-        <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Bay" icon="styles/standard/nautical/bay.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bay"
@@ -2148,5 +2148,5 @@
             <text key="name" text="Name" />
         </item> <!-- Bay -->
-        <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Cliff" icon="styles/standard/misc/cliff.svg" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cliff"
@@ -2230,5 +2230,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Marine Fuel -->
-        <item name="Pier" icon="presets/pier.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Pier" icon="styles/standard/nautical/pier.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pier"
@@ -5744,5 +5744,5 @@
             <check key="disused" text="Disused" />
         </item> <!-- Adit -->
-        <item name="Embankment" icon="presets/cliff.png" type="way" preset_name_label="true">
+        <item name="Embankment" icon="styles/standard/misc/cliff.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=embankment"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=embankment"
@@ -5980,6 +5980,6 @@
         </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
-    <group name="Bridges" icon="presets/bridge.png">
-        <item name="Bridge" icon="presets/bridge.png" type="way,relation" preset_name_label="true">
+    <group name="Bridges" icon="styles/standard/transport/bridge/bridge.svg">
+        <item name="Bridge" icon="styles/standard/transport/bridge/bridge.svg" type="way,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:bridge"
@@ -5999,5 +5999,5 @@
             <reference ref="optional_bridge" />
         </item> <!-- Bridge -->
-        <item name="Movable Bridge" icon="presets/bridge_movable.png" type="way,relation" preset_name_label="true">
+        <item name="Movable Bridge" icon="styles/standard/transport/bridge/bridge_movable.svg" type="way,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge:movable"
@@ -6008,10 +6008,10 @@
             <reference ref="optional_bridge" />
         </item> <!-- Movable Bridge -->
-        <item name="Bridge Support" icon="styles/standard/transport/bridge/support.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bridge Support" icon="styles/standard/transport/bridge/bridge_support.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" />
             <space />
             <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" />
         </item> <!-- Bridge Support -->
-        <item name="Bridge outline" icon="presets/bridge.png" type="closedway" preset_name_label="true">
+        <item name="Bridge outline" icon="styles/standard/transport/bridge/bridge_outline.svg" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bridge"
@@ -7623,5 +7623,5 @@
     </item> <!-- Payment Methods -->
   </group> <!-- Shops -->
-  <group name="Offices" icon="icons/office_blue.png">
+  <group name="Offices" icon="styles/standard/office/private_company.svg">
     <item name="Accountant" icon="styles/standard/office/accountant.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=accountant"
@@ -9338,5 +9338,5 @@
         </item> <!-- Destination Sign -->
         <separator/>
-        <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
+        <item name="Waterway" icon="styles/standard/nautical/waterway_river.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:waterway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:waterway"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9149)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9150)
@@ -802,5 +802,5 @@
 }
 node[highway=ford], node[ford?] {
-    icon-image: "misc/ford.svg";
+    icon-image: "nautical/ford.svg";
     set icon_z17;
     text: auto;
@@ -1300,5 +1300,5 @@
 }
 node[bridge:support] {
-    icon-image: "transport/bridge/support.svg";
+    icon-image: "transport/bridge/bridge_support.svg";
     set icon_z17;
     text: auto;
@@ -1378,5 +1378,5 @@
 }
 node[man_made=pier] {
-    icon-image: "nautical/pier.png";
+    icon-image: "nautical/pier.svg";
     set icon_z17;
     text: auto;
@@ -4132,5 +4132,5 @@
 }
 node[natural=cliff] {
-    icon-image: "misc/cliff.png";
+    icon-image: "misc/cliff.svg";
     set icon_z17;
     text: auto;
@@ -4212,5 +4212,5 @@
 }
 node[natural=bay] {
-    icon-image: "misc/bay.png";
+    icon-image: "nautical/bay.svg";
     set icon_z17;
     text: auto;