Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9505)
+++ /trunk/data/defaultpresets.xml	(revision 9506)
@@ -1170,5 +1170,5 @@
         </item> <!-- Steps -->
     </group> <!-- Ways -->
-    <group name="Waypoints" icon="presets/waypoints.png">
+    <group name="Waypoints" icon="styles/standard/vehicle/waypoints.svg">
         <item name="Motorway Junction" icon="styles/standard/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction"
@@ -1185,5 +1185,5 @@
             <text key="exit_to" text="Exit to" />
         </item> <!-- Motorway Junction -->
-        <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Services" icon="styles/standard/vehicle/services.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=services"
@@ -1200,5 +1200,5 @@
             </optional>
         </item> <!-- Services -->
-        <item name="Rest Area" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
+        <item name="Rest Area" icon="styles/standard/vehicle/rest_area.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=rest_area"
@@ -1240,5 +1240,5 @@
             </optional>
             </item> <!-- Traffic Signal -->
-        <item name="Stop" icon="presets/Stop.png" type="node" preset_name_label="true">
+        <item name="Stop" icon="styles/standard/vehicle/restriction/stop.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=stop"
@@ -1249,5 +1249,5 @@
             <key key="highway" value="stop" />
         </item> <!-- Stop -->
-        <item name="Give Way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
+        <item name="Give Way" icon="styles/standard/vehicle/restriction/give_way.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=give_way"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=give_way"
@@ -1292,5 +1292,5 @@
             <check key="traffic_signals:sound" text="Sound signals" />
         </item> <!-- Pedestrian Crossing -->
-        <item name="Traffic Calming" icon="styles/standard/vehicle/traffic_calming_blue.png" type="node,way" preset_name_label="true">
+        <item name="Traffic Calming" icon="styles/standard/vehicle/choker.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1306,7 +1306,17 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
             <space />
-            <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" values_searchable="true" />
+            <combo key="traffic_calming" text="Type" match="key" values_searchable="true">
+                <list_entry value="yes" display_value="yes - choose a specific value instead if possible" icon="styles/standard/vehicle/traffic_calming.svg" />
+                <list_entry value="bump" icon="styles/standard/vehicle/bump.svg" />
+                <list_entry value="chicane" icon="styles/standard/vehicle/chicane.svg" />
+                <list_entry value="choker" icon="styles/standard/vehicle/choker.svg" />
+                <list_entry value="cushion" icon="styles/standard/vehicle/cushion.svg" />
+                <list_entry value="hump" icon="styles/standard/vehicle/hump.svg" />
+                <list_entry value="island" icon="styles/standard/vehicle/island.svg" />
+                <list_entry value="rumble_strip" icon="styles/standard/vehicle/rumble_strip.svg" />
+                <list_entry value="table" icon="styles/standard/vehicle/table.svg" />
+            </combo>
         </item> <!-- Traffic Calming -->
-        <item name="Passing Place" icon="presets/passingplace.png" type="node" preset_name_label="true">
+        <item name="Passing Place" icon="styles/standard/vehicle/passing_place.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=passing_place"
@@ -1315,5 +1325,5 @@
             <key key="highway" value="passing_place" />
         </item> <!-- Passing Place -->
-        <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.png" type="node" preset_name_label="true">
+        <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
@@ -1325,5 +1335,5 @@
             <key key="highway" value="turning_circle" />
         </item> <!-- Turning Circle -->
-        <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.png" type="node" preset_name_label="true">
+        <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_loop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop"
@@ -1331,5 +1341,5 @@
             <key key="highway" value="turning_loop" />
         </item> <!-- Turning Loop -->
-        <item name="City Limit Sign" icon="presets/citylimit.png" type="node" preset_name_label="true">
+        <item name="City Limit Sign" icon="styles/standard/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1344,5 +1354,5 @@
             <text key="alt_name" text="Second Name" />
         </item> <!-- City Limit -->
-        <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/speed.png" type="node" preset_name_label="true">
+        <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/maxspeed.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1356,5 +1366,5 @@
             <text key="maxspeed" text="Max. speed (km/h)" />
         </item> <!-- Speed Limit -->
