Fix:xpm:Changed nav svgs to generated ones

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1700 ffa7fe5e-494d-0410-b361-a75ebd5db220

32 files changed, 320 insertions, 6117 deletions

diff --git a/navit/xpm/nav_roundabout_l1_bk.svg b/navit/xpm/nav_roundabout_l1_bk.svg
index 22158a005..ff52db494 100644
--- a/navit/xpm/nav_roundabout_l1_bk.svg
+++ b/navit/xpm/nav_roundabout_l1_bk.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l1_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="-11.365593"
-     inkscape:cy="23.438135"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartX"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartX"
-       style="overflow:visible">
-      <path
-         id="path7719"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartXy"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartXy"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 43.0421,43.219866"
-       sodipodi:start="1.5833549"
-       sodipodi:end="6.9986131"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 23.54 40.46 A 12 12 0 1 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="2.3961529"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.798305,43.567076"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 1 23.54 40.46 L 19.3 44.7"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.592747 C 32.637612,48.414098 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartXy);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 4.1872411,55.160296 C 19.832313,42.117983 19.365296,42.507306 19.365296,42.507306"
-       id="path3827" />
+         transform="translate(19.3,44.7) scale(2) rotate(225)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l1_wh.svg b/navit/xpm/nav_roundabout_l1_wh.svg
index 22428200c..f2a3b5800 100644
--- a/navit/xpm/nav_roundabout_l1_wh.svg
+++ b/navit/xpm/nav_roundabout_l1_wh.svg
@@ -1,193 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l1_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="39.485718"
-     inkscape:cy="20.251816"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2674"
-       position="31.548758,7.9883072"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         id="path3850" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path3832" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible"
-       id="Arrow2LstartX"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2LstartX">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path7719" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:end="6.9986131"
-       sodipodi:start="1.5833549"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 43.0421,43.219866"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
+       d="M 23.54 40.46 A 12 12 0 1 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="translate(0.764664,-1.0319362)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.798305,43.567076"
-       sodipodi:start="1.5579681"
-       sodipodi:end="2.3961529"
-       sodipodi:open="true" />
+       d="M 32,63 L 32,44 A 12 12 0 0 1 23.54 40.46 L 19.3 44.7"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       sodipodi:nodetypes="cc"
-       id="path3456"
-       d="M 32.637612,62.592747 C 32.637612,48.414098 32.5,47.500003 32.5,47.500003"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path3827"
-       d="M 4.1872411,55.160296 C 19.832313,42.117983 19.365296,42.507306 19.365296,42.507306"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow2LstartX);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         transform="translate(19.3,44.7) scale(2) rotate(225)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l2_bk.svg b/navit/xpm/nav_roundabout_l2_bk.svg
index 7a0741dfc..a1c94a003 100644
--- a/navit/xpm/nav_roundabout_l2_bk.svg
+++ b/navit/xpm/nav_roundabout_l2_bk.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l2_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="-14.639771"
-     inkscape:cy="28.778529"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3194"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstartoq"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartoq"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 46.862804,33.433042"
-       sodipodi:start="1.5833549"
-       sodipodi:end="6.3090165"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 20 32 A 12 12 0 1 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.1390781"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 15.660005,33.070935"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 1 20 32 L 14 32"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartoq);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 2.0886504,32.710684 C 15.757303,32.710684 15.349282,32.710684 15.349282,32.710684"
-       id="path3827" />
+         transform="translate(14,32) scale(2) rotate(270)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l2_wh.svg b/navit/xpm/nav_roundabout_l2_wh.svg
index ef3f3332e..d0c30de54 100644
--- a/navit/xpm/nav_roundabout_l2_wh.svg
+++ b/navit/xpm/nav_roundabout_l2_wh.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l2_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="22.18748"
-     inkscape:cy="33.269493"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3194"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstarta"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarta"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 46.862804,33.433042"
-       sodipodi:start="1.5833549"
-       sodipodi:end="6.3090165"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 20 32 A 12 12 0 1 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.1390781"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 15.660005,33.070935"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 1 20 32 L 14 32"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstarta);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.2;fill:none"
-       d="M 2.0886504,32.710684 C 15.757303,32.710684 15.349282,32.710684 15.349282,32.710684"
-       id="path3827" />
+         transform="translate(14,32) scale(2) rotate(270)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l3_bk.svg b/navit/xpm/nav_roundabout_l3_bk.svg
index d17141150..3c609b2e8 100644
--- a/navit/xpm/nav_roundabout_l3_bk.svg
+++ b/navit/xpm/nav_roundabout_l3_bk.svg
@@ -1,194 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l3_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="5.523473"
-     inkscape:cy="32.614427"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartW"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW"
-       style="overflow:visible">
-      <path
-         id="path5083"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartWY"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartWY"
-       style="overflow:visible">
-      <path
-         id="path3202"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 43.835618,23.83126"
-       sodipodi:start="1.551048"
-       sodipodi:end="5.649188"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 23.54 23.54 A 12 12 0 1 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.8356015"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 0 1 19.269354,23.097319"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 1 23.54 23.54 L 19.3 19.3"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       inkscape:transform-center-y="2.50736"
-       inkscape:transform-center-x="-12.603989"
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartWY);stroke:#000000;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 10.044044,11.517834 C 19.837109,22.270178 19.837109,22.270178 19.837109,22.270178"
-       id="path4821" />
+         transform="translate(19.3,19.3) scale(2) rotate(315)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l3_wh.svg b/navit/xpm/nav_roundabout_l3_wh.svg
index a6119c144..a13af057c 100644
--- a/navit/xpm/nav_roundabout_l3_wh.svg
+++ b/navit/xpm/nav_roundabout_l3_wh.svg
@@ -1,181 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l3_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="5.523473"
-     inkscape:cy="26.288586"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2674"
-       position="31.548758,7.9883072"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         id="path3850" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible"
-       id="Arrow2LstartW"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2LstartW">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path5083" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       transform="matrix(-1,0,0,1,63.089877,0)"
-       sodipodi:open="true"
-       sodipodi:end="5.649188"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 43.835618,23.83126"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
+       d="M 23.54 23.54 A 12 12 0 1 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="translate(0.236017,2.0540018e-7)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 0 1 19.269354,23.097319"
-       sodipodi:start="1.551048"
-       sodipodi:end="3.8356015"
-       sodipodi:open="true" />
+       d="M 32,63 L 32,44 A 12 12 0 0 1 23.54 23.54 L 19.3 19.3"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       id="path3456"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path4821"
-       d="M 10.044044,11.517834 C 19.837109,22.270178 19.837109,22.270178 19.837109,22.270178"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:miter;marker-start:url(#Arrow2LstartW);marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:transform-center-x="-12.603989"
-       inkscape:transform-center-y="2.50736" />
+         transform="translate(19.3,19.3) scale(2) rotate(315)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l4_bk.svg b/navit/xpm/nav_roundabout_l4_bk.svg
index c7e70b2e6..0dd38594e 100644
--- a/navit/xpm/nav_roundabout_l4_bk.svg
+++ b/navit/xpm/nav_roundabout_l4_bk.svg
@@ -1,192 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l4_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="5.523473"
-     inkscape:cy="32.614427"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartW"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW"
-       style="overflow:visible">
-      <path
-         id="path5083"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartWY"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartWY"
-       style="overflow:visible">
-      <path
-         id="path3202"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:start="1.551048"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 32 20 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 32 20 L 32 14"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartWY);stroke:#000000;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 31.717688,2.438374 C 31.717688,16.981998 31.717688,16.981998 31.717688,16.981998"
-       id="path4821" />
+         transform="translate(32,14) scale(2) rotate(0)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l4_wh.svg b/navit/xpm/nav_roundabout_l4_wh.svg
index 8c4424acd..0faf9bc0a 100644
--- a/navit/xpm/nav_roundabout_l4_wh.svg
+++ b/navit/xpm/nav_roundabout_l4_wh.svg
@@ -1,192 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l4_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="5.523473"
-     inkscape:cy="32.614427"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartW"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW"
-       style="overflow:visible">
-      <path
-         id="path5083"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartP"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartP"
-       style="overflow:visible">
-      <path
-         id="path3729"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3,6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:start="1.551048"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 32 20 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 32 20 L 32 14"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartP);stroke:#ffffff;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.2;fill:none"
-       d="M 31.717688,2.438374 C 31.717688,16.981998 31.717688,16.981998 31.717688,16.981998"
-       id="path4821" />
+         transform="translate(32,14) scale(2) rotate(0)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l5_bk.svg b/navit/xpm/nav_roundabout_l5_bk.svg
index b10c4c157..f7122efca 100644
--- a/navit/xpm/nav_roundabout_l5_bk.svg
+++ b/navit/xpm/nav_roundabout_l5_bk.svg
@@ -1,194 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l5_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="5.523473"
-     inkscape:cy="31.025712"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartW"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW"
-       style="overflow:visible">
-      <path
-         id="path5083"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartW9"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW9"
-       style="overflow:visible">
-      <path
-         id="path3202"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 0 1 21.406125,20.99201"
-       sodipodi:start="1.551048"
-       sodipodi:end="4.0285791"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 40.46 23.54 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="5.4212809"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 41.422096,21.241883"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 40.46 23.54 L 44.7 19.3"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       inkscape:transform-center-y="2.4788937"
-       inkscape:transform-center-x="12.635244"
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartW9);stroke:#000000;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 52,9 C 42.206935,19.752344 42.206935,19.752344 42.206935,19.752344"
-       id="path4821" />
+         transform="translate(44.7,19.3) scale(2) rotate(45)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l5_wh.svg b/navit/xpm/nav_roundabout_l5_wh.svg
index e499a4a06..5bbbb38e7 100644
--- a/navit/xpm/nav_roundabout_l5_wh.svg
+++ b/navit/xpm/nav_roundabout_l5_wh.svg
@@ -1,194 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l5_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="5.523473"
-     inkscape:cy="37.670318"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartW"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW"
-       style="overflow:visible">
-      <path
-         id="path5083"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstartb"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartb"
-       style="overflow:visible">
-      <path
-         id="path3729"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 0 1 21.406125,20.99201"
-       sodipodi:start="1.551048"
-       sodipodi:end="4.0285791"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 40.46 23.54 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="5.4212809"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 41.422096,21.241883"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 40.46 23.54 L 44.7 19.3"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       inkscape:transform-center-y="2.4788937"
-       inkscape:transform-center-x="12.635244"
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartb);stroke:#ffffff;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.2;fill:none"
-       d="M 52,9 C 42.206935,19.752344 42.206935,19.752344 42.206935,19.752344"
-       id="path4821" />
+         transform="translate(44.7,19.3) scale(2) rotate(45)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l6_bk.svg b/navit/xpm/nav_roundabout_l6_bk.svg
index 7489358a4..fbf660b33 100644
--- a/navit/xpm/nav_roundabout_l6_bk.svg
+++ b/navit/xpm/nav_roundabout_l6_bk.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l6_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="14.308841"
-     inkscape:cy="29.568851"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3194"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstartov"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartov"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 15.665379,32.622428 A 15.604027,15.531879 0 1 1 30.921928,48.560027"
-       sodipodi:start="3.1679577"
-       sodipodi:end="7.8759043"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 44 32 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="1.5483704"
-       sodipodi:start="0.11477786"
-       d="M 46.765339,34.810684 A 15.604027,15.531879 0 0 1 31.613888,48.559853"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:9.30000000000000071;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 44 32 L 50 32"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartov);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 61.82752,32.509071 C 48.158867,32.509071 48.566888,32.509071 48.566888,32.509071"
-       id="path3827" />
+         transform="translate(50,32) scale(2) rotate(90)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l6_wh.svg b/navit/xpm/nav_roundabout_l6_wh.svg
index ab067d487..91098222e 100644
--- a/navit/xpm/nav_roundabout_l6_wh.svg
+++ b/navit/xpm/nav_roundabout_l6_wh.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l6_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="29.782009"
-     inkscape:cy="33.269493"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3194"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstartd"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartd"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 15.665379,32.622428 A 15.604027,15.531879 0 1 1 30.921928,48.560027"
-       sodipodi:start="3.1679577"
-       sodipodi:end="7.8759043"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 44 32 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="1.5483704"
-       sodipodi:start="0.11477786"
-       d="M 46.765339,34.810684 A 15.604027,15.531879 0 0 1 31.613888,48.559853"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3,6;stroke-dashoffset:9.3;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 44 32 L 50 32"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartd);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.2;fill:none"
-       d="M 61.82752,32.509071 C 48.158867,32.509071 48.566888,32.509071 48.566888,32.509071"
-       id="path3827" />
+         transform="translate(50,32) scale(2) rotate(90)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l7_bk.svg b/navit/xpm/nav_roundabout_l7_bk.svg
index 5eeafa42f..fc122cf9b 100644
--- a/navit/xpm/nav_roundabout_l7_bk.svg
+++ b/navit/xpm/nav_roundabout_l7_bk.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l7_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="15.00344"
-     inkscape:cy="-1.7987321"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="45.362903,15.927419"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartX"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartX"
-       style="overflow:visible">
-      <path
-         id="path7719"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartX0"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartX0"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 16.075098,36.59074 A 15.604027,15.531879 0 1 1 32.814326,48.486907"
-       sodipodi:start="2.9104061"
-       sodipodi:end="7.7544621"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 40.46 40.46 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="7.7875491"
-       sodipodi:start="5.7476834"
-       d="M 44.683643,25.106385 A 15.604027,15.531879 0 0 1 32.299836,48.529498"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:2.10000000000000009;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 40.46 40.46 L 44.7 44.7"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.592747 C 32.637612,48.414098 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartX0);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 52.154991,60.081507 C 39.262515,44.312731 39.647365,44.783441 39.647365,44.783441"
-       id="path3827" />
+         transform="translate(44.7,44.7) scale(2) rotate(135)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l7_wh.svg b/navit/xpm/nav_roundabout_l7_wh.svg
index de0ebdcf6..3adc2d7c8 100644
--- a/navit/xpm/nav_roundabout_l7_wh.svg
+++ b/navit/xpm/nav_roundabout_l7_wh.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l7_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="15.00344"
-     inkscape:cy="33.269493"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="45.362903,15.927419"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2LstartX"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartX"
-       style="overflow:visible">
-      <path
-         id="path7719"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart8"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart8"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 16.075098,36.59074 A 15.604027,15.531879 0 1 1 32.814326,48.486907"
-       sodipodi:start="2.9104061"
-       sodipodi:end="7.7544621"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 40.46 40.46 A 12 12 0 0 1 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="7.7875491"
-       sodipodi:start="5.7476834"
-       d="M 44.683643,25.106385 A 15.604027,15.531879 0 0 1 32.299836,48.529498"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3,6;stroke-dashoffset:2.1;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 1 40.46 40.46 L 44.7 44.7"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.592747 C 32.637612,48.414098 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstart8);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 52.154991,60.081507 C 39.262515,44.312731 39.647365,44.783441 39.647365,44.783441"
-       id="path3827" />
+         transform="translate(44.7,44.7) scale(2) rotate(135)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l8_bk.svg b/navit/xpm/nav_roundabout_l8_bk.svg
index 896c0a8ba..de184a8cb 100644
--- a/navit/xpm/nav_roundabout_l8_bk.svg
+++ b/navit/xpm/nav_roundabout_l8_bk.svg
@@ -1,205 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l8_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="21.481641"
-     inkscape:cy="-0.19396983"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         id="path3850" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstarto"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstarto">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path3186" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart5"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart5">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path3731" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart5r"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart5r">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000700;stroke-width:0.62500000;fill:#000700"
-         id="path3211" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       transform="matrix(-1,0,0,1,63.089877,0)"
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.8150881"
-       d="M 27.48985,48.1026 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
+       d="M 38 44 A 12 12 0 0 1 26 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="translate(0.236017,2.0540018e-7)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 25.092137,47.297188 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:start="1.9774401"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true" />
+       d="M 26,63 L 26,44 A 12 12 0 1 1 38 44 L 38 50"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       id="path3456"
-       d="M 35,62 C 35,58.214696 35,58.214696 35,58.214696"
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstart5r);stroke:#000700;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1;fill:none" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000700;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 35,53.436735 L 35,47.436735 L 35,47.436735"
-       id="path3223" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000700;stroke-width:3.99999976000000013;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25,61.815789 L 25,48"
-       id="path2400" />
+         transform="translate(38,50) scale(2) rotate(180)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_l8_wh.svg b/navit/xpm/nav_roundabout_l8_wh.svg
index 867bc2fe6..cc16f9c15 100644
--- a/navit/xpm/nav_roundabout_l8_wh.svg
+++ b/navit/xpm/nav_roundabout_l8_wh.svg
@@ -1,192 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_l8_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="8.360011"
-     inkscape:cy="32.560377"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3186"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart5"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart5"
-       style="overflow:visible">
-      <path
-         id="path3731"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 27.48985,48.1026 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:start="1.8150881"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 38 44 A 12 12 0 0 1 26 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.9774401"
-       d="M 25.092137,47.297188 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 26,63 L 26,44 A 12 12 0 1 1 38 44 L 38 50"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstart5);stroke:#ffffff;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1;fill:none"
-       d="M 35,62 C 35,58.214696 35,58.214696 35,58.214696"
-       id="path3456" />
-    <path
-       id="path3223"
-       d="M 35,53.436735 L 35,47.436735 L 35,47.436735"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path2400"
-       d="M 25,61.815789 L 25,48"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         transform="translate(38,50) scale(2) rotate(180)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r1_bk.svg b/navit/xpm/nav_roundabout_r1_bk.svg
index ef50bf893..7d89c9ecb 100644
--- a/navit/xpm/nav_roundabout_r1_bk.svg
+++ b/navit/xpm/nav_roundabout_r1_bk.svg
@@ -1,211 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r1_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#010000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="48.912178"
-     inkscape:cy="22.867134"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarta"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarta"
-       style="overflow:visible">
-      <path
-         id="path8368"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstartar"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartar"
-       style="overflow:visible">
-      <path
-         id="path3213"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g14827"
-       transform="matrix(-1,0,0,1,64.000154,0)"
-       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0">
-      <path
-         sodipodi:open="true"
-         transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-         sodipodi:end="6.9986131"
-         sodipodi:start="1.5833549"
-         d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 43.0421,43.219866"
-         sodipodi:ry="15.531879"
-         sodipodi:rx="15.604027"
-         sodipodi:cy="33.031879"
-         sodipodi:cx="31.263983"
-         id="path2680"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </g>
+   height="64px">
+  <g>
     <path
