Add:Core:Added icons for navigation

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

52 files changed, 10299 insertions, 1 deletions

diff --git a/navit/navit.xml b/navit/navit.xml
index 9f30b0cb..d761fc94 100644
--- a/navit/navit.xml
+++ b/navit/navit.xml
@@ -1517,7 +1517,82 @@ http://wiki.navit-project.org/index.php/Configuring_NavIt
 				<itemgra item_types="rg_point" order="12-">
 					<circle color="#FF089C" radius="10"  text_size="7" />
 				</itemgra>
-				<itemgra item_types="nav_straight,nav_turnaround,nav_right_1,nav_right_2,nav_right_3,nav_left_1,nav_left_2,nav_left_3,nav_roundabout_r1,nav_roundabout_r2,nav_roundabout_r3,nav_roundabout_r4,nav_roundabout_r5,nav_roundabout_r6,nav_roundabout_r7,nav_roundabout_r8,nav_roundabout_l1,nav_roundabout_l2,nav_roundabout_l3,nav_roundabout_l4,nav_roundabout_l5,nav_roundabout_l6,nav_roundabout_l7,nav_roundabout_l8,nav_none" order="0-">
+				<itemgra item_types="nav_left_1" order="0-">
+					<icon src="nav_left_1_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_left_2" order="0-">
+					<icon src ="nav_left_2_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_left_3" order="0-">
+					<icon src ="nav_left_3_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_right_1" order="0-">
+					<icon src ="nav_right_1_bk.svg" w="32" h="32" />
+				</itemgra>
+				 <itemgra item_types="nav_right_2" order="0-">
+					<icon src ="nav_right_2_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_right_3" order="0-">
+					<icon src ="nav_right_3_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_straight" order="0-">
+					<icon src ="nav_straight_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_turnaround_left" order="0-">
+					<icon src ="nav_turnaround_left_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_turnaround_right" order="0-">
+					<icon src ="nav_turnaround_right_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l1_bk" order="0-">
+					<icon src ="nav_roundabout_l1_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r1_bk" order="0-">
+					<icon src ="nav_roundabout_r1_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l2_bk" order="0-">
+					<icon src ="nav_roundabout_l2_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r2_bk" order="0-">
+					<icon src ="nav_roundabout_r2_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l3_bk" order="0-">
+					<icon src ="nav_roundabout_l3_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r3_bk" order="0-">
+					<icon src ="nav_roundabout_r3_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l4_bk" order="0-">
+					<icon src ="nav_roundabout_l4_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r4_bk" order="0-">
+					<icon src ="nav_roundabout_r4_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l5_bk" order="0-">
+					<icon src ="nav_roundabout_l5_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r5_bk" order="0-">
+					<icon src ="nav_roundabout_r5_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l6_bk" order="0-">
+					<icon src ="nav_roundabout_l6_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r6_bk" order="0-">
+					<icon src ="nav_roundabout_r6_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l7_bk" order="0-">
+					<icon src ="nav_roundabout_l7_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r7_bk" order="0-">
+					<icon src ="nav_roundabout_r7_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_l8_bk" order="0-">
+					<icon src ="nav_roundabout_l8_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_roundabout_r8_bk" order="0-">
+					<icon src ="nav_roundabout_r8_bk.svg" w="32" h="32" />
+				</itemgra>
+				<itemgra item_types="nav_none" order="0-">
 					<icon src="unknown.xpm" />
 				</itemgra>
 
diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am
index 5fe99d63..c637cc2e 100644
--- a/navit/xpm/Makefile.am
+++ b/navit/xpm/Makefile.am
@@ -103,6 +103,19 @@ svgs += gui_zoom_out.svg
 svgs += zoom_in.svg
 svgs += zoom_out.svg
 
+nav_svgs =  nav_left_1_bk.svg nav_left_1_wh.svg nav_left_2_bk.svg nav_left_2_wh.svg nav_left_3_bk.svg nav_left_3_wh.svg
+nav_svgs += nav_right_1_bk.svg nav_right_1_wh.svg nav_right_2_bk.svg nav_right_2_wh.svg nav_right_3_bk.svg nav_right_3_wh.svg
+nav_svgs += nav_roundabout_l1_bk.svg nav_roundabout_l1_wh.svg nav_roundabout_l2_bk.svg nav_roundabout_l2_wh.svg
+nav_svgs += nav_roundabout_l3_bk.svg nav_roundabout_l3_wh.svg nav_roundabout_l4_bk.svg nav_roundabout_l4_wh.svg
+nav_svgs += nav_roundabout_l5_bk.svg nav_roundabout_l5_wh.svg nav_roundabout_l6_bk.svg nav_roundabout_l6_wh.svg
+nav_svgs += nav_roundabout_l7_bk.svg nav_roundabout_l7_wh.svg nav_roundabout_l8_bk.svg nav_roundabout_l8_wh.svg
+nav_svgs += nav_roundabout_r1_bk.svg nav_roundabout_r1_wh.svg nav_roundabout_r2_bk.svg nav_roundabout_r2_wh.svg
+nav_svgs += nav_roundabout_r3_bk.svg nav_roundabout_r3_wh.svg nav_roundabout_r4_bk.svg nav_roundabout_r4_wh.svg
+nav_svgs += nav_roundabout_r5_bk.svg nav_roundabout_r5_wh.svg nav_roundabout_r6_bk.svg nav_roundabout_r6_wh.svg
+nav_svgs += nav_roundabout_r7_bk.svg nav_roundabout_r7_wh.svg nav_roundabout_r8_bk.svg nav_roundabout_r8_wh.svg
+nav_svgs += nav_straight_bk.svg nav_straight_wh.svg nav_turnaround_left_bk.svg nav_turnaround_left_wh.svg
+nav_svgs += nav_turnaround_right_bk.svg nav_turnaround_right_wh.svg
+
 flag_svgs  = country_AD.svgz country_AE.svgz country_AF.svgz country_AG.svgz country_AI.svgz country_AL.svgz country_AM.svgz
 flag_svgs += country_AN.svgz country_AO.svgz country_AR.svgz country_AS.svgz country_AT.svgz country_AU.svgz country_AW.svgz
 flag_svgs += country_AX.svgz country_AZ.svgz country_BA.svgz country_BB.svgz country_BD.svgz country_BE.svgz country_BF.svgz