-        <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
+        <item name="Speed Camera" icon="styles/standard/vehicle/restriction/speed_camera.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
                   az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
@@ -1384,5 +1394,5 @@
             <text key="ref" text="Reference" />
         </item> <!-- Highway Milestone -->
-        <item name="Named Junction" name_context="junction=yes" type="node,closedway" preset_name_label="true">
+        <item name="Named Junction" name_context="junction=yes" icon="styles/standard/vehicle/junction.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=yes"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:junction=yes" />
@@ -1392,5 +1402,5 @@
         </item> <!-- Named Junction -->
         <separator/>
-        <item name="Elevator" icon="styles/standard/service/elevator.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Elevator" icon="styles/standard/service/elevator.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=elevator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=elevator"
@@ -1401,5 +1411,5 @@
         </item> <!-- Elevator -->
         <separator/>
-        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node" preset_name_label="true">
+        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grit_bin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grit_bin"
@@ -1409,5 +1419,5 @@
         </item> <!-- Grit Bin -->
         <separator/>
-        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node" preset_name_label="true">
+        <item name="Mountain Pass" icon="styles/standard/misc/landmark/mountain_pass.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:mountain_pass"
@@ -1926,5 +1936,5 @@
         </item> <!-- Canal -->
         <separator/>
-        <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
+        <item name="Spring" icon="styles/standard/misc/landmark/spring.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=spring"
@@ -1941,5 +1951,5 @@
             <check key="drinking_water" text="Drinking Water" />
         </item> <!-- Spring -->
-        <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
+        <item name="Waterfall" icon="styles/standard/nautical/waterfall.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=waterfall"
@@ -1951,5 +1961,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Waterfall -->
-        <item name="Weir" icon="presets/weir.png" type="node,way" preset_name_label="true">
+        <item name="Weir" icon="styles/standard/nautical/weir.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=weir"
@@ -1964,5 +1974,5 @@
             <text key="name" text="Name" />
         </item> <!-- Weir -->
-        <item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Dam" icon="styles/standard/nautical/dam.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dam"
@@ -2049,5 +2059,5 @@
         </item> <!-- Covered Reservoir -->
         <separator/>
-        <item name="Water" name_context="natural" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
+        <item name="Water" name_context="natural" icon="styles/standard/nautical/water.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 9505)
+++ /trunk/data/validator/deprecated.mapcss	(revision 9506)
@@ -342,4 +342,5 @@
 
 /* see #10661, #10837, #11737 */
+*[traffic_calming=yes],
 *[access=restricted],
 *[barrier=yes],