-       sodipodi:open="true"
-       sodipodi:end="2.3961529"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.798305,43.567076"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="matrix(-1,0,0,1,63.23549,-1.0319362)" />
+       d="M 40.46 40.46 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 40.46 40.46 L 44.7 44.7"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartar);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 59.924218,55.651864 C 43.528192,40.685012 44.017626,41.131784 44.017626,41.131784"
-       id="path3827" />
+         transform="translate(44.7,44.7) scale(2) rotate(135)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r1_wh.svg b/navit/xpm/nav_roundabout_r1_wh.svg
index 0fbd02e68..c9fe0b17b 100644
--- a/navit/xpm/nav_roundabout_r1_wh.svg
+++ b/navit/xpm/nav_roundabout_r1_wh.svg
@@ -1,211 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r1_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="45.862441"
-     inkscape:cy="29.167831"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarta"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarta"
-       style="overflow:visible">
-      <path
-         id="path8368"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartW"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartW"
-       style="overflow:visible">
-      <path
-         id="path4932"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g14827"
-       transform="matrix(-1,0,0,1,64.000154,0)"
-       style="fill:none;stroke:#ffffff;stroke-opacity:1;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:3,9;stroke-dashoffset:0">
-      <path
-         sodipodi:open="true"
-         transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-         sodipodi:end="6.9986131"
-         sodipodi:start="1.5833549"
-         d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 43.0421,43.219866"
-         sodipodi:ry="15.531879"
-         sodipodi:rx="15.604027"
-         sodipodi:cy="33.031879"
-         sodipodi:cx="31.263983"
-         id="path2680"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3,9;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </g>
+   height="64px">
+  <g>
     <path