diff --git a/navit/xpm/nav_left_1_bk.svg b/navit/xpm/nav_left_1_bk.svg
new file mode 100644
index 00000000..199b515c
--- /dev/null
+++ b/navit/xpm/nav_left_1_bk.svg
@@ -0,0 +1,232 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_left_1_32.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="5.5"
+     inkscape:cx="-10.347054"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="42.727273,42.909091" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <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="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2Lendl"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lendl">
+      <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="path3200" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlA"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlA">
+      <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="path3292" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlAs"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlAs">
+      <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="path3367" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path6512"
+       d="M 32.553571,63 L 32.553571,42.028303"
+       style="fill:none;fill-rule:evenodd;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="path7071"
+       d="M 32.553571,42.028303 C 32.553571,31.49843 32.463178,31.409364 22.025511,20.971697"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="path8163"
+       d="M 18.075585,18.25716 L 8.921827,8.921827"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2LendlAs);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_left_1_wh.svg b/navit/xpm/nav_left_1_wh.svg
new file mode 100644
index 00000000..8e05385f
--- /dev/null
+++ b/navit/xpm/nav_left_1_wh.svg
@@ -0,0 +1,232 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_left_1_32.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="5.5"
+     inkscape:cx="-10.347054"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="42.727273,42.909091" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <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="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2Lendl"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lendl">
+      <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="path3200" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlA"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlA">
+      <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="path3292" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlAs"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlAs">
+      <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="path3367" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path6512"
+       d="M 32.553571,63 L 32.553571,42.028303"
+       style="fill:none;fill-rule:evenodd;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="path7071"
+       d="M 32.553571,42.028303 C 32.553571,31.49843 32.463178,31.409364 22.025511,20.971697"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="path8163"
+       d="M 18.075585,18.25716 L 8.921827,8.921827"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2LendlAs);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_left_2_bk.svg b/navit/xpm/nav_left_2_bk.svg
new file mode 100644
index 00000000..f12c47cf
--- /dev/null
+++ b/navit/xpm/nav_left_2_bk.svg
@@ -0,0 +1,216 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_left_2_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="5.5"
+     inkscape:cx="-10.347054"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="17.454545,31.636364"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="51.454545,51.636364"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="39.818182,42.545455"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="4.681818,4.681818"
+       orientation="-54.636364,0"
+       id="guide7095" />
+    <sodipodi:guide
+       position="4.681818,59.318182"
+       orientation="0,54.636364"
+       id="guide7097" />
+    <sodipodi:guide
+       position="59.318182,59.318182"
+       orientation="54.636364,0"
+       id="guide7099" />
+    <sodipodi:guide
+       position="59.318182,4.681818"
+       orientation="0,-54.636364"
+       id="guide7101" />
+    <sodipodi:guide
+       position="11.954546,12.136364"
+       orientation="-39.727272,0"
+       id="guide8153" />
+    <sodipodi:guide
+       position="11.954546,51.863636"
+       orientation="0,39.727272"
+       id="guide8155" />
+    <sodipodi:guide
+       position="51.681818,51.863636"
+       orientation="39.727272,0"
+       id="guide8157" />
+    <sodipodi:guide
+       position="51.681818,12.136364"
+       orientation="0,-39.727272"
+       id="guide8159" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path4553"
+         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>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4535"
+         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) rotate(180) translate(12.5,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow2LendM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2LendM"
+       style="overflow:visible;">
+      <path
+         id="path3200"
+         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="Arrow2LendMl"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2LendMl"
+       style="overflow:visible;">
+      <path
+         id="path3225"
+         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) rotate(180) translate(1,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 31.999757,63.5 L 31.999757,42.528303"
+       id="path6512"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 31.999757,42.528303 C 31.999757,31.99843 32.181576,32 21.471697,32"
+       id="path7071"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow2LendMl);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:2;fill:none"
+       d="M 11.954546,32 L 2.800788,32"
+       id="path8163"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_left_2_wh.svg b/navit/xpm/nav_left_2_wh.svg
new file mode 100644
index 00000000..e4bee6d3
--- /dev/null
+++ b/navit/xpm/nav_left_2_wh.svg
@@ -0,0 +1,203 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_left_2_32.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="5.5"
+     inkscape:cx="-10.347054"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="51.454545,51.636364" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="39.818182,42.545455" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <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="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2LendM"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendM">
+      <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="path3200" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path6512"
+       d="M 31.999757,63.5 L 31.999757,42.528303"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7071"
+       d="M 31.999757,42.528303 C 31.999757,31.99843 32.181576,32 21.471697,32"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path8163"
+       d="M 11.954546,32 L 2.800788,32"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2LendM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_left_3_bk.svg b/navit/xpm/nav_left_3_bk.svg
new file mode 100644
index 00000000..40c871ab
--- /dev/null
+++ b/navit/xpm/nav_left_3_bk.svg
@@ -0,0 +1,220 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_left_3_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="6.77"
+     inkscape:cx="-31.140728"
+     inkscape:cy="36.113727"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-13.454545,32"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="51.454545,51.636364"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="21.471697,42.528303"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="42.52806,21.471697"
+       orientation="0,-21.056363"
+       id="guide5431" />
+    <sodipodi:guide
+       position="4.681818,4.681818"
+       orientation="-54.636364,0"
+       id="guide7095" />
+    <sodipodi:guide
+       position="4.681818,59.318182"
+       orientation="0,54.636364"
+       id="guide7097" />
+    <sodipodi:guide
+       position="59.318182,59.318182"
+       orientation="54.636364,0"
+       id="guide7099" />
+    <sodipodi:guide
+       position="59.318182,4.681818"
+       orientation="0,-54.636364"
+       id="guide7101" />
+    <sodipodi:guide
+       position="11.954546,12.136364"
+       orientation="-39.727272,0"
+       id="guide8153" />
+    <sodipodi:guide
+       position="11.954546,51.863636"
+       orientation="0,39.727272"
+       id="guide8155" />
+    <sodipodi:guide
+       position="51.681818,51.863636"
+       orientation="39.727272,0"
+       id="guide8157" />
+    <sodipodi:guide
+       position="51.681818,12.136364"
+       orientation="0,-39.727272"
+       id="guide8159" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path4553"
+         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>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4535"
+         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) rotate(180) translate(12.5,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow2Lendj"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lendj"
+       style="overflow:visible;">
+      <path
+         id="path3200"
+         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="Arrow2Lendjk"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lendjk"
+       style="overflow:visible;">
+      <path
+         id="path3227"
+         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) rotate(180) translate(1,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 31.818181,62.598664 L 31.818181,36.901335"
+       id="path6512"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 31.818181,40.162636 C 31.818181,25.498456 31.818181,25.498456 14.93857,40.162298"
+       id="path7071"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow2Lendjk);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.49999988000000006;fill:none"
+       d="M 11.954546,42.528303 L 4.524476,49.978534"
+       id="path8163"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_left_3_wh.svg b/navit/xpm/nav_left_3_wh.svg
new file mode 100644
index 00000000..0231a57f
--- /dev/null
+++ b/navit/xpm/nav_left_3_wh.svg
@@ -0,0 +1,207 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_left_3_32.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="6.77"
+     inkscape:cx="-0.34309118"
+     inkscape:cy="36.113727"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="51.454545,51.636364" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <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="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2Lendj"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lendj">
+      <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:#ffffff"
+         id="path3200" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path6512"
+       d="M 31.818181,62.598664 L 31.818181,36.901335"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7071"
+       d="M 31.818181,40.162636 C 31.818181,25.498456 31.818181,25.498456 14.93857,40.162298"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path8163"
+       d="M 11.954546,42.528303 L 4.524476,49.978534"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lendj);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_right_1_bk.svg b/navit/xpm/nav_right_1_bk.svg
new file mode 100644
index 00000000..a8de1885
--- /dev/null
+++ b/navit/xpm/nav_right_1_bk.svg
@@ -0,0 +1,245 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_right_1_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="5.5"
+     inkscape:cx="-10.528872"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="42.727273,42.909091" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <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="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2Lendl"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lendl">
+      <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="path3200" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlA"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlA">
+      <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="path3292" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlAs"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlAs">
+      <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="path3367" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlAsm"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlAsm">
+      <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="path3329" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path6512"
+       d="M 32,63.318425 L 32,42.346728"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7071"
+       d="M 32,42.346728 C 32,31.816855 32.090393,31.727789 42.52806,21.290122"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path8163"
+       d="M 46.477986,18.575585 L 55.631744,9.240252"
+       style="stroke-linejoin:miter;marker-end:url(#Arrow2LendlAsm);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:2;fill:none" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_right_1_wh.svg b/navit/xpm/nav_right_1_wh.svg
new file mode 100644
index 00000000..a17fd3fa
--- /dev/null
+++ b/navit/xpm/nav_right_1_wh.svg
@@ -0,0 +1,236 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_right_1_32.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="5.5"
+     inkscape:cx="-10.528872"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="42.727273,42.909091" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <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="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2Lendl"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lendl">
+      <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="path3200" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlA"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlA">
+      <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="path3292" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2LendlAs"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LendlAs">
+      <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="path3367" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <g
+       id="g3411"
+       transform="matrix(-1,0,0,1,64.553571,0.318425)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 32.553571,63 L 32.553571,42.028303"
+         id="path6512"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 32.553571,42.028303 C 32.553571,31.49843 32.463178,31.409364 22.025511,20.971697"
+         id="path7071"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2LendlAs);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 18.075585,18.25716 L 8.921827,8.921827"
+         id="path8163" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/nav_right_2_bk.svg b/navit/xpm/nav_right_2_bk.svg
new file mode 100644
index 00000000..66885538
--- /dev/null
+++ b/navit/xpm/nav_right_2_bk.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_right_2_bk.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="28.927273"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="45.454545,31.818182"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="51.454545,51.636364"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="21.471697,42.528303"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="42.52806,21.471697"
+       orientation="0,-21.056363"
+       id="guide5431" />
+    <sodipodi:guide
+       position="4.681818,4.681818"
+       orientation="-54.636364,0"
+       id="guide7095" />
+    <sodipodi:guide
+       position="4.681818,59.318182"
+       orientation="0,54.636364"
+       id="guide7097" />
+    <sodipodi:guide
+       position="59.318182,59.318182"
+       orientation="54.636364,0"
+       id="guide7099" />
+    <sodipodi:guide
+       position="59.318182,4.681818"
+       orientation="0,-54.636364"
+       id="guide7101" />
+    <sodipodi:guide
+       position="11.954546,12.136364"
+       orientation="-39.727272,0"
+       id="guide8153" />
+    <sodipodi:guide
+       position="11.954546,51.863636"
+       orientation="0,39.727272"
+       id="guide8155" />
+    <sodipodi:guide
+       position="51.681818,51.863636"
+       orientation="39.727272,0"
+       id="guide8157" />
+    <sodipodi:guide
+       position="51.681818,12.136364"
+       orientation="0,-39.727272"
+       id="guide8159" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4553"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path4535"
+         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.8,0,0,-0.8,-10,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow2Lend7"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend7"
+       style="overflow:visible">
+      <path
+         id="path3196"
+         style="font-size:12px;fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend7s"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend7s"
+       style="overflow:visible">
+      <path
+         id="path3227"
+         style="stroke-linejoin:round;font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;fill:#000000"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 32,42.710121 C 32,32.180248 31.818181,32.181818 42.52806,32.181818"
+       id="path7071"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow2Lend7s);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:2;fill:none"
+       d="M 51.681818,32.181818 L 60.835576,32.181818"
+       id="path8163"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 32,63.5 L 32,54.545455 L 32,42.528303"
+       id="path6512"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_right_2_wh.svg b/navit/xpm/nav_right_2_wh.svg
new file mode 100644
index 00000000..3ae64cdd
--- /dev/null
+++ b/navit/xpm/nav_right_2_wh.svg
@@ -0,0 +1,208 @@
+<?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="64"
+   height="64"
+   id="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_right_2_32.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="28.927273"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="45.454545,31.818182" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="51.454545,51.636364" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+    <sodipodi:guide
+       id="guide7095"
+       orientation="-54.636364,0"
+       position="4.681818,4.681818" />
+    <sodipodi:guide
+       id="guide7097"
+       orientation="0,54.636364"
+       position="4.681818,59.318182" />
+    <sodipodi:guide
+       id="guide7099"
+       orientation="54.636364,0"
+       position="59.318182,59.318182" />
+    <sodipodi:guide
+       id="guide7101"
+       orientation="0,-54.636364"
+       position="59.318182,4.681818" />
+    <sodipodi:guide
+       id="guide8153"
+       orientation="-39.727272,0"
+       position="11.954546,12.136364" />
+    <sodipodi:guide
+       id="guide8155"
+       orientation="0,39.727272"
+       position="11.954546,51.863636" />
+    <sodipodi:guide
+       id="guide8157"
+       orientation="39.727272,0"
+       position="51.681818,51.863636" />
+    <sodipodi:guide
+       id="guide8159"
+       orientation="0,-39.727272"
+       position="51.681818,12.136364" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path4553" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
+         id="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow2Lend7"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend7">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
+         style="font-size:12px;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round"
+         id="path3196" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7071"
+       d="M 32,42.710121 C 32,32.180248 31.818181,32.181818 42.52806,32.181818"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path8163"
+       d="M 51.681818,32.181818 L 60.835576,32.181818"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend7);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccc"
+       id="path6512"
+       d="M 32,63.5 L 32,54.545455 L 32,42.528303"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_right_3_bk.svg b/navit/xpm/nav_right_3_bk.svg
new file mode 100644
index 00000000..1b03813f
--- /dev/null
+++ b/navit/xpm/nav_right_3_bk.svg
@@ -0,0 +1,220 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_right_3_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="6.77"
+     inkscape:cx="-0.49080167"
+     inkscape:cy="29.294496"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-13.454545,32"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="51.454545,51.636364"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="21.471697,42.528303"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="42.52806,21.471697"
+       orientation="0,-21.056363"
+       id="guide5431" />
+    <sodipodi:guide
+       position="4.681818,4.681818"
+       orientation="-54.636364,0"
+       id="guide7095" />
+    <sodipodi:guide
+       position="4.681818,59.318182"
+       orientation="0,54.636364"
+       id="guide7097" />
+    <sodipodi:guide
+       position="59.318182,59.318182"
+       orientation="54.636364,0"
+       id="guide7099" />
+    <sodipodi:guide
+       position="59.318182,4.681818"
+       orientation="0,-54.636364"
+       id="guide7101" />
+    <sodipodi:guide
+       position="11.954546,12.136364"
+       orientation="-39.727272,0"
+       id="guide8153" />
+    <sodipodi:guide
+       position="11.954546,51.863636"
+       orientation="0,39.727272"
+       id="guide8155" />
+    <sodipodi:guide
+       position="51.681818,51.863636"
+       orientation="39.727272,0"
+       id="guide8157" />
+    <sodipodi:guide
+       position="51.681818,12.136364"
+       orientation="0,-39.727272"
+       id="guide8159" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path4553"
+         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>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4535"
+         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) rotate(180) translate(12.5,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow2Lendj"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lendj"
+       style="overflow:visible;">
+      <path
+         id="path3200"
+         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="Arrow2LendjS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2LendjS"
+       style="overflow:visible;">
+      <path
+         id="path3231"
+         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) rotate(180) translate(1,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.802712,62.598664 L 34.802712,36.901335"
+       id="path6512"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.802712,40.162636 C 34.802712,25.498456 34.802712,25.498456 51.682323,40.162298"
+       id="path7071"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow2LendjS);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.49999988000000006;fill:none"
+       d="M 54.666347,42.528303 L 62.096417,49.978534"
+       id="path8163"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_right_3_wh.svg b/navit/xpm/nav_right_3_wh.svg
new file mode 100644
index 00000000..c3a30284
--- /dev/null
+++ b/navit/xpm/nav_right_3_wh.svg
@@ -0,0 +1,220 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_right_3_wh.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="6.77"
+     inkscape:cx="17.955687"
+     inkscape:cy="29.294496"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-13.454545,32"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="51.454545,51.636364"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="21.471697,42.528303"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="42.52806,21.471697"
+       orientation="0,-21.056363"
+       id="guide5431" />
+    <sodipodi:guide
+       position="4.681818,4.681818"
+       orientation="-54.636364,0"
+       id="guide7095" />
+    <sodipodi:guide
+       position="4.681818,59.318182"
+       orientation="0,54.636364"
+       id="guide7097" />
+    <sodipodi:guide
+       position="59.318182,59.318182"
+       orientation="54.636364,0"
+       id="guide7099" />
+    <sodipodi:guide
+       position="59.318182,4.681818"
+       orientation="0,-54.636364"
+       id="guide7101" />
+    <sodipodi:guide
+       position="11.954546,12.136364"
+       orientation="-39.727272,0"
+       id="guide8153" />
+    <sodipodi:guide
+       position="11.954546,51.863636"
+       orientation="0,39.727272"
+       id="guide8155" />
+    <sodipodi:guide
+       position="51.681818,51.863636"
+       orientation="39.727272,0"
+       id="guide8157" />
+    <sodipodi:guide
+       position="51.681818,12.136364"
+       orientation="0,-39.727272"
+       id="guide8159" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path4553"
+         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>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4535"
+         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) rotate(180) translate(12.5,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow2Lendj"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lendj"
+       style="overflow:visible;">
+      <path
+         id="path3200"
+         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) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lendt"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lendt"
+       style="overflow:visible;">
+      <path
+         id="path3758"
+         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="metadata5359">
+    <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">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.802712,62.598664 L 34.802712,36.901335"
+       id="path6512"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.802712,40.162636 C 34.802712,25.498456 34.802712,25.498456 51.682323,40.162298"
+       id="path7071"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow2Lendt);stroke-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.50000000000000000;fill:none"
+       d="M 54.666347,42.528303 L 62.096417,49.978534"
+       id="path8163"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l1_bk.svg b/navit/xpm/nav_roundabout_l1_bk.svg
new file mode 100644
index 00000000..22158a00
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l1_bk.svg
@@ -0,0 +1,206 @@
+<?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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l1_wh.svg b/navit/xpm/nav_roundabout_l1_wh.svg
new file mode 100644
index 00000000..22428200
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l1_wh.svg
@@ -0,0 +1,193 @@
+<?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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l2_bk.svg b/navit/xpm/nav_roundabout_l2_bk.svg
new file mode 100644
index 00000000..7a0741df
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l2_bk.svg
@@ -0,0 +1,206 @@
+<?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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l2_wh.svg b/navit/xpm/nav_roundabout_l2_wh.svg
new file mode 100644
index 00000000..cbdab770
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l2_wh.svg
@@ -0,0 +1,206 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l3_bk.svg b/navit/xpm/nav_roundabout_l3_bk.svg
new file mode 100644
index 00000000..d1714115
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l3_bk.svg
@@ -0,0 +1,194 @@
+<?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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l3_wh.svg b/navit/xpm/nav_roundabout_l3_wh.svg
new file mode 100644
index 00000000..83e7f7d4
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l3_wh.svg
@@ -0,0 +1,181 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l4_bk.svg b/navit/xpm/nav_roundabout_l4_bk.svg
new file mode 100644
index 00000000..c7e70b2e
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l4_bk.svg
@@ -0,0 +1,192 @@
+<?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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l4_wh.svg b/navit/xpm/nav_roundabout_l4_wh.svg
new file mode 100644
index 00000000..e67bb2b3
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l4_wh.svg
@@ -0,0 +1,192 @@
+<?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="#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:#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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l5_bk.svg b/navit/xpm/nav_roundabout_l5_bk.svg
new file mode 100644
index 00000000..b10c4c15
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l5_bk.svg
@@ -0,0 +1,194 @@
+<?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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l5_wh.svg b/navit/xpm/nav_roundabout_l5_wh.svg
new file mode 100644
index 00000000..b5e87e65
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l5_wh.svg
@@ -0,0 +1,194 @@
+<?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="#000000"
+     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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l6_bk.svg b/navit/xpm/nav_roundabout_l6_bk.svg
new file mode 100644
index 00000000..7489358a
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l6_bk.svg
@@ -0,0 +1,206 @@
+<?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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l6_wh.svg b/navit/xpm/nav_roundabout_l6_wh.svg
new file mode 100644
index 00000000..8edfa5eb
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l6_wh.svg
@@ -0,0 +1,206 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l7_bk.svg b/navit/xpm/nav_roundabout_l7_bk.svg
new file mode 100644
index 00000000..5eeafa42
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l7_bk.svg
@@ -0,0 +1,206 @@
+<?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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l7_wh.svg b/navit/xpm/nav_roundabout_l7_wh.svg
new file mode 100644
index 00000000..4544fa7b
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l7_wh.svg
@@ -0,0 +1,206 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l8_bk.svg b/navit/xpm/nav_roundabout_l8_bk.svg
new file mode 100644
index 00000000..896c0a8b
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l8_bk.svg
@@ -0,0 +1,205 @@
+<?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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_l8_wh.svg b/navit/xpm/nav_roundabout_l8_wh.svg
new file mode 100644
index 00000000..9eecdec8
--- /dev/null
+++ b/navit/xpm/nav_roundabout_l8_wh.svg
@@ -0,0 +1,192 @@
+<?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="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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r1_bk.svg b/navit/xpm/nav_roundabout_r1_bk.svg
new file mode 100644
index 00000000..ef50bf89
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r1_bk.svg
@@ -0,0 +1,211 @@
+<?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>
+    <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)" />
+    <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(#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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r1_wh.svg b/navit/xpm/nav_roundabout_r1_wh.svg
new file mode 100644
index 00000000..54b0552e
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r1_wh.svg
@@ -0,0 +1,211 @@
+<?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="#010000"
+     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>
+    <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)" />
+    <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(#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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r2_bk.svg b/navit/xpm/nav_roundabout_r2_bk.svg
new file mode 100644
index 00000000..a2f1e0aa
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r2_bk.svg
@@ -0,0 +1,194 @@
+<?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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r2_wh.svg b/navit/xpm/nav_roundabout_r2_wh.svg
new file mode 100644
index 00000000..b28ab6a4
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r2_wh.svg
@@ -0,0 +1,181 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r3_bk.svg b/navit/xpm/nav_roundabout_r3_bk.svg
new file mode 100644
index 00000000..9803832e
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r3_bk.svg
@@ -0,0 +1,219 @@
+<?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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r3_wh.svg b/navit/xpm/nav_roundabout_r3_wh.svg
new file mode 100644
index 00000000..d603da34
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r3_wh.svg
@@ -0,0 +1,206 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r4_bk.svg b/navit/xpm/nav_roundabout_r4_bk.svg
new file mode 100644
index 00000000..ccec6b59
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r4_bk.svg
@@ -0,0 +1,205 @@
+<?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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r4_wh.svg b/navit/xpm/nav_roundabout_r4_wh.svg
new file mode 100644
index 00000000..a9b869e7
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r4_wh.svg
@@ -0,0 +1,205 @@
+<?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="#000000"
+     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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r5_bk.svg b/navit/xpm/nav_roundabout_r5_bk.svg
new file mode 100644
index 00000000..dc8c962b
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r5_bk.svg
@@ -0,0 +1,206 @@
+<?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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r5_wh.svg b/navit/xpm/nav_roundabout_r5_wh.svg
new file mode 100644
index 00000000..00e7a4ce
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r5_wh.svg
@@ -0,0 +1,206 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r6_bk.svg b/navit/xpm/nav_roundabout_r6_bk.svg
new file mode 100644
index 00000000..0fd18c6a
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r6_bk.svg
@@ -0,0 +1,206 @@
+<?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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r6_wh.svg b/navit/xpm/nav_roundabout_r6_wh.svg
new file mode 100644
index 00000000..c8d62652
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r6_wh.svg
@@ -0,0 +1,206 @@
+<?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="#000000"
+     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">
+    <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" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r7_bk.svg b/navit/xpm/nav_roundabout_r7_bk.svg
new file mode 100644
index 00000000..b04e9630
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r7_bk.svg
@@ -0,0 +1,209 @@
+<?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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r7_wh.svg b/navit/xpm/nav_roundabout_r7_wh.svg
new file mode 100644
index 00000000..1a015415
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r7_wh.svg
@@ -0,0 +1,209 @@
+<?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="#000000"
+     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">
+    <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)" />
+    <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)" />
+    <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)" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r8_bk.svg b/navit/xpm/nav_roundabout_r8_bk.svg
new file mode 100644
index 00000000..8a5c9ab6
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r8_bk.svg
@@ -0,0 +1,192 @@
+<?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">
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_roundabout_r8_wh.svg b/navit/xpm/nav_roundabout_r8_wh.svg
new file mode 100644
index 00000000..b3f63e15
--- /dev/null
+++ b/navit/xpm/nav_roundabout_r8_wh.svg
@@ -0,0 +1,192 @@
+<?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="#000000"
+     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">
+    <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)" />
+    <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)" />
+    <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" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_straight_bk.svg b/navit/xpm/nav_straight_bk.svg
new file mode 100644
index 00000000..58e0d6d7
--- /dev/null
+++ b/navit/xpm/nav_straight_bk.svg
@@ -0,0 +1,171 @@
+<?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_straight.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.92"
+     inkscape:cx="28.141129"
+     inkscape:cy="36.467742"
+     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="15.725806,31.350806"
+       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="Arrow2LstartR"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LstartR">
+      <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="path4252" />
+    </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">
+    <path
+       d=""
+       sodipodi:nodetypes="cc"
+       id="path3320"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3371"
+       d="M 32.137724,23.925986 C 31.936111,64.306691 32.036918,63.626118 32.036918,63.626118"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path3713"
+       d="M 32.081666,4.9487553 C 32.182474,15.432627 32.182474,15.432627 32.182474,15.432627"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow2LstartR);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_straight_wh.svg b/navit/xpm/nav_straight_wh.svg
new file mode 100644
index 00000000..58e0d6d7
--- /dev/null
+++ b/navit/xpm/nav_straight_wh.svg
@@ -0,0 +1,171 @@
+<?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_straight.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.92"
+     inkscape:cx="28.141129"
+     inkscape:cy="36.467742"
+     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="15.725806,31.350806"
+       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="Arrow2LstartR"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2LstartR">
+      <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="path4252" />
+    </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">
+    <path
+       d=""
+       sodipodi:nodetypes="cc"
+       id="path3320"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3371"
+       d="M 32.137724,23.925986 C 31.936111,64.306691 32.036918,63.626118 32.036918,63.626118"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path3713"
+       d="M 32.081666,4.9487553 C 32.182474,15.432627 32.182474,15.432627 32.182474,15.432627"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow2LstartR);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_turnaround_left_bk.svg b/navit/xpm/nav_turnaround_left_bk.svg
new file mode 100644
index 00000000..10f44efb
--- /dev/null
+++ b/navit/xpm/nav_turnaround_left_bk.svg
@@ -0,0 +1,183 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_turnaround_left_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="5.5"
+     inkscape:cx="18.984763"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0">
+    <sodipodi:guide
+       position="-13.454545,32"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="0.5,0.5"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="21.471697,42.528303"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="42.52806,21.471697"
+       orientation="0,-21.056363"
+       id="guide5431" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4535"
+         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) rotate(180) translate(12.5,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow1Lend6"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend6"
+       style="overflow:visible;">
+      <path
+         id="path3182"
+         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="marker-start:none;stroke:#ffffff;stroke-width:1.0pt;fill:#ffffff;fill-rule:evenodd"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend6I"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend6I"
+       style="overflow:visible;">
+      <path
+         id="path4584"
+         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;marker-start:none;stroke:#000000;stroke-width:1.0pt;fill:#000000"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5435"
+       sodipodi:cx="31.999878"
+       sodipodi:cy="32"
+       sodipodi:rx="10.528181"
+       sodipodi:ry="10.528303"
+       d="M 21.471697,32 A 10.528181,10.528303 0 0 1 42.528059,32"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       sodipodi:open="true"
+       transform="matrix(-1,0,0,1,64,0)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 42.528303,63.5 L 42.528303,32 L 42.528303,35.818182"
+       id="path5437" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow1Lend6I);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.39999999999999991;fill:none"
+       d="M 21.471697,51.426796 L 21.471353,57.161363"
+       id="path5439" />
+    <path
+       id="path3225"
+       d="M 21.471697,42.528303 C 21.471697,30.563347 21.471697,30.563347 21.471697,30.563347"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_turnaround_left_wh.svg b/navit/xpm/nav_turnaround_left_wh.svg
new file mode 100644
index 00000000..f82d5ace
--- /dev/null
+++ b/navit/xpm/nav_turnaround_left_wh.svg
@@ -0,0 +1,196 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_turnaround_left_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="5.5"
+     inkscape:cx="-18.924328"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="0.5,0.5" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow1Lend6"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend6">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="marker-start:none;stroke:#ffffff;stroke-width:1.0pt;fill:#ffffff;fill-rule:evenodd"
+         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="path3182" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend6I"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend6I">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="fill-rule:evenodd;marker-start:none;stroke:#000000;stroke-width:1.0pt;fill:#000000"
+         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="path4584" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend6Iy"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend6Iy">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="marker-start:none;stroke:#ffffff;stroke-width:1.0pt;fill:#ffffff;fill-rule:evenodd"
+         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="path3212" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       transform="matrix(-1,0,0,1,64,0)"
+       sodipodi:open="true"
+       sodipodi:end="6.2831853"
+       sodipodi:start="3.1415927"
+       d="M 21.471697,32 A 10.528181,10.528303 0 0 1 42.528059,32"
+       sodipodi:ry="10.528303"
+       sodipodi:rx="10.528181"
+       sodipodi:cy="32"
+       sodipodi:cx="31.999878"
+       id="path5435"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       id="path5437"
+       d="M 42.528303,63.5 L 42.528303,32 L 42.528303,35.818182"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="path5439"
+       d="M 21.471697,51.426796 L 21.471353,57.161363"
+       style="stroke-linejoin:miter;marker-end:url(#Arrow1Lend6Iy);stroke-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.39999999999999991;fill:none" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.471697,42.528303 C 21.471697,30.563347 21.471697,30.563347 21.471697,30.563347"
+       id="path3225" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_turnaround_right_bk.svg b/navit/xpm/nav_turnaround_right_bk.svg
new file mode 100644
index 00000000..5971b139
--- /dev/null
+++ b/navit/xpm/nav_turnaround_right_bk.svg
@@ -0,0 +1,183 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_turnaround_right_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="5.5"
+     inkscape:cx="18.984763"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0">
+    <sodipodi:guide
+       position="-13.454545,32"
+       orientation="0,92.545454"
+       id="guide5372" />
+    <sodipodi:guide
+       position="32,68.363636"
+       orientation="88.363636,0"
+       id="guide5374" />
+    <sodipodi:guide
+       position="0.5,78"
+       orientation="98.545455,0"
+       id="guide5395" />
+    <sodipodi:guide
+       position="-17.454545,0.5"
+       orientation="0,95.818181"
+       id="guide5397" />
+    <sodipodi:guide
+       position="-23.090909,63.5"
+       orientation="0,103.45454"
+       id="guide5399" />
+    <sodipodi:guide
+       position="63.5,76.727273"
+       orientation="99.454546,0"
+       id="guide5401" />
+    <sodipodi:guide
+       position="0.5,0.5"
+       orientation="-63,63"
+       id="guide5407" />
+    <sodipodi:guide
+       position="0.5,63.5"
+       orientation="63,63"
+       id="guide5409" />
+    <sodipodi:guide
+       position="21.471697,21.471697"
+       orientation="-21.056606,0"
+       id="guide5425" />
+    <sodipodi:guide
+       position="21.471697,42.528303"
+       orientation="0,21.056363"
+       id="guide5427" />
+    <sodipodi:guide
+       position="42.52806,42.528303"
+       orientation="21.056606,0"
+       id="guide5429" />
+    <sodipodi:guide
+       position="42.52806,21.471697"
+       orientation="0,-21.056363"
+       id="guide5431" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4535"
+         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) rotate(180) translate(12.5,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="perspective5362" />
+    <marker
+       inkscape:stockid="Arrow1Lend6"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend6"
+       style="overflow:visible;">
+      <path
+         id="path3182"
+         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="marker-start:none;stroke:#ffffff;stroke-width:1.0pt;fill:#ffffff;fill-rule:evenodd"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend69"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend69"
+       style="overflow:visible;">
+      <path
+         id="path3206"
+         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;marker-start:none;stroke:#000000;stroke-width:1.0pt;fill:#000000"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 32,63.5 L 32,32 L 32,35.818182"
+       id="path5437" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5435"
+       sodipodi:cx="31.999878"
+       sodipodi:cy="32"
+       sodipodi:rx="10.528181"
+       sodipodi:ry="10.528303"
+       d="M 21.471697,32 A 10.528181,10.528303 0 0 1 42.528059,32"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       sodipodi:open="true"
+       transform="translate(10.528303,4.8862073e-7)" />
+    <path
+       style="stroke-linejoin:miter;marker-end:url(#Arrow1Lend69);stroke-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.39999998000000003;fill:none"
+       d="M 53.108812,47.37459 L 53.109156,53.109157"
+       id="path5439" />
+    <path
+       id="path3225"
+       d="M 53.056362,41.073758 C 53.056362,30.545455 53.056362,30.545455 53.056362,30.545455"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/xpm/nav_turnaround_right_wh.svg b/navit/xpm/nav_turnaround_right_wh.svg
new file mode 100644
index 00000000..e14aea4c
--- /dev/null
+++ b/navit/xpm/nav_turnaround_right_wh.svg
@@ -0,0 +1,209 @@
+<?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="svg5354"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nav_turnaround_right_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="5.5"
+     inkscape:cx="18.984763"
+     inkscape:cy="41.090909"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     objecttolerance="15"
+     gridtolerance="15"
+     guidetolerance="16"
+     inkscape:window-width="1280"
+     inkscape:window-height="945"
+     inkscape:window-x="0"
+     inkscape:window-y="0">
+    <sodipodi:guide
+       id="guide5372"
+       orientation="0,92.545454"
+       position="-13.454545,32" />
+    <sodipodi:guide
+       id="guide5374"
+       orientation="88.363636,0"
+       position="32,68.363636" />
+    <sodipodi:guide
+       id="guide5395"
+       orientation="98.545455,0"
+       position="0.5,78" />
+    <sodipodi:guide
+       id="guide5397"
+       orientation="0,95.818181"
+       position="-17.454545,0.5" />
+    <sodipodi:guide
+       id="guide5399"
+       orientation="0,103.45454"
+       position="-23.090909,63.5" />
+    <sodipodi:guide
+       id="guide5401"
+       orientation="99.454546,0"
+       position="63.5,76.727273" />
+    <sodipodi:guide
+       id="guide5407"
+       orientation="-63,63"
+       position="0.5,0.5" />
+    <sodipodi:guide
+       id="guide5409"
+       orientation="63,63"
+       position="0.5,63.5" />
+    <sodipodi:guide
+       id="guide5425"
+       orientation="-21.056606,0"
+       position="21.471697,21.471697" />
+    <sodipodi:guide
+       id="guide5427"
+       orientation="0,21.056363"
+       position="21.471697,42.528303" />
+    <sodipodi:guide
+       id="guide5429"
+       orientation="21.056606,0"
+       position="42.52806,42.528303" />
+    <sodipodi:guide
+       id="guide5431"
+       orientation="0,-21.056363"
+       position="42.52806,21.471697" />
+  </sodipodi:namedview>
+  <defs
+     id="defs5356">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3209"
+         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>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) 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="path4535" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5362"
+       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="Arrow1Lend6"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend6">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="marker-start:none;stroke:#000000;stroke-width:1.0pt;fill:#ffffff;fill-rule:evenodd"
+         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="path3182" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2LendE"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2LendE"
+       style="overflow:visible;">
+      <path
+         id="path3998"
+         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
+       style="overflow:visible;"
+       id="Arrow1Lendq"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lendq">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="marker-start:none;stroke:#ffffff;stroke-width:1.0pt;fill:#ffffff;fill-rule:evenodd"
+         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="path4592" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5359">
+    <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">
+    <path
+       id="path5437"
+       d="M 32,63.5 L 32,32 L 32,35.818182"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       transform="translate(10.528303,4.8862073e-7)"
+       sodipodi:open="true"
+       sodipodi:end="6.2831853"
+       sodipodi:start="3.1415927"
+       d="M 21.471697,32 A 10.528181,10.528303 0 0 1 42.528059,32"
+       sodipodi:ry="10.528303"
+       sodipodi:rx="10.528181"
+       sodipodi:cy="32"
+       sodipodi:cx="31.999878"
+       id="path5435"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       id="path5439"
+       d="M 53.056606,51.426796 L 53.05695,57.161363"
+       style="stroke-linejoin:miter;marker-end:url(#Arrow1Lendq);stroke-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.39999999999999991;fill:none" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 53.056606,42.528303 C 53.056606,32 53.056606,32 53.056606,32"
+       id="path3225" />
+  </g>
+</svg>