Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9095)
+++ trunk/data/defaultpresets.xml	(revision 9096)
@@ -2300,7 +2300,7 @@
     </group> <!-- Shipping -->
   </group> <!-- Water -->
-  <group name="Transport" icon="presets/railway.png">
-    <group name="Railway" icon="presets/railway.png">
-        <item name="Rail" icon="presets/railway.png" type="way" preset_name_label="true">
+  <group name="Transport" icon="presets/railway.svg">
+    <group name="Railway" icon="presets/railway.svg">
+        <item name="Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=rail"
@@ -2318,5 +2318,5 @@
             </optional>
         </item> <!-- Rail -->
-        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way" preset_name_label="true">
+        <item name="Narrow Gauge Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=light_rail"
@@ -2328,5 +2328,5 @@
             </optional>
         </item> <!-- Narrow Gauge Rail -->
-        <item name="Monorail" icon="presets/railway.png" type="way" preset_name_label="true">
+        <item name="Monorail" icon="presets/railway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
@@ -2399,5 +2399,5 @@
         </item> <!-- Bus Guideway -->
         <separator/>
-        <item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
+        <item name="Disused Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
@@ -2408,5 +2408,5 @@
             </optional>
         </item> <!-- Disused Rail -->
-        <item name="Abandoned Rail" icon="presets/railway.png" type="way" preset_name_label="true">
+        <item name="Abandoned Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
@@ -2475,5 +2475,5 @@
             <key key="railway" value="buffer_stop" />
         </item> <!-- Buffer Stop -->
-        <item name="Railway Switch" icon="presets/railway_switch.png" type="node" preset_name_label="true">
+        <item name="Railway Switch" icon="presets/railway_switch.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=switch"
Index: trunk/images/presets/railway.svg
===================================================================
--- trunk/images/presets/railway.svg	(revision 9096)
+++ trunk/images/presets/railway.svg	(revision 9096)
@@ -0,0 +1,98 @@
+<?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="320"
+   height="60"
+   id="svg3091"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="10.svg">
+  <defs
+     id="defs3093" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="127.46227"
+     inkscape:cy="68.199653"
+     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="grid3112"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="-1.7382813e-005px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3096">
+    <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(0,-992.36218)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4919-27"
+       width="320"
+       height="60"
+       x="0"
+       y="992.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4921-6"
+       width="60"
+       height="40"
+       x="20"
+       y="1002.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4923-14"
+       width="80"
+       height="40"
+       x="120"
+       y="1002.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4925-2"
+       width="60"
+       height="40"
+       x="240"
+       y="1002.3622" />
+  </g>
+</svg>
Index: trunk/images/presets/railway_switch.svg
===================================================================
--- trunk/images/presets/railway_switch.svg	(revision 9096)
+++ trunk/images/presets/railway_switch.svg	(revision 9096)
@@ -0,0 +1,123 @@
+<?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="160"
+   height="105.98101"
+   id="svg3091"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="10.svg">
+  <defs
+     id="defs3093" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="127.46227"
+     inkscape:cy="89.71849"
+     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="grid3112"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="-7.2695923e-005px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3096">
+    <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(0,-946.38112)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4919-2-7"
+       width="160"
+       height="29.999945"
+       x="0"
+       y="1022.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4923-5-4"
+       width="40"
+       height="20"
+       x="60"
+       y="1027.3623" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4925-1-0"
+       width="30"
+       height="20"
+       x="120"
+       y="1027.3623" />
+    <g
+       id="g5088-4"
+       transform="matrix(8.6602541,-5.0000001,5.0000001,8.6602541,-9742.1362,-2827.4939)">
+      <rect
+         y="820.86218"
+         x="651"
+         height="2.9999945"
+         width="16"
+         id="rect4919-2-2-8"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <rect
+         y="821.36218"
+         x="657"
+         height="2"
+         width="4"
+         id="rect4923-5-2-8"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="821.36218"
+         x="663"
+         height="2"
+         width="3"
+         id="rect4925-1-1-2"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="821.36218"
+         x="652"
+         height="2"
+         width="3"
+         id="rect4921-6-3-6-4"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9095)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9096)
@@ -3467,5 +3467,5 @@
 }
 node[railway=switch] {
-    icon-image: "presets/railway_switch.png";
+    icon-image: "presets/railway_switch.svg";
     icon-width: 16;
     set icon_z17;