-       sodipodi:open="true"
-       sodipodi:end="2.3961529"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.798305,43.567076"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="matrix(-1,0,0,1,63.23549,-1.0319362)" />
+       d="M 40.46 40.46 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 40.46 40.46 L 44.7 44.7"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartW);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 59.924218,55.651864 C 43.528192,40.685012 44.017626,41.131784 44.017626,41.131784"
-       id="path3827" />
+         transform="translate(44.7,44.7) scale(2) rotate(135)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r2_bk.svg b/navit/xpm/nav_roundabout_r2_bk.svg
index a2f1e0aae..a2285491d 100644
--- a/navit/xpm/nav_roundabout_r2_bk.svg
+++ b/navit/xpm/nav_roundabout_r2_bk.svg
@@ -1,194 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r2_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.040492"
-     inkscape:cx="54.379732"
-     inkscape:cy="26.720307"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2674"
-       position="31.548758,7.9883072"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lendu"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lendu">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path7081" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lendh"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lendh">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path3713" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lendhr"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lendhr">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         id="path3202" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       sodipodi:open="true"
-       transform="translate(0.7357446,-1.0318794)"
-       sodipodi:end="6.3090165"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 46.862804,33.433042"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
+       d="M 44 32 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="matrix(-1,0,0,1,63.235063,-1.0321171)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 0 1 15.660235,33.124795"
-       sodipodi:start="1.551048"
-       sodipodi:end="3.1356104"
-       sodipodi:open="true" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 44 32 L 50 32"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       sodipodi:nodetypes="cc"
-       id="path3456"
-       d="M 31.5,62.795666 C 31.5,48.426385 31.637612,47.5 31.637612,47.5"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path4821"
-       d="M 47.563983,32.587396 C 59.399205,32.587396 61.951648,32.45589 61.951648,32.45589"
-       style="stroke-linejoin:miter;marker-end:url(#Arrow2Lendhr);stroke-opacity:1;fill-rule:evenodd;marker-start:none;stroke:#000000;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.19999999999999996;fill:none" />
+         transform="translate(50,32) scale(2) rotate(90)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r2_wh.svg b/navit/xpm/nav_roundabout_r2_wh.svg
index c490def63..94cb7cc8b 100644
--- a/navit/xpm/nav_roundabout_r2_wh.svg
+++ b/navit/xpm/nav_roundabout_r2_wh.svg
@@ -1,181 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r2_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.040492"
-     inkscape:cx="46.512917"
-     inkscape:cy="31.760512"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lendu"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lendu"
-       style="overflow:visible;">
-      <path
-         id="path7081"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lendh"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lendh"
-       style="overflow:visible;">
-      <path
-         id="path3713"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 46.862804,33.433042"
-       sodipodi:start="1.551048"
-       sodipodi:end="6.3090165"
-       transform="translate(0.7357446,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 44 32 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.1356104"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 0 1 15.660235,33.124795"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="matrix(-1,0,0,1,63.235063,-1.0321171)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 44 32 L 50 32"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.5,62.795666 C 31.5,48.426385 31.637612,47.5 31.637612,47.5"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;marker-end:url(#Arrow2Lendh);stroke-opacity:1;fill-rule:evenodd;marker-start:none;stroke:#ffffff;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.19999999999999996;fill:none"
-       d="M 47.563983,32.587396 C 59.399205,32.587396 61.951648,32.45589 61.951648,32.45589"
-       id="path4821"
-       sodipodi:nodetypes="cc" />
+         transform="translate(50,32) scale(2) rotate(90)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r3_bk.svg b/navit/xpm/nav_roundabout_r3_bk.svg
index 9803832e9..bbb2966c7 100644
--- a/navit/xpm/nav_roundabout_r3_bk.svg
+++ b/navit/xpm/nav_roundabout_r3_bk.svg
@@ -1,219 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r3_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.63"
-     inkscape:cx="22.598945"
-     inkscape:cy="33.269493"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2674"
-       position="31.548758,7.9883072"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         id="path3850" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path3832" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstartv"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstartv">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path6376" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstartb"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstartb">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path3745" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2LstartbB"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2LstartbB">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         id="path3222" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       sodipodi:open="true"
-       transform="translate(0.736094,-1.0318794)"
-       sodipodi:end="5.6700117"
-       sodipodi:start="1.5833549"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 44.025359,24.093814"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
+       d="M 40.46 23.54 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="matrix(-1,0,0,1,63.23549,-1.0319362)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.355506,22.995156"
-       sodipodi:start="1.5579681"
-       sodipodi:end="3.8441892"
-       sodipodi:open="true" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 40.46 23.54 L 44.7 19.3"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       sodipodi:nodetypes="cc"
-       id="path3456"
-       d="M 32.637612,62.465199 C 32.637612,48.406374 32.5,47.500004 32.5,47.500004"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path3827"
-       d="M 61.396158,5.1489469 C 41.704648,22.831095 42.292454,22.303267 42.292454,22.303267"
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartbB);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none" />
+         transform="translate(44.7,19.3) scale(2) rotate(45)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r3_wh.svg b/navit/xpm/nav_roundabout_r3_wh.svg
index f7119db9a..80f959268 100644
--- a/navit/xpm/nav_roundabout_r3_wh.svg
+++ b/navit/xpm/nav_roundabout_r3_wh.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r3_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.63"
-     inkscape:cx="19.683294"
-     inkscape:cy="33.269493"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstartv"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartv"
-       style="overflow:visible">
-      <path
-         id="path6376"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart5"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart5"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 44.025359,24.093814"
-       sodipodi:start="1.5833549"
-       sodipodi:end="5.6700117"
-       transform="translate(0.736094,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 40.46 23.54 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.8441892"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.355506,22.995156"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="matrix(-1,0,0,1,63.23549,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 40.46 23.54 L 44.7 19.3"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.465199 C 32.637612,48.406374 32.5,47.500004 32.5,47.500004"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstart5);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 61.396158,5.1489469 C 41.704648,22.831095 42.292454,22.303267 42.292454,22.303267"
-       id="path3827" />
+         transform="translate(44.7,19.3) scale(2) rotate(45)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r4_bk.svg b/navit/xpm/nav_roundabout_r4_bk.svg
index ccec6b595..07e082595 100644
--- a/navit/xpm/nav_roundabout_r4_bk.svg
+++ b/navit/xpm/nav_roundabout_r4_bk.svg
@@ -1,205 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r4_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="8.005443"
-     inkscape:cy="56.51812"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3852"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstartoq"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartoq"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#020000;stroke-width:0.62500000;fill:#020000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#020000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:start="1.551048"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true"
-       transform="translate(0.2360172,0)" />
+       d="M 32 20 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#020000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="matrix(-1,0,0,1,63.089877,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 32 20 L 32 14"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#020000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartoq);stroke:#020000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 31.619218,2.3920059 C 31.619218,17.000001 31.619218,17.000001 31.619218,17.000001"
-       id="path10438" />
+         transform="translate(32,14) scale(2) rotate(0)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r4_wh.svg b/navit/xpm/nav_roundabout_r4_wh.svg
index c14a11f60..f2443388a 100644
--- a/navit/xpm/nav_roundabout_r4_wh.svg
+++ b/navit/xpm/nav_roundabout_r4_wh.svg
@@ -1,205 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r4_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="8.005443"
-     inkscape:cy="47.278294"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3852"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartK"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartK"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:start="1.551048"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true"
-       transform="translate(0.2360172,0)" />
+       d="M 32 20 A 12 12 0 1 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.551048"
-       d="M 31.572116,48.56073 A 15.604027,15.531879 0 1 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="matrix(-1,0,0,1,63.089877,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 0 0 32 20 L 32 14"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 31.662947,62.626765 C 31.662947,48.436693 31.662947,48.436693 31.662947,48.436693"
-       id="path3456" />
-    <path
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartK);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.19999999999999996;fill:none"
-       d="M 31.619218,2.3920059 C 31.619218,17.000001 31.619218,17.000001 31.619218,17.000001"
-       id="path10438" />
+         transform="translate(32,14) scale(2) rotate(0)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r5_bk.svg b/navit/xpm/nav_roundabout_r5_bk.svg
index dc8c962b1..8afd28712 100644
--- a/navit/xpm/nav_roundabout_r5_bk.svg
+++ b/navit/xpm/nav_roundabout_r5_bk.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r5_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.63"
-     inkscape:cx="-9.4368672"
-     inkscape:cy="30.129206"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstartk"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartk"
-       style="overflow:visible">
-      <path
-         id="path5731"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartkV"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartkV"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 44.025359,24.093814"
-       sodipodi:start="1.5833549"
-       sodipodi:end="5.6700117"
-       transform="matrix(-1,0,0,1,63.235689,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 23.54 23.54 A 12 12 0 0 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.8441892"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.355506,22.995156"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.736293,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 0 23.54 23.54 L 19.3 19.3"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.653341 C 32.637612,48.417765 32.5,47.500001 32.5,47.500001"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartkV);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 4.1128319,5.5101168 C 21.120244,21.974698 20.612561,21.483217 20.612561,21.483217"
-       id="path3827" />
+         transform="translate(19.3,19.3) scale(2) rotate(315)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r5_wh.svg b/navit/xpm/nav_roundabout_r5_wh.svg
index e4285b34d..98e8d3756 100644
--- a/navit/xpm/nav_roundabout_r5_wh.svg
+++ b/navit/xpm/nav_roundabout_r5_wh.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r5_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.63"
-     inkscape:cx="-9.4368672"
-     inkscape:cy="33.272757"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstartk"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstartk"
-       style="overflow:visible">
-      <path
-         id="path5731"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstarta"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarta"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 44.025359,24.093814"
-       sodipodi:start="1.5833549"
-       sodipodi:end="5.6700117"
-       transform="matrix(-1,0,0,1,63.235689,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 23.54 23.54 A 12 12 0 0 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.8441892"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 19.355506,22.995156"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.736293,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 0 23.54 23.54 L 19.3 19.3"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.653341 C 32.637612,48.417765 32.5,47.500001 32.5,47.500001"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstarta);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
-       d="M 4.1128319,5.5101168 C 21.120244,21.974698 20.612561,21.483217 20.612561,21.483217"
-       id="path3827" />
+         transform="translate(19.3,19.3) scale(2) rotate(315)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r6_bk.svg b/navit/xpm/nav_roundabout_r6_bk.svg
index 0fd18c6aa..1b3d20504 100644
--- a/navit/xpm/nav_roundabout_r6_bk.svg
+++ b/navit/xpm/nav_roundabout_r6_bk.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r6_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="-14.639771"
-     inkscape:cy="31.97803"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3194"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartoN"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartoN"
-       style="overflow:visible">
-      <path
-         id="path3212"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 46.862804,33.433042"
-       sodipodi:start="1.5833549"
-       sodipodi:end="6.3090165"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 20 32 A 12 12 0 0 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.1390781"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 15.660005,33.070935"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 0 20 32 L 14 32"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartoN);stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.20000005000000010;fill:none"
-       d="M 2.0886504,32.710684 C 15.757303,32.710684 15.349282,32.710684 15.349282,32.710684"
-       id="path3827" />
+         transform="translate(14,32) scale(2) rotate(270)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r6_wh.svg b/navit/xpm/nav_roundabout_r6_wh.svg
index 77854b49b..c2a516e74 100644
--- a/navit/xpm/nav_roundabout_r6_wh.svg
+++ b/navit/xpm/nav_roundabout_r6_wh.svg
@@ -1,206 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r6_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.92"
-     inkscape:cx="36.990479"
-     inkscape:cy="33.269493"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3832"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3194"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartM"
-       style="overflow:visible">
-      <path
-         id="path3745"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 31.068024,48.562534 A 15.604027,15.531879 0 1 1 46.862804,33.433042"
-       sodipodi:start="1.5833549"
-       sodipodi:end="6.3090165"
-       transform="matrix(-1,0,0,1,63.26406,-1.0318794)"
-       sodipodi:open="true" />
+       d="M 20 32 A 12 12 0 0 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="3.1390781"
-       sodipodi:start="1.5579681"
-       d="M 31.464149,48.562481 A 15.604027,15.531879 0 0 1 15.660005,33.070935"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 6;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.764664,-1.0319362)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 0 20 32 L 14 32"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32.637612,62.693553 C 32.637612,48.420203 32.5,47.500003 32.5,47.500003"
-       id="path3456"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="stroke-linejoin:miter;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartM);stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.2;fill:none"
-       d="M 2.0886504,32.710684 C 15.757303,32.710684 15.349282,32.710684 15.349282,32.710684"
-       id="path3827" />
+         transform="translate(14,32) scale(2) rotate(270)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r7_bk.svg b/navit/xpm/nav_roundabout_r7_bk.svg
index b04e96305..a7d42a642 100644
--- a/navit/xpm/nav_roundabout_r7_bk.svg
+++ b/navit/xpm/nav_roundabout_r7_bk.svg
@@ -1,209 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r7_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="19.324221"
-     inkscape:cy="23.127432"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2674"
-       position="31.548758,7.9883072"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         id="path3850" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstarto"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstarto">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path3186" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstartof"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstartof">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         id="path2530" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       transform="matrix(-1,0,0,1,63.089877,0)"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.7770659"
-       d="M 28.068122,48.23451 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       sodipodi:open="true" />
+       d="M 23.54 40.46 A 12 12 0 0 0 32 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="translate(0.236017,2.0540018e-7)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 16.477483,37.993317 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:start="2.8164587"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true" />
+       d="M 32,63 L 32,44 A 12 12 0 1 0 23.54 40.46 L 19.3 44.7"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       id="path3456"
-       d="M 10.214745,54.653598 C 12.734841,51.829126 12.734841,51.829126 12.734841,51.829126"
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2Lstartof);fill-opacity:1;stroke:#000000;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1;fill:#000000" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.241799,47.785685 L 20.236347,43.308678 L 20.236347,43.308678"
-       id="path3223" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 35,61.7 L 35,48.5"
-       id="path3187" />
-    <path
-       transform="matrix(0,-1,1,0,-1.2246322,64.217515)"
-       sodipodi:end="4.0128851"
-       sodipodi:start="1.8673287"
-       d="M 26.704397,47.789447 A 15.604027,15.431048 0 0 1 21.217515,21.224632"
-       sodipodi:ry="15.431048"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2405"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 8;stroke-dashoffset:7.59999999999999964;stroke-opacity:1"
-       sodipodi:type="arc"
-       sodipodi:open="true" />
+         transform="translate(19.3,44.7) scale(2) rotate(225)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r7_wh.svg b/navit/xpm/nav_roundabout_r7_wh.svg
index 55eb52340..b27ab38e8 100644
--- a/navit/xpm/nav_roundabout_r7_wh.svg
+++ b/navit/xpm/nav_roundabout_r7_wh.svg
@@ -1,209 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r7_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="-0.155021"
-     inkscape:cy="21.115905"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="31.548758,7.9883072"
-       id="guide2674" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3186"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartoQ"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartoQ"
-       style="overflow:visible">
-      <path
-         id="path3743"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:open="true"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 28.068122,48.23451 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:start="1.7770659"
-       sodipodi:end="4.7233131"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 23.54 40.46 A 12 12 0 0 0 32 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="2.8164587"
-       d="M 16.477483,37.993317 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 32,63 L 32,44 A 12 12 0 1 0 23.54 40.46 L 19.3 44.7"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;marker-start:url(#Arrow2LstartoQ);marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 7,58 C 9.520096,55.175528 9.520096,55.175528 9.520096,55.175528"
-       id="path3456" />
-    <path
-       id="path3223"
-       d="M 16.241799,47.785685 L 20.236347,43.308678 L 20.236347,43.308678"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path3187"
-       d="M 35,61.7 L 35,48.5"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:open="true"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 8;stroke-dashoffset:7.6;stroke-opacity:1"
-       id="path2405"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.431048"
-       d="M 26.704397,47.789447 A 15.604027,15.431048 0 0 1 21.217515,21.224632"
-       sodipodi:start="1.8673287"
-       sodipodi:end="4.0128851"
-       transform="matrix(0,-1,1,0,-1.2246322,64.217515)" />
+         transform="translate(19.3,44.7) scale(2) rotate(225)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r8_bk.svg b/navit/xpm/nav_roundabout_r8_bk.svg
index 8a5c9ab68..743cb2f0d 100644
--- a/navit/xpm/nav_roundabout_r8_bk.svg
+++ b/navit/xpm/nav_roundabout_r8_bk.svg
@@ -1,192 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r8_bk.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="37.812778"
-     inkscape:cy="16.830763"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       id="grid2662"
-       type="xygrid" />
-    <sodipodi:guide
-       id="guide2664"
-       position="46.5,46.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2666"
-       position="15.5,15.5"
-       orientation="0,1" />
-    <sodipodi:guide
-       id="guide2670"
-       position="15.5,15.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2672"
-       position="46.5,46.5"
-       orientation="1,0" />
-    <sodipodi:guide
-       id="guide2676"
-       position="31.5,31.5"
-       orientation="0,1" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstart">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         id="path3850" />
-    </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend">
-      <path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3484" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2660"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       style="overflow:visible"
-       id="Arrow2Lstarto"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lstarto">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         id="path3186" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2LstartoF"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2LstartoF">
-      <path
-         transform="scale(1.1) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
-         id="path3296" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
+   height="64px">
+  <g>
     <path
-       transform="matrix(-1,0,0,1,63.089877,0)"
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.8150881"
-       d="M 27.48985,48.1026 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path2680"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
+       d="M 26 44 A 12 12 0 0 0 38 44"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       transform="translate(0.236017,2.0540018e-7)"
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3452"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 25.092137,47.297188 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:start="1.9774401"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true" />
+       d="M 38,63 L 38,44 A 12 12 0 1 0 26 44 L 26 50"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       id="path3456"
-       d="M 26.219141,61.563265 C 26.219141,57.777961 26.219141,57.777961 26.219141,57.777961"
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartoF);stroke:#000000;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1;fill:none" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 26.219141,53 L 26.219141,47 L 26.219141,47"
-       id="path3223" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.99999976000000013;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 35,62 L 35,48.184211"
-       id="path2400" />
+         transform="translate(26,50) scale(2) rotate(180)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         />
   </g>
 </svg>
diff --git a/navit/xpm/nav_roundabout_r8_wh.svg b/navit/xpm/nav_roundabout_r8_wh.svg
index cb9888752..d50e0c58c 100644
--- a/navit/xpm/nav_roundabout_r8_wh.svg
+++ b/navit/xpm/nav_roundabout_r8_wh.svg
@@ -1,192 +1,20 @@
 <?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="64px"
-   height="64px"
-   id="svg2652"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="nav_roundabout_r8_wh.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8894544"
-     inkscape:cx="8.360011"
-     inkscape:cy="32.560377"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10000"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     inkscape:snap-intersection-line-segments="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2662"
-       visible="true"
-       enabled="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="46.5,46.5"
-       id="guide2664" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.5,15.5"
-       id="guide2666" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.5"
-       id="guide2670" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.5,46.5"
-       id="guide2672" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="31.5,31.5"
-       id="guide2676" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2654">
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3484"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2660" />
-    <marker
-       inkscape:stockid="Arrow2Lstarto"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstarto"
-       style="overflow:visible">
-      <path
-         id="path3186"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2LstartN"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2LstartN"
-       style="overflow:visible">
-      <path
-         id="path3731"
-         style="stroke-linejoin:round;font-size:12.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.62500000;fill:#ffffff"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata2657">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+   height="64px">
+  <g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2680"
-       sodipodi:cx="31.263983"
-       sodipodi:cy="33.031879"
-       sodipodi:rx="15.604027"
-       sodipodi:ry="15.531879"
-       d="M 27.48985,48.1026 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:start="1.8150881"
-       sodipodi:end="4.7233131"
-       sodipodi:open="true"
-       transform="matrix(-1,0,0,1,63.089877,0)" />
+       d="M 26 44 A 12 12 0 0 0 38 44"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:2,4" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.7233131"
-       sodipodi:start="1.9774401"
-       d="M 25.092137,47.297188 A 15.604027,15.531879 0 0 1 31.43444,17.500927"
-       sodipodi:ry="15.531879"
-       sodipodi:rx="15.604027"
-       sodipodi:cy="33.031879"
-       sodipodi:cx="31.263983"
-       id="path3452"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc"
-       transform="translate(0.236017,2.0540018e-7)" />
+       d="M 38,63 L 38,44 A 12 12 0 1 0 26 44 L 26 50"
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
-       style="stroke-linejoin:miter;marker-end:none;stroke-opacity:1;fill-rule:evenodd;marker-start:url(#Arrow2LstartN);stroke:#ffffff;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1;fill:none"
-       d="M 26.219141,61.563265 C 26.219141,57.777961 26.219141,57.777961 26.219141,57.777961"
-       id="path3456" />
-    <path
-       id="path3223"
-       d="M 26.219141,53 L 26.219141,47 L 26.219141,47"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path2400"
-       d="M 35,62 L 35,48.184211"
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         transform="translate(26,50) scale(2) rotate(180)"
+         d="M -4,1 L 0,-7 L 4,1 C 2,-1 -2,-1 -4,1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         />
   </g>
 </svg>