Index: /trunk/images_nodist/presets/chicane.svg
===================================================================
--- /trunk/images_nodist/presets/chicane.svg	(revision 9506)
+++ /trunk/images_nodist/presets/chicane.svg	(revision 9506)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="01.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="0.13600065"
+     inkscape:cy="6.8852811"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-355px"
+       originy="-535px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-355,-501.36218)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect2991"
+       width="10"
+       height="16"
+       x="358"
+       y="501.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3808"
+       width="1"
+       height="2"
+       x="361"
+       y="515.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3810"
+       width="1"
+       height="2"
+       x="361"
+       y="512.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3812"
+       width="1"
+       height="2"
+       x="552.17462"
+       y="292.87277"
+       transform="matrix(0.89384905,0.44836801,-0.44836801,0.89384905,0,0)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3816"
+       width="1"
+       height="2"
+       x="364"
+       y="504.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3818"
+       width="1"
+       height="2"
+       x="364"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3901"
+       width="3"
+       height="16"
+       x="355"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3903"
+       width="3"
+       height="16"
+       x="368"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3901-1"
+       width="3.0277281"
+       height="4"
+       x="357.97226"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3901-1-6"
+       width="3"
+       height="4"
+       x="365"
+       y="513.36218" />
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       d="m 361,505.36218 c -3,6 -3,6 -3,6 l 0,-6 z"
+       id="path4036"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       d="m 365,513.36218 c 3,-6 3,-6 3,-6 l 0,6 z"
+       id="path4036-8"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3812-6"
+       width="1"
+       height="2"
+       x="552.31073"
+       y="290.07751"
+       transform="matrix(0.89384905,0.44836801,-0.44836801,0.89384905,0,0)" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/chocker.svg
===================================================================
--- /trunk/images_nodist/presets/chocker.svg	(revision 9506)
+++ /trunk/images_nodist/presets/chocker.svg	(revision 9506)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="02.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-4.52401"
+     inkscape:cy="17.24102"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-375px"
+       originy="-535px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-375,-501.36218)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect2991-0"
+       width="9"
+       height="16"
+       x="378"
+       y="501.36218" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none"
+       id="path2993-9"
+       sodipodi:cx="360"
+       sodipodi:cy="506.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 362,506.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.25,0,0,1.75,-72.5,-376.77164)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none"
+       id="path2993-1-4"
+       sodipodi:cx="360"
+       sodipodi:cy="506.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 362,506.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.5,0,0,1.75,-152,-376.77164)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3808-8"
+       width="1"
+       height="2"
+       x="382"
+       y="515.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3810-8"
+       width="1"
+       height="2"
+       x="382"
+       y="512.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3814-4"
+       width="1"
+       height="2"
+       x="382"
+       y="506.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3816-5"
+       width="1"
+       height="2"
+       x="382"
+       y="503.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3818-5"
+       width="1"
+       height="1"
+       x="382"
+       y="501.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3810-8-1"
+       width="1"
+       height="2"
+       x="382"
+       y="509.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3905"
+       width="3"
+       height="16"
+       x="375"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3907"
+       width="4"
+       height="16"
+       x="387"
+       y="501.36218" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/crossing.svg
===================================================================
--- /trunk/images_nodist/presets/crossing.svg	(revision 9506)
+++ /trunk/images_nodist/presets/crossing.svg	(revision 9506)
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__crossing.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="10.844551"
+     inkscape:cy="7.1297948"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#004aff;fill-opacity:1;stroke:none;stroke-width:1.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4343"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       rx="2"
+       ry="2" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       d="m 5.762084,1051.1878 -1.9620495,0.014 1.0978265,-3.1723 1.456386,0 -0.592163,3.1548 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path4212"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5663-9"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 8.603631,1037.6807 c 0,0.4867 -0.3945114,0.8812 -0.8811649,0.8812 -0.4866538,0 -0.8811649,-0.3945 -0.8811649,-0.8812 0,-0.4866 0.3945111,-0.8811 0.8811649,-0.8811 0.4866535,0 0.8811649,0.3945 0.8811649,0.8811 l 0,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5645-0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 0.70781155,1051.182 1.94606705,0 1.3829417,-3.1296 -1.4642127,0 -1.86479605,3.1296 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5649-7"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 7.014089,1051.182 1.9789292,0 -0.2979935,-3.1367 -1.4086978,0 -0.2722379,3.1367 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5651-1"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 10.173449,1051.1878 1.962049,0.014 -1.097826,-3.1723 -1.4563865,0 0.5921635,3.1548 z"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5653-6"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 13.363004,1051.202 1.929186,0 -1.916308,-3.1709 -1.430017,0.014 1.417139,3.1567 z" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 7.289062,1039.2508 -1.9335937,2.9023 c -0.3658869,0.5708 0.3030598,0.9797 0.6835937,0.3887 l 1.2285156,-1.7988 0.00195,2.3613 -2.0898437,3.7753 c -0.3108139,0.5384 0.4784904,1.0101 0.8203156,0.418 l 2.1699219,-3.8789 2.0475556,3.8424 c 0.33917,0.6008 1.154093,0.2207 0.835975,-0.4148 l -1.9811868,-3.742 -0.021484,-2.8516 0.6894532,0.6114 0,1.1386 c 0,0.573 0.8027356,0.6031 0.8027356,0.02 l 0,-1.3633 c 0,0 -0.0013,-0.1459 -0.183594,-0.3418 L 8.625,1038.8957 c -0.1769879,-0.1334 -0.9645841,-0.1612 -1.3359375,0.3555 z"
+       id="path5659-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/island.svg
===================================================================
--- /trunk/images_nodist/presets/island.svg	(revision 9506)
+++ /trunk/images_nodist/presets/island.svg	(revision 9506)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="03.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="8.9697083"
+     inkscape:cy="6.7551551"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-395px"
+       originy="-535px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-395,-501.36218)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect2991-0-7"
+       width="9"
+       height="16"
+       x="398"
+       y="501.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3808-8-5"
+       width="1"
+       height="1"
+       x="402"
+       y="516.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3818-5-1"
+       width="1"
+       height="1"
+       x="402"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3905-2"
+       width="3"
+       height="16"
+       x="395"
+       y="501.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3907-3"
+       width="4"
+       height="16"
+       x="407"
+       y="501.36218" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none"
+       id="path2993-9-2"
+       sodipodi:cx="360"
+       sodipodi:cy="506.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 360,504.36218 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2"
+       transform="matrix(1.3991553,0,0,1.5000012,-101.69592,-250.18169)"
+       sodipodi:start="4.712389"
+       sodipodi:end="7.8539816"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="path2993-9-2-2"
+       sodipodi:cx="360"
+       sodipodi:cy="506.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 361,504.63013 c 0.95659,0.55229 1.28434,1.77547 0.73205,2.73205 -0.17554,0.30404 -0.42801,0.55652 -0.73205,0.73205 l -1,-1.73205 z"
+       transform="matrix(1.9999998,0,0,2.8867455,-314.99995,-952.37657)"
+       sodipodi:start="5.2359878"
+       sodipodi:end="7.3303829" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3818-5-1-1"
+       width="1"
+       height="2"
+       x="402"
+       y="503.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3818-5-1-8"
+       width="1"
+       height="2"
+       x="402"
+       y="513.36218" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/milestone.svg
===================================================================
--- /trunk/images_nodist/presets/milestone.svg	(revision 9506)
+++ /trunk/images_nodist/presets/milestone.svg	(revision 9506)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.000005"
+   height="15.999977"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="35.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="14.896862"
+     inkscape:cy="2.6431793"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-235px"
+       originy="-540.00002px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-235,-496.36218)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="path2989"
+       sodipodi:cx="238"
+       sodipodi:cy="500.36218"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 241,500.36218 c 0,1.65686 -1.34315,3 -3,3 -1.65685,0 -3,-1.34314 -3,-3 0,-1.65685 1.34315,-3 3,-3 1.65685,0 3,1.34315 3,3 z"
+       transform="matrix(1.6666667,0,0,1.5,-156.66667,-249.68109)" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect2987"
+       width="9.9999666"
+       height="11.999978"
+       x="235"
+       y="500.36218"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+       id="rect2991-9"
+       width="1.0180936"
+       height="6.1354146"
+       x="-7.7647033"
+       y="-564.4978"
+       transform="matrix(-0.90519741,0.42499136,-0.42025266,-0.90740713,0,0)" />
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+       id="rect2991-0-4"
+       width="1.0180936"
+       height="6.1354151"
+       x="-3.177521"
+       y="-562.34961"
+       transform="matrix(-0.9051974,0.42499137,-0.42025265,-0.90740713,0,0)" />
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+       id="rect2991-9-1"
+       width="1.0180936"
+       height="6.1354146"
+       x="-435.21201"
+       y="-360.63678"
+       transform="matrix(-0.90741195,-0.42024226,0.42498099,-0.90520228,0,0)" />
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+       id="rect2991-0-4-7"
+       width="1.0180936"
+       height="6.1354151"
+       x="-430.66403"
+       y="-362.74817"
+       transform="matrix(-0.90741195,-0.42024225,0.424981,-0.90520227,0,0)" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/motorway_junction.svg
===================================================================
--- /trunk/images_nodist/presets/motorway_junction.svg	(revision 9506)
+++ /trunk/images_nodist/presets/motorway_junction.svg	(revision 9506)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="486"
+   height="347"
+   viewBox="0 0 486 347"
+   id="Layer_1"
+   xml:space="preserve"
+   style="overflow:visible"><metadata
+   id="metadata2403"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+         rdf:resource="http://web.resource.org/cc/PublicDomain" /><dc:title></dc:title></cc:Work><cc:License
+       rdf:about="http://web.resource.org/cc/PublicDomain"><cc:permits
+         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+   id="defs2401" />
+<rect
+   width="486"
+   height="347"
+   x="0"
+   y="0"
+   id="rect2987"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" /><g
+   id="XMLID_4_">
+	<g
+   id="g2394">
+		<path
+   d="m 486,4 c 0,3 0,6 0,9 -14.15,31.03 -30.58,72.23 -46,109 -3.52,8.39 -8.83,31.86 -20,31 -9.24,-0.71 -14.1,-24.24 -17,-33 -4.94,-14.93 -7.62,-25.51 -12,-38 -50.74,20.65 -87.69,53.67 -86,122 1.34,54.26 21.16,99.67 33,143 l -148,0 C 185.45,231.55 181.01,115.99 177,0 l 51,0 c 11.73,38.61 24.47,76.2 36,115 25.44,-24.63 60.55,-50.85 103,-63 -6.69,-8.75 -16.41,-15.01 -25,-22 -7.83,-6.37 -20.32,-12.24 -20,-26 1.99,-0.68 2.29,-3.05 4,-4 l 156,0 c 0.44,1.23 1.28,2.05 3,2 -0.16,1.16 0.22,1.78 1,2 z"
+   id="path2396" />
+		<path
+   d="m 111,0 51,0 c -4.53,115.47 -8.94,231.06 -13,347 L 0,347 0,344 C 37.73,230.06 73.56,114.23 111,0 z"
+   id="path2398" />
+	</g>
+</g>
+</svg>
Index: /trunk/images_nodist/presets/traffic_calming.svg
===================================================================
--- /trunk/images_nodist/presets/traffic_calming.svg	(revision 9506)
+++ /trunk/images_nodist/presets/traffic_calming.svg	(revision 9506)
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="4.0734712"
+     inkscape:cy="4.2697724"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#004aff;fill-opacity:1;stroke:none;stroke-width:1.29700005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4343"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       rx="2" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1049.3621 14,0 10e-7,-3 -2,0 c -1,0 -2,-3 -5,-3 -3,0 -4,3 -5,3 l -2,0 z"
+       id="path4211"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccssscc" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/traffic_mirror.svg
===================================================================
--- /trunk/images_nodist/presets/traffic_mirror.svg	(revision 9506)
+++ /trunk/images_nodist/presets/traffic_mirror.svg	(revision 9506)
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.000029"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="08.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="9.6281481"
+     inkscape:cy="8.3728898"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-337px"
+       originy="-470px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-337,-566.36218)">
+    <rect
+       style="fill:#c8b7b7;fill-opacity:1;stroke:none"
+       id="rect2989-3"
+       width="9"
+       height="6"
+       x="338"
+       y="567.36218" />
+    <rect
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       id="rect2991-1"
+       width="1"
+       height="8"
+       x="342"
+       y="574.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2993-2"
+       width="1.0001225"
+       height="0.99995375"
+       x="337"
+       y="567.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2995-3"
+       width="0.99993408"
+       height="1.0000679"
+       x="337"
+       y="571.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2997-3"
+       width="1.000026"
+       height="0.99978256"
+       x="339"
+       y="573.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2999-4"
+       width="0.99999619"
+       height="1"
+       x="343"
+       y="573.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3001-1"
+       width="1"
+       height="1"
+       x="345"
+       y="573.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3003-1"
+       width="1"
+       height="1"
+       x="347"
+       y="571.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3009-3"
+       width="1"
+       height="1"
+       x="347"
+       y="567.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3011-8"
+       width="1"
+       height="1"
+       x="344"
+       y="566.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3013-7"
+       width="1"
+       height="1"
+       x="340"
+       y="566.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3015-4"
+       width="1"
+       height="1"
+       x="337"
+       y="568.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3017-2"
+       width="1"
+       height="1"
+       x="337"
+       y="572.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3019-7"
+       width="1"
+       height="1"
+       x="340"
+       y="573.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3021-7"
+       width="1"
+       height="1"
+       x="344"
+       y="573.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3023-9"
+       width="1"
+       height="1"
+       x="346"
+       y="573.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3025-3"
+       width="1"
+       height="1"
+       x="347"
+       y="568.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3027-1"
+       width="1.0000283"
+       height="0.99984413"
+       x="347"
+       y="566.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3029-9"
+       width="0.99992859"
+       height="0.99978286"
+       x="343"
+       y="566.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3031-8"
+       width="1.0000174"
+       height="0.99975455"
+       x="339"
+       y="566.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3968"
+       width="1"
+       height="1"
+       x="337"
+       y="573.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3970"
+       width="1"
+       height="1"
+       x="341"
+       y="573.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3972"
+       width="1"
+       height="1"
+       x="347"
+       y="573.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3974"
+       width="1"
+       height="1"
+       x="347"
+       y="569.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3976"
+       width="1"
+       height="1"
+       x="346"
+       y="566.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3978"
+       width="1"
+       height="1"
+       x="342"
+       y="566.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3980"
+       width="1"
+       height="1"
+       x="338"
+       y="566.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3982"
+       width="1"
+       height="1"
+       x="337"
+       y="569.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3984"
+       width="1"
+       height="1"
+       x="337"
+       y="570.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3986"
+       width="1"
+       height="1"
+       x="338"
+       y="573.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3988"
+       width="1"
+       height="1"
+       x="342"
+       y="573.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3990"
+       width="1"
+       height="1"
+       x="347"
+       y="572.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3992"
+       width="1"
+       height="1"
+       x="347"
+       y="570.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3994"
+       width="1"
+       height="1"
+       x="345"
+       y="566.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3996"
+       width="1"
+       height="1"
+       x="341"
+       y="566.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3998"
+       width="1"
+       height="1"
+       x="337"
+       y="566.36218" />
+  </g>
+</svg>
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java	(revision 9505)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java	(revision 9506)
@@ -151,5 +151,4 @@
             addDefault(def, "multiple",     tr("Multiple values"),     tr("Checks for wrong multiple values"));
             addDefault(def, "numeric",      tr("Numeric values"),      tr("Checks for wrong numeric values"));
-            addDefault(def, "power",        tr("Power"),               tr("Checks for errors on power infrastructures"));
             addDefault(def, "religion",     tr("Religion"),            tr("Checks for errors on religious objects"));
             addDefault(def, "relation",     tr("Relations"),           tr("Checks for errors on relations"));
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 9505)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 9506)
@@ -669,5 +669,5 @@
 }
 node[junction=yes] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "vehicle/junction.svg";
     set icon_z17;
     text: auto;
@@ -698,10 +698,10 @@
 }
 node[highway=stop] {
-    icon-image: "vehicle/restriction/stop.png";
+    icon-image: "vehicle/restriction/stop.svg";
     set icon_z17;
     text: auto;
 }
 node[highway=give_way] {
-    icon-image: "vehicle/restriction/right_of_way.png";
+    icon-image: "vehicle/restriction/give_way.svg";
     set icon_z17;
     text: auto;
@@ -738,5 +738,5 @@
 }
 node[highway=speed_camera] {
-    icon-image: "vehicle/restriction/speed_trap.png";
+    icon-image: "vehicle/restriction/speed_camera.svg";
     set icon_z17;
     text: auto;
@@ -748,5 +748,5 @@
 }
 node[traffic_sign=city_limit] {
-    icon-image: "vehicle/restriction/citylimit.png";
+    icon-image: "vehicle/restriction/city_limit.svg";
     set icon_z17;
     text: auto;
@@ -791,5 +791,5 @@
 }
 node[highway=services] {
-    icon-image: "vehicle/services.png";
+    icon-image: "vehicle/services.svg";
     set icon_z17;
     text: auto;
@@ -799,5 +799,5 @@
 }
 node[highway=rest_area] {
-    icon-image: "vehicle/parking.png";
+    icon-image: "vehicle/rest_area.svg";
     set icon_z17;
     text: auto;
@@ -822,15 +822,15 @@
 }
 node[highway=turning_circle] {
-    icon-image: "vehicle/turning_circle.png";
+    icon-image: "vehicle/turning_circle.svg";
     set icon_z17;
     text: auto;
 }
 node[highway=turning_loop] {
-    icon-image: "vehicle/turning_loop.png";
+    icon-image: "vehicle/turning_loop.svg";
     set icon_z17;
     text: auto;
 }
 node[highway=passing_place] {
-    icon-image: "vehicle/passing_place.png";
+    icon-image: "vehicle/passing_place.svg";
     set icon_z17;
     text: auto;
@@ -840,5 +840,5 @@
 }
 node[highway=elevator] {
-    icon-image: "service/elevator.png";
+    icon-image: "service/elevator.svg";
     set icon_z17;
     text: auto;
@@ -891,5 +891,5 @@
 
 node[traffic_calming] {
-    icon-image: "vehicle/traffic_calming_blue.png";
+    icon-image: "vehicle/traffic_calming.svg";
     set icon_z17;
     text: auto;
@@ -901,5 +901,5 @@
 }
 node[traffic_calming=choker] {
-    icon-image: "vehicle/chocker.svg";
+    icon-image: "vehicle/choker.svg";
     set icon_z17;
     text: auto;
@@ -910,5 +910,29 @@
     text: auto;
 }
-
+node[traffic_calming=bump] {
+    icon-image: "vehicle/bump.svg";
+    set icon_z17;
+    text: auto;
+}
+node[traffic_calming=hump] {
+    icon-image: "vehicle/hump.svg";
+    set icon_z17;
+    text: auto;
+}
+node[traffic_calming=table] {
+    icon-image: "vehicle/table.svg";
+    set icon_z17;
+    text: auto;
+}
+node[traffic_calming=cushion] {
+    icon-image: "vehicle/cushion.svg";
+    set icon_z17;
+    text: auto;
+}
+node[traffic_calming=rumble_strip] {
+    icon-image: "vehicle/rumble_strip.svg";
+    set icon_z17;
+    text: auto;
+}
 /****************/
 /* junction tag */
@@ -2541,5 +2565,5 @@
 }
 node[amenity=grit_bin] {
-    icon-image: "misc/grit_bin.png";
+    icon-image: "misc/grit_bin.svg";
     set icon_z17;
     text: auto;
@@ -4166,5 +4190,5 @@
 }
 node[natural=spring] {
-    icon-image: "misc/landmark/spring.png";
+    icon-image: "misc/landmark/spring.svg";
     set icon_z17;
     text: auto;
@@ -4417,5 +4441,5 @@
 }
 node[waterway=weir] {
-    icon-image: "nautical/weir.png";
+    icon-image: "nautical/weir.svg";
     set icon_z17;
     text: auto;
@@ -4429,5 +4453,5 @@
 }
 node[waterway=dam] {
-    icon-image: "nautical/dam.png";
+    icon-image: "nautical/dam.svg";
     set icon_z17;
     text: auto;
@@ -4439,5 +4463,5 @@
 }
 node[waterway=waterfall] {
-    icon-image: "nautical/waterfall.png";
+    icon-image: "nautical/waterfall.svg";
     set icon_z17;
     text: auto;
@@ -4479,5 +4503,5 @@
 
 node[mountain_pass?] {
-    icon-image: "misc/landmark/mountain_pass.png";
+    icon-image: "misc/landmark/mountain_pass.svg";
     set icon_z0;
     text: auto;