Merge branch 'trunk' into icon_goverment_building

author: Stefan Wildemann <metalstrolch@users.noreply.github.com> 2017-12-04 11:53:01 +0100
committer: GitHub <noreply@github.com> 2017-12-04 11:53:01 +0100
commit: 39a8259e6d7d31e120ee5309e6a92760f08e43c9 (patch)
tree: c4ec096cf677f31a0c459d920a443b3596c60e9b /navit/icons
parent: 0898653cefd5b32db8646516c3bf2cce9baa4b15 (diff)
parent: 3584d6ece6016969a1a5a8b56879fa9ea4dfc0fe (diff)
download: navit-39a8259e6d7d31e120ee5309e6a92760f08e43c9.tar.gz
16 files changed, 2134 insertions, 1030 deletions
diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt
index 6d40f2a92..040f0ee5e 100644
--- a/navit/icons/CMakeLists.txt
+++ b/navit/icons/CMakeLists.txt
@@ -20,7 +20,8 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE)
       set (NEW_SCALE ${SCALE})
       if (${SCALE} EQUAL 0)
          file(STRINGS  ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"")
-         string(REGEX REPLACE ".*width=\"([0-9]*).*" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
+         string(REGEX MATCH "width=\"([0-9]*)[pxt]*\"" NEW_SCALE_LINE ${NEW_SCALE_LINE})
+         set(NEW_SCALE ${CMAKE_MATCH_1})
        endif()
       set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE}  ${IMAGE_INPUT} ${IMAGE_OUTPUT})
    elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape")
diff --git a/navit/icons/autoservice.svg b/navit/icons/autoservice.svg
new file mode 100644
index 000000000..630d74d2c
--- /dev/null
+++ b/navit/icons/autoservice.svg
@@ -0,0 +1,115 @@
+<?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"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="autoservice.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="12.823529"
+     inkscape:cy="18.294118"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="725"
+     inkscape:window-width="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:zoom="21.018182"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="0"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0" />
+  <g
+     id="g1327"
+     transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     d="m 8.6250917,8.7062005 c -0.9707376,0 -1.4856922,0.5299594 -1.7234264,1.150296 L 5.6397034,13.114997 C 5.1394385,13.179143 4.252621,13.766362 4.252621,14.878783 l 0,4.143757 1.228328,0 0,1.325194 c 0,1.630379 2.307318,1.611179 2.3073187,0 l 0,-1.325194 4.1504833,0 0.0013,0 4.150481,0 0,1.325194 c 0,1.611179 2.307307,1.630379 2.307321,0 l 0,-1.325194 1.228326,0 0,-4.143757 c 0,-1.11242 -0.886811,-1.699639 -1.387085,-1.763786 L 16.975831,9.8564965 C 16.738097,9.2361599 16.223146,8.7062005 15.252402,8.7062005 l -1.783964,0 -3.037862,0 -1.8054905,0 z m -0.0148,1.1866209 3.3257684,0 0.0027,0 0.0013,0 3.327111,0 c 0.41601,0.00392 0.594182,0.2640376 0.713049,0.6242546 l 0.951179,2.564285 -4.991339,0 -0.0013,0 -0.0027,0 -4.9899972,0 0.9511803,-2.564285 C 8.0161106,10.156859 8.1942372,9.8966951 8.6102916,9.8928214 z M 6.6716065,14.328524 c 0.5886503,0 1.0655371,0.491138 1.0655371,1.097826 -4e-7,0.606733 -0.4768868,1.099172 -1.0655371,1.099172 -0.5886073,0 -1.0655378,-0.492439 -1.0655378,-1.099172 0,-0.606687 0.4769305,-1.097826 1.0655378,-1.097826 z m 10.5356355,0 c 0.58865,0 1.06554,0.491139 1.065537,1.097826 0,0.606733 -0.476887,1.099172 -1.065537,1.099172 -0.588608,0 -1.066886,-0.492439 -1.066886,-1.099172 0,-0.606688 0.478278,-1.097826 1.066886,-1.097826 z"
+     id="path2301"
+     style="fill:#0089cd;stroke:none"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g5312"
+     transform="matrix(0.27456542,-0.26935418,0.26567294,0.27081299,-1.0556809,5.1081411)">
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       id="path5302"
+       d="M 8.1359163,8.5385328 C 6.1926724,10.556239 6.212511,13.730389 8.2022073,15.720086 l 2.6516507,2.651651 c 1.808973,1.808973 4.41263,2.181887 6.419529,0.739927 l 19.025379,19.049275 c 0.886329,0.886329 2.295655,0.886329 3.181981,0 l 1.767766,-1.767766 c 0.886329,-0.886329 0.88633,-2.295652 0,-3.181981 L 22.200387,14.184664 c 1.44196,-2.006898 1.069046,-4.6105562 -0.739927,-6.4195292 l -2.651651,-2.651651 c -1.989696,-1.989696 -5.163846,-2.009536 -7.181553,-0.066291 l 5.325398,5.2812042 v 2.12132 L 15.53844,13.863931 H 13.41712 C 11.666497,12.081602 9.8444463,10.356837 8.1359163,8.5385328 Z"
+       style="opacity:1;fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:0.99482751;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       id="path5306"
+       d="m 8.2877553,10.137849 4.7598297,4.75983 2.842267,-0.05734 2.101713,-2.101714 -0.06766,-2.8422672 -4.699747,-4.699747 c 1.019168,-0.979955 3.507085,-0.803658 4.088753,-0.221113 l 4.193597,4.193596 c 1.098455,1.0984552 0.384409,3.8219112 -0.642136,5.0453652 l 19.888085,20.013636 c 0.390744,0.398067 0.250239,1.139884 -0.04652,1.47545 l -2.058821,1.933821 c -0.308637,0.373993 -1.179774,0.435486 -1.394661,0.09073 L 17.426869,17.776964 c -1.0455,1.0455 -4.031653,1.614582 -5.063104,0.593749 L 8.1407313,14.147679 c -0.9509923,-0.711609 -0.651984,-3.29822 0.147024,-4.00983 z"
+       style="opacity:0.7;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99482703px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/navit/icons/bowling.svg b/navit/icons/bowling.svg
new file mode 100644
index 000000000..ebc02d520
--- /dev/null
+++ b/navit/icons/bowling.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="bowling.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="88.343465"
+     inkscape:cy="3.213385"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="725"
+     inkscape:window-width="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:zoom="1"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="0"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0" />
+  <g
+     id="g1327"
+     transform="matrix(0.33403911,0,0,0.33403911,3.8232233,2.6463362)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:11.72280502;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4536"
+     cx="101.80831"
+     cy="100.42613"
+     r="91.153503" />
+  <ellipse
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.93399143;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4538"
+     cx="131.56744"
+     cy="45.196854"
+     rx="9.4208956"
+     ry="9.4208965" />
+  <ellipse
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.93399143;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4538-4"
+     cx="161.06557"
+     cy="77.03508"
+     rx="9.4208956"
+     ry="9.4208965" />
+  <ellipse
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.93399143;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4538-4-4"
+     cx="121.56072"
+     cy="81.713364"
+     rx="9.4208956"
+     ry="9.4208965" />
+</svg>
diff --git a/navit/icons/bridge.svg b/navit/icons/bridge.svg
new file mode 100644
index 000000000..0cce35558
--- /dev/null
+++ b/navit/icons/bridge.svg
@@ -0,0 +1,161 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="bridge.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\bridge.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="9.0803371"
+     inkscape:cy="11.667262"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0" />
+  <g
+     id="g1327"
+     transform="matrix(0.34319043,0,0,0.34319043,0.8232233,2.3111151)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <ellipse
+     style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:8.83749676;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path5130"
+     cx="96.940178"
+     cy="147.61621"
+     rx="68.77198"
+     ry="32.524643" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:8.85758495px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 6.5467015,96.228144 185.4400085,0.05311 v 57.362526 c 0,0 -15.08288,-0.27104 -18.99532,-0.27813 -0.14136,-40.93542 -50.70721,-46.22322 -71.13014,-46.104 -18.704369,0.10895 -70.56423,0.80515 -71.130133,46.38231 -4.18442,-0.0708 -24.1844155,0 -24.1844155,0 z"
+     id="path5142"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccsccc" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5144"
+     width="2.2267792"
+     height="23.659534"
+     x="19.855244"
+     y="67.197083" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5144-7"
+     width="2.2267792"
+     height="23.659534"
+     x="50.86314"
+     y="67.197083" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5144-1"
+     width="2.2267792"
+     height="23.659534"
+     x="81.871048"
+     y="67.197083" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5144-8"
+     width="2.2267792"
+     height="23.659534"
+     x="112.87896"
+     y="67.197083" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5144-11"
+     width="2.2267792"
+     height="23.659534"
+     x="143.88687"
+     y="67.197083" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5144-74"
+     width="2.2267792"
+     height="23.659534"
+     x="174.89474"
+     y="67.197083"
+     inkscape:transform-center-x="0.55670278"
+     inkscape:transform-center-y="6.2928732e-006" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.36728573;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect5185"
+     width="185.23392"
+     height="0.56395012"
+     x="7.2003508"
+     y="61.904907" />
+</svg>
diff --git a/navit/icons/car_wash.svg b/navit/icons/car_wash.svg
new file mode 100644
index 000000000..2c17087f6
--- /dev/null
+++ b/navit/icons/car_wash.svg
@@ -0,0 +1,135 @@
+<?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"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="car_wash.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="19.318319"
+     inkscape:cy="15.792438"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="16.78664"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0" />
+  <g
+     id="g1327"
+     transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     d="m 8.6250917,8.7062005 c -0.9707376,0 -1.4856922,0.5299594 -1.7234264,1.150296 L 5.6397034,13.114997 C 5.1394385,13.179143 4.252621,13.766362 4.252621,14.878783 l 0,4.143757 1.228328,0 0,1.325194 c 0,1.630379 2.307318,1.611179 2.3073187,0 l 0,-1.325194 4.1504833,0 0.0013,0 4.150481,0 0,1.325194 c 0,1.611179 2.307307,1.630379 2.307321,0 l 0,-1.325194 1.228326,0 0,-4.143757 c 0,-1.11242 -0.886811,-1.699639 -1.387085,-1.763786 L 16.975831,9.8564965 C 16.738097,9.2361599 16.223146,8.7062005 15.252402,8.7062005 l -1.783964,0 -3.037862,0 -1.8054905,0 z m -0.0148,1.1866209 3.3257684,0 0.0027,0 0.0013,0 3.327111,0 c 0.41601,0.00392 0.594182,0.2640376 0.713049,0.6242546 l 0.951179,2.564285 -4.991339,0 -0.0013,0 -0.0027,0 -4.9899972,0 0.9511803,-2.564285 C 8.0161106,10.156859 8.1942372,9.8966951 8.6102916,9.8928214 z M 6.6716065,14.328524 c 0.5886503,0 1.0655371,0.491138 1.0655371,1.097826 -4e-7,0.606733 -0.4768868,1.099172 -1.0655371,1.099172 -0.5886073,0 -1.0655378,-0.492439 -1.0655378,-1.099172 0,-0.606687 0.4769305,-1.097826 1.0655378,-1.097826 z m 10.5356355,0 c 0.58865,0 1.06554,0.491139 1.065537,1.097826 0,0.606733 -0.476887,1.099172 -1.065537,1.099172 -0.588608,0 -1.066886,-0.492439 -1.066886,-1.099172 0,-0.606688 0.478278,-1.097826 1.066886,-1.097826 z"
+     id="path2301"
+     style="fill:#0089cd;stroke:none"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.64602429px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 11.932901,3.8702621 c 0.468232,0.00558 0.754143,-0.4345529 0.754143,-0.7483631 0,-0.6031582 -0.536638,-1.4794288 -0.754143,-1.9211706 -0.149172,0.3574271 -0.745857,1.3180124 -0.745857,1.9211706 0,0.2683029 0.277625,0.7427784 0.745857,0.7483631 z"
+     id="path833"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="zscsz" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.64602429px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 11.9329,7.3962952 c 0.468232,0.00558 0.754143,-0.4345529 0.754143,-0.7483631 0,-0.6031582 -0.536638,-1.4794288 -0.754143,-1.9211706 -0.149172,0.3574271 -0.745857,1.3180124 -0.745857,1.9211706 0,0.2683029 0.277625,0.7427784 0.745857,0.7483631 z"
+     id="path833-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="zscsz" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.64602429px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 14.340396,3.8007984 C 14.790477,3.6715713 14.937829,3.1678357 14.847638,2.8672653 14.674288,2.2895546 13.908447,1.6044866 13.57316,1.2438939 c -0.04016,0.385219 -0.335589,1.4767665 -0.162235,2.054478 0.07711,0.2569829 0.479389,0.6316494 0.929471,0.5024265 z"
+     id="path833-3-0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="zscsz" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.64602429px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 15.315677,7.2964848 C 15.757504,7.1413637 15.875383,6.6299279 15.767906,6.3350962 15.561332,5.7684156 14.757036,5.128932 14.401394,4.7883985 c -0.01774,0.3868997 -0.249348,1.4937484 -0.04277,2.0604297 0.09189,0.2520764 0.515228,0.6027736 0.957053,0.4476566 z"
+     id="path833-3-0-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="zscsz" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.64602429px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 9.5336905,3.8007984 C 9.0836095,3.6715713 8.9362575,3.1678357 9.0264485,2.8672653 c 0.17335,-0.5777107 0.939191,-1.2627787 1.2744785,-1.6233714 0.04016,0.385219 0.335589,1.4767665 0.162235,2.054478 -0.07711,0.2569829 -0.4793895,0.6316494 -0.9294715,0.5024265 z"
+     id="path833-3-0-0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="zscsz" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.64602429px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8.5584095,7.2964849 c -0.441827,-0.155121 -0.559706,-0.666557 -0.452229,-0.961389 0.206574,-0.5666804 1.01087,-1.206164 1.366512,-1.5466975 0.01774,0.3868997 0.249348,1.4937485 0.04277,2.0604295 -0.09189,0.252077 -0.515228,0.602774 -0.957053,0.447657 z"
+     id="path833-3-0-1-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="zscsz" />
+</svg>
diff --git a/navit/icons/communication.svg b/navit/icons/communication.svg
new file mode 100644
index 000000000..35596b3c7
--- /dev/null
+++ b/navit/icons/communication.svg
@@ -0,0 +1,133 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="communication.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\communication.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="9.6858801"
+     inkscape:cy="12.141264"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0" />
+  <g
+     id="g1327"
+     transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:19.34242439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path898"
+     cx="70.480728"
+     cy="55.175976"
+     r="23.618807" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:11.80940342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 18.400196,196.65238 C 18.017335,163.8354 27.328899,85.85608 50.470592,84.362277 c 17.587504,-0.702977 24.241381,-1.214817 38.176402,0 19.988056,1.637799 36.534076,71.964233 36.685236,112.290103 h -14.77352 c -2.10778,-31.13765 -5.62024,-50.35805 -11.959493,-70.70173 -1.407001,9.84894 -2.110502,70.70173 -2.110502,70.70173 H 47.243703 l -2.814001,-70.70173 c -10.308351,25.5924 -12.142703,52.81047 -11.959503,71.40525 z"
+     id="path900"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccc" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:11.80940342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 94.185039,69.267024 c 6.490431,4.581479 24.052751,-12.9809 31.306761,-12.599087 7.25402,0.382272 37.41541,9.162956 46.19657,-1.527159 8.78119,-10.690116 4.96328,-45.8147836 -7.254,-48.4872889 -12.21726,-2.6725063 -68.340379,-11.453742 -75.212592,8.0176089 -6.872212,19.47126 16.035162,32.833882 19.853062,34.361041 1.14538,7.253985 -14.889801,20.234885 -14.889801,20.234885 z"
+     id="path902"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssscc" />
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:4.63446236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path904"
+     cx="116.1574"
+     cy="28.675596"
+     r="2.2773874" />
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:4.63446236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path904-5"
+     cx="134.79134"
+     cy="28.675596"
+     r="2.2773874" />
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:4.63446236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path904-5-5"
+     cx="153.09462"
+     cy="28.675596"
+     r="2.2773874" />
+</svg>
diff --git a/navit/icons/concert.svg b/navit/icons/concert.svg
new file mode 100644
index 000000000..c908b056f
--- /dev/null
+++ b/navit/icons/concert.svg
@@ -0,0 +1,130 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="concert.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\concert.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="14.153144"
+     inkscape:cy="4.6274553"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g1327"
+     transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.95306969;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1511"
+     cx="54.465088"
+     cy="171.69257"
+     r="25.818937" />
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.95306969;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1511-2"
+     cx="140.43051"
+     cy="128.74763"
+     r="25.818937" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.26697731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530"
+     width="21.705309"
+     height="113.89934"
+     x="58.578712"
+     y="55.204674" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.26697731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1"
+     width="21.705309"
+     height="113.89934"
+     x="144.54413"
+     y="13.819176" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:34.42524719px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 58.662477,55.204534 166.24943,2.511515 V 30.901629 L 58.662477,83.956741 Z"
+     id="path1547"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+</svg>
diff --git a/navit/icons/crossing.svg b/navit/icons/crossing.svg
new file mode 100644
index 000000000..d3c1ebc17
--- /dev/null
+++ b/navit/icons/crossing.svg
@@ -0,0 +1,174 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="crossing.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\crossing.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="7.9303017"
+     inkscape:cy="7.2481934"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g1327"
+     transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1"
+     width="16.312975"
+     height="85.602875"
+     x="165.07462"
+     y="59.240246" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1"
+     width="16.312975"
+     height="85.602875"
+     x="128.51941"
+     y="59.240246" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7"
+     width="16.312975"
+     height="85.602875"
+     x="92.306519"
+     y="-142.91566"
+     transform="scale(1,-1)" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7-2"
+     width="16.312975"
+     height="85.602875"
+     x="55.409027"
+     y="59.240246" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7-2-7"
+     width="16.312975"
+     height="85.602875"
+     x="18.853848"
+     y="59.240246" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7-6"
+     width="14.773995"
+     height="14.773995"
+     x="93.075996"
+     y="-44.737671"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-1.0551502"
+     inkscape:transform-center-y="7.4398368" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7-6-5"
+     width="14.773995"
+     height="14.773995"
+     x="93.075996"
+     y="-17.388329"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-1.0551502"
+     inkscape:transform-center-y="7.4398331" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7-6-5-6"
+     width="14.773995"
+     height="14.773995"
+     x="93.075996"
+     y="-170.265"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-1.0551502"
+     inkscape:transform-center-y="7.4398298" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1530-1-1-7-6-5-6-0"
+     width="14.773995"
+     height="14.773995"
+     x="93.075996"
+     y="-197.61433"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-1.0551502"
+     inkscape:transform-center-y="7.4398249" />
+</svg>
diff --git a/navit/icons/dam.svg b/navit/icons/dam.svg
index 55b0d859d..8b0448a42 100644
--- a/navit/icons/dam.svg
+++ b/navit/icons/dam.svg
@@ -7,19 +7,28 @@
    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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    height="22"
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
    sodipodi:docname="dam.svg"
    sodipodi:version="0.32"
    version="1.0"
    width="22">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
   <metadata
-     id="metadata2975">
+     id="metadata10">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -40,378 +49,361 @@
      guidetolerance="10.0"
      id="base"
      inkscape:current-layer="svg2"
-     inkscape:cx="31.570822"
-     inkscape:cy="9.7340208"
-     inkscape:guide-bbox="true"
+     inkscape:cx="19.113183"
+     inkscape:cy="10.931933"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="0"
-     inkscape:window-width="1024"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:zoom="7.3734168"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="22.919321"
      objecttolerance="10.0"
      pagecolor="#ffffff"
      showgrid="false"
-     showguides="true" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <symbol
-       id="symbol-university"
-       viewBox="244.5 110 489 219.9">
-      <path
-         d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"
-         id="path4460" />
-      <path
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <path
-         d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"
-         id="path4464" />
-      <path
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3826"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3855"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3909"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3950"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3972"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3994"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4016"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4837"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4971"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6216"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6764"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6817"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       cx="180.2453"
-       cy="198.41902"
-       fx="180.2453"
-       fy="198.41902"
-       gradientTransform="scale(0.79354273,1.2601716)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient874"
-       r="101.58017"
-       xlink:href="#linearGradient829" />
-    <linearGradient
-       id="linearGradient829">
-      <stop
-         id="stop830"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;" />
-      <stop
-         id="stop831"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-    </linearGradient>
-    <radialGradient
-       cx="360.85146"
-       cy="167.47372"
-       fx="360.85146"
-       fy="167.47372"
-       gradientTransform="scale(1.007004,0.99304475)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient832"
-       r="46.394721"
-       xlink:href="#linearGradient829" />
-    <linearGradient
-       id="linearGradient6826">
-      <stop
-         id="stop6828"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;" />
-      <stop
-         id="stop6830"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="scale(0.74491357,1.3424376)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient850"
-       spreadMethod="pad"
-       x1="465.29425"
-       x2="463.27056"
-       xlink:href="#linearGradient855"
-       y1="248.24467"
-       y2="405.7687" />
-    <linearGradient
-       id="linearGradient855">
-      <stop
-         id="stop856"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-      <stop
-         id="stop857"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="scale(1.4586159,0.68558144)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient854"
-       x1="157.80581"
-       x2="155.40575"
-       xlink:href="#linearGradient855"
-       y1="120.96176"
-       y2="231.63491" />
-    <linearGradient
-       id="linearGradient6837">
-      <stop
-         id="stop6839"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-      <stop
-         id="stop6841"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective6928"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10781"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10806"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10878"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10919"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipoutline2">
-      <path
-         d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z"
-         id="outline2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
   <g
      id="g1327"
-     transform="matrix(0.04159575,0,0,0.04159575,-1.220601,-1.4914197)">
+     transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
     <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
        id="path1329"
        style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
        inkscape:connector-curvature="0" />
   </g>
   <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
   </g>
   <g
-     id="g3338"
-     transform="matrix(0.05812291,-0.01014042,0.01014042,0.05812291,-8.9188946,-3.8284068)" />
-  <rect
-     height="1.4578179"
-     id="rect2311"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="16.718014" />
-  <rect
-     height="1.4578179"
-     id="rect2313"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="14.511292" />
-  <rect
-     height="1.4578179"
-     id="rect2315"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="12.299199" />
-  <rect
-     height="1.4578179"
-     id="rect2317"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="10.084506" />
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
   <path
-     d="M 10.595894,2.6728441 C 10.459972,2.3503659 10.137493,2.1211656 9.7670429,2.1211656 l -1.1966368,0.00533 V 18.173152 H 14.239106 L 10.595894,2.6728441 z"
-     id="path2319"
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.16406763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 11.107616,0.42913812 C 6.0066699,0.49538362 2.2391786,4.105382 2.2306449,9.3392329 2.2228749,14.103459 11.107616,21.429138 11.107616,21.429138 c 0,0 8.399996,-7.12183 8.41325,-12.0899051 0.01237,-4.6376808 -3.312304,-8.91009478 -8.41325,-8.91009478 z"
+     id="path1492"
      inkscape:connector-curvature="0"
-     style="fill:#0050da" />
-  <rect
-     height="1.4524877"
-     id="rect2321"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="7.8777843" />
-  <rect
-     height="1.4578179"
-     id="rect2323"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="5.6657748" />
-  <rect
-     height="1.4578179"
-     id="rect2325"
-     style="fill:#0050da"
-     width="7.443666"
-     x="0.14064905"
-     y="3.4536827" />
+     sodipodi:nodetypes="cscsc" />
   <path
-     d="m 14.932035,16.904558 c 0.109271,0.02132 0.21854,0.03198 0.32781,0.03198 0.290497,0 0.567669,-0.06663 0.812859,-0.175898 0.255851,-0.119931 0.535689,-0.186558 0.836847,-0.186558 0.295828,0 0.578329,0.06663 0.83418,0.186558 0.24519,0.10927 0.525029,0.175898 0.812861,0.175898 0.287831,0 0.562339,-0.06663 0.81286,-0.175898 0.250522,-0.119931 0.535687,-0.186558 0.83418,-0.186558 0.298493,0 0.583662,0.06663 0.836848,0.186558 0.245189,0.10927 0.519697,0.175898 0.812859,0.175898 v 1.212627 c -0.290498,0 -0.56767,-0.06129 -0.812859,-0.170567 -0.255852,-0.119931 -0.541021,-0.18656 -0.836848,-0.18656 -0.295827,0 -0.583658,0.06663 -0.83418,0.18656 -0.250521,0.109268 -0.525029,0.170567 -0.81286,0.170567 -0.287832,0 -0.567671,-0.06129 -0.812861,-0.170567 -0.255851,-0.119931 -0.535687,-0.18656 -0.83418,-0.18656 -0.301158,0 -0.583661,0.06663 -0.836847,0.18656 -0.24519,0.109268 -0.519696,0.170567 -0.812859,0.170567 -0.01599,0 -0.03198,0 -0.04797,0 L 14.93204,16.904555 z"
-     id="path2327"
+     style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 11.090315,1.1899265 C 6.37002,1.2512285 2.8836724,4.591836 2.8757755,9.4351181 2.8685855,13.84382 11.090315,20.622831 11.090315,20.622831 c 0,0 7.773159,-6.590374 7.785423,-11.1877129 0.01145,-4.2916004 -3.065128,-8.2451916 -7.785423,-8.2451916 z"
+     id="path1492-2"
      inkscape:connector-curvature="0"
-     style="fill:#0050da" />
+     sodipodi:nodetypes="cscsc"
+     inkscape:transform-center-x="-1.3165584"
+     inkscape:transform-center-y="3.1070785" />
+  <circle
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.25710332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1494"
+     cx="10.875771"
+     cy="8.9291391"
+     r="7" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830"
+     sodipodi:type="arc"
+     sodipodi:cx="5.9102416"
+     sodipodi:cy="5.5574636"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 6.7193797,5.5574636 a 0.80913812,0.82178432 0 0 1 -0.404569,0.7116861 0.80913812,0.82178432 0 0 1 -0.8091382,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116861" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0"
+     sodipodi:type="arc"
+     sodipodi:cx="7.5475278"
+     sodipodi:cy="5.5574636"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 8.3566659,5.5574636 a 0.80913812,0.82178432 0 0 1 -0.4045691,0.7116861 0.80913812,0.82178432 0 0 1 -0.8091381,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116861" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3"
+     sodipodi:type="arc"
+     sodipodi:cx="9.1765404"
+     sodipodi:cy="5.5574636"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 9.9855281,5.5416211 A 0.80913812,0.82178432 0 0 1 9.5900823,6.2638099 0.80913812,0.82178432 0 0 1 8.7764829,6.2717756 0.80913812,0.82178432 0 0 1 8.3674023,5.5574636" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6"
+     sodipodi:type="arc"
+     sodipodi:cx="5.9505248"
+     sodipodi:cy="6.964376"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 6.7596629,6.964376 a 0.80913812,0.82178432 0 0 1 -0.404569,0.7116861 0.80913812,0.82178432 0 0 1 -0.8091382,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116862" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8"
+     sodipodi:type="arc"
+     sodipodi:cx="7.587811"
+     sodipodi:cy="6.964376"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 8.3969491,6.964376 A 0.80913812,0.82178432 0 0 1 7.99238,7.6760621 a 0.80913812,0.82178432 0 0 1 -0.8091381,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116862" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4"
+     sodipodi:type="arc"
+     sodipodi:cx="9.2168236"
+     sodipodi:cy="6.964376"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 10.025811,6.9485334 A 0.80913812,0.82178432 0 0 1 9.6303655,7.6707223 0.80913812,0.82178432 0 0 1 8.8167661,7.6786879 0.80913812,0.82178432 0 0 1 8.4076855,6.9643759" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0"
+     sodipodi:type="arc"
+     sodipodi:cx="5.9267492"
+     sodipodi:cy="8.2720375"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 6.7358873,8.2720375 a 0.80913812,0.82178432 0 0 1 -0.404569,0.7116861 0.80913812,0.82178432 0 0 1 -0.8091382,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116861" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2"
+     sodipodi:type="arc"
+     sodipodi:cx="7.5640359"
+     sodipodi:cy="8.2720375"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 8.373174,8.2720375 a 0.80913812,0.82178432 0 0 1 -0.4045691,0.7116861 0.80913812,0.82178432 0 0 1 -0.8091381,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116861" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9"
+     sodipodi:type="arc"
+     sodipodi:cx="9.1930475"
+     sodipodi:cy="8.2720375"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 10.002035,8.256195 A 0.80913812,0.82178432 0 0 1 9.6065894,8.9783838 0.80913812,0.82178432 0 0 1 8.79299,8.9863495 0.80913812,0.82178432 0 0 1 8.3839094,8.2720375" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-0"
+     sodipodi:type="arc"
+     sodipodi:cx="5.9267492"
+     sodipodi:cy="9.6034737"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 6.7358873,9.6034737 a 0.80913812,0.82178432 0 0 1 -0.404569,0.7116863 0.80913812,0.82178432 0 0 1 -0.8091382,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116864" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-8"
+     sodipodi:type="arc"
+     sodipodi:cx="7.5640359"
+     sodipodi:cy="9.6034737"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 8.373174,9.6034737 a 0.80913812,0.82178432 0 0 1 -0.4045691,0.7116863 0.80913812,0.82178432 0 0 1 -0.8091381,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.7116864" />
   <path
-     d="m 14.446984,14.52461 c 0.250521,0.109271 0.525028,0.175899 0.812861,0.175899 0.290497,0 0.567669,-0.06663 0.812859,-0.175899 0.255851,-0.11993 0.535689,-0.186557 0.836847,-0.186557 0.295828,0 0.578329,0.06663 0.83418,0.186557 0.24519,0.109271 0.525029,0.175899 0.812861,0.175899 0.287831,0 0.562339,-0.06663 0.81286,-0.175899 0.250522,-0.11993 0.535687,-0.186557 0.83418,-0.186557 0.298493,0 0.583662,0.06663 0.836848,0.186557 0.245189,0.109271 0.519697,0.175899 0.812859,0.175899 v 1.212626 c -0.290498,0 -0.56767,-0.06129 -0.812859,-0.170567 -0.255852,-0.11993 -0.541021,-0.186558 -0.836848,-0.186558 -0.295827,0 -0.583658,0.06663 -0.83418,0.186558 -0.250521,0.10927 -0.525029,0.170567 -0.81286,0.170567 -0.287832,0 -0.567671,-0.06129 -0.812861,-0.170567 -0.255851,-0.11993 -0.535687,-0.186558 -0.83418,-0.186558 -0.301158,0 -0.583661,0.06663 -0.836847,0.186558 -0.24519,0.10927 -0.519696,0.170567 -0.812859,0.170567 -0.175899,0 -0.34913,-0.02132 -0.514368,-0.06663 l -0.298493,-1.321897 z"
-     id="path2329"
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-1"
+     sodipodi:type="arc"
+     sodipodi:cx="9.1930475"
+     sodipodi:cy="9.6034737"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 10.002035,9.5876311 A 0.80913812,0.82178432 0 0 1 9.6065894,10.30982 0.80913812,0.82178432 0 0 1 8.79299,10.317786 0.80913812,0.82178432 0 0 1 8.3839094,9.6034736" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-3"
+     sodipodi:type="arc"
+     sodipodi:cx="5.9267492"
+     sodipodi:cy="10.831888"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 6.7358873,10.831888 a 0.80913812,0.82178432 0 0 1 -0.404569,0.711686 0.80913812,0.82178432 0 0 1 -0.8091382,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-6"
+     sodipodi:type="arc"
+     sodipodi:cx="7.5640359"
+     sodipodi:cy="10.831888"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 8.373174,10.831888 a 0.80913812,0.82178432 0 0 1 -0.4045691,0.711686 0.80913812,0.82178432 0 0 1 -0.8091381,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-7"
+     sodipodi:type="arc"
+     sodipodi:cx="9.1930475"
+     sodipodi:cy="10.839812"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 10.002035,10.82397 A 0.80913812,0.82178432 0 0 1 9.6065894,11.546159 0.80913812,0.82178432 0 0 1 8.79299,11.554124 0.80913812,0.82178432 0 0 1 8.3839094,10.839812" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29349035;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-0-5"
+     sodipodi:type="arc"
+     sodipodi:cx="5.9029737"
+     sodipodi:cy="12.034188"
+     sodipodi:rx="0.83113402"
+     sodipodi:ry="0.8185544"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 6.7341077,12.034188 a 0.83113402,0.8185544 0 0 1 -0.415567,0.708889 0.83113402,0.8185544 0 0 1 -0.8311341,0 0.83113402,0.8185544 0 0 1 -0.415567,-0.708889" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-8-6"
+     sodipodi:type="arc"
+     sodipodi:cx="7.5640359"
+     sodipodi:cy="12.032672"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 8.373174,12.032672 a 0.80913812,0.82178432 0 0 1 -0.4045691,0.711686 0.80913812,0.82178432 0 0 1 -0.8091381,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-1-6"
+     sodipodi:type="arc"
+     sodipodi:cx="9.1930475"
+     sodipodi:cy="12.040596"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="M 10.002035,12.024753 A 0.80913812,0.82178432 0 0 1 9.6065894,12.746942 0.80913812,0.82178432 0 0 1 8.79299,12.754908 0.80913812,0.82178432 0 0 1 8.3839094,12.040596" />
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 10.008784,5.2858401 v 7.6795369 h 2.258687 L 10.650727,5.2858401 Z"
+     id="path966"
      inkscape:connector-curvature="0"
-     style="fill:#0050da" />
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-0-4"
+     sodipodi:type="arc"
+     sodipodi:cx="12.488831"
+     sodipodi:cy="10.831888"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 13.297969,10.831888 a 0.80913812,0.82178432 0 0 1 -0.404569,0.711686 0.80913812,0.82178432 0 0 1 -0.809139,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-8-2"
+     sodipodi:type="arc"
+     sodipodi:cx="14.126117"
+     sodipodi:cy="10.831888"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 14.935255,10.831888 a 0.80913812,0.82178432 0 0 1 -0.404569,0.711686 0.80913812,0.82178432 0 0 1 -0.809138,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-1-1"
+     sodipodi:type="arc"
+     sodipodi:cx="15.755129"
+     sodipodi:cy="10.839812"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 16.564117,10.82397 a 0.80913812,0.82178432 0 0 1 -0.395446,0.722189 0.80913812,0.82178432 0 0 1 -0.8136,0.008 0.80913812,0.82178432 0 0 1 -0.40908,-0.714312" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-0-4-3"
+     sodipodi:type="arc"
+     sodipodi:cx="12.631482"
+     sodipodi:cy="12.032672"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 13.44062,12.032672 a 0.80913812,0.82178432 0 0 1 -0.404569,0.711686 0.80913812,0.82178432 0 0 1 -0.809138,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-8-2-2"
+     sodipodi:type="arc"
+     sodipodi:cx="14.26877"
+     sodipodi:cy="12.032672"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 15.077908,12.032672 a 0.80913812,0.82178432 0 0 1 -0.404569,0.711686 0.80913812,0.82178432 0 0 1 -0.809138,0 0.80913812,0.82178432 0 0 1 -0.404569,-0.711686" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.29015145;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-1-1-5"
+     sodipodi:type="arc"
+     sodipodi:cx="15.897783"
+     sodipodi:cy="12.040596"
+     sodipodi:rx="0.80913812"
+     sodipodi:ry="0.82178432"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 16.706771,12.024753 a 0.80913812,0.82178432 0 0 1 -0.395446,0.722189 0.80913812,0.82178432 0 0 1 -0.813599,0.008 0.80913812,0.82178432 0 0 1 -0.409081,-0.714312" />
 </svg>
diff --git a/navit/icons/diving.svg b/navit/icons/diving.svg
new file mode 100644
index 000000000..66f16c2dc
--- /dev/null
+++ b/navit/icons/diving.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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="diving.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\diving.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="-75.438052"
+     inkscape:cy="15.403137"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g1327"
+     transform="matrix(0.32710145,0,0,0.32710145,-0.1767767,10.656562)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830"
+     sodipodi:type="arc"
+     sodipodi:cx="18.007557"
+     sodipodi:cy="143.67285"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 29.792122,143.67285 a 11.784565,11.968748 0 0 1 -5.892283,10.36524 11.784565,11.968748 0 0 1 -11.784565,0 11.784565,11.968748 0 0 1 -5.8922821,-10.36524" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0"
+     sodipodi:type="arc"
+     sodipodi:cx="41.853569"
+     sodipodi:cy="143.67285"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 53.638134,143.67285 a 11.784565,11.968748 0 0 1 -5.892283,10.36524 11.784565,11.968748 0 0 1 -11.784565,0 11.784565,11.968748 0 0 1 -5.892282,-10.36524" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3"
+     sodipodi:type="arc"
+     sodipodi:cx="65.579041"
+     sodipodi:cy="143.67285"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 77.361415,143.44212 a 11.784565,11.968748 0 0 1 -5.759409,10.5182 11.784565,11.968748 0 0 1 -11.84954,0.11602 11.784565,11.968748 0 0 1 -5.95799,-10.40349" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-8"
+     sodipodi:type="arc"
+     sodipodi:cx="90.033112"
+     sodipodi:cy="143.67285"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 101.81768,143.67285 a 11.784565,11.968748 0 0 1 -5.892286,10.36524 11.784565,11.968748 0 0 1 -11.784565,0 11.784565,11.968748 0 0 1 -5.892282,-10.36524" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-7"
+     sodipodi:type="arc"
+     sodipodi:cx="113.8791"
+     sodipodi:cy="143.67285"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 125.66366,143.67285 a 11.784565,11.968748 0 0 1 -5.89228,10.36524 11.784565,11.968748 0 0 1 -11.78457,0 11.784565,11.968748 0 0 1 -5.89228,-10.36524" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-0"
+     sodipodi:type="arc"
+     sodipodi:cx="137.60463"
+     sodipodi:cy="143.67285"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 149.387,143.44212 a 11.784565,11.968748 0 0 1 -5.7594,10.5182 11.784565,11.968748 0 0 1 -11.84955,0.11602 11.784565,11.968748 0 0 1 -5.95799,-10.40349" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-9"
+     sodipodi:type="arc"
+     sodipodi:cx="161.36612"
+     sodipodi:cy="144.36534"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 173.15068,144.36534 a 11.784565,11.968748 0 0 1 -5.89228,10.36524 11.784565,11.968748 0 0 1 -11.78456,0 11.784565,11.968748 0 0 1 -5.89229,-10.36524" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-31"
+     sodipodi:type="arc"
+     sodipodi:cx="185.21214"
+     sodipodi:cy="144.36534"
+     sodipodi:rx="11.784565"
+     sodipodi:ry="11.968748"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 196.99671,144.36534 a 11.784565,11.968748 0 0 1 -5.89228,10.36524 11.784565,11.968748 0 0 1 -11.78457,0 11.784565,11.968748 0 0 1 -5.89228,-10.36524" />
+  <circle
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:4.09310675;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1643"
+     cx="142.97609"
+     cy="85.919296"
+     r="10.923257" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.70205581;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1645"
+     width="52.685677"
+     height="9.6769609"
+     x="135.44214"
+     y="-63.360096"
+     ry="4.424036"
+     rx="4.2614436"
+     transform="rotate(57.709826)"
+     inkscape:transform-center-y="1.0461464"
+     inkscape:transform-center-x="0.24843131" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.70205581;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1645-8"
+     width="52.685677"
+     height="9.6769609"
+     x="64.138474"
+     y="-22.794872"
+     ry="4.424036"
+     rx="4.2614436"
+     transform="rotate(53.038857)"
+     inkscape:transform-center-y="1.0628748"
+     inkscape:transform-center-x="0.16240914" />
+  <rect
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.92983234;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1645-8-8"
+     width="53.182892"
+     height="12.323986"
+     x="87.769211"
+     y="52.05463"
+     ry="5.634182"
+     rx="4.3016605"
+     transform="matrix(0.9758835,0.21829199,-0.135073,0.99083565,0,0)"
+     inkscape:transform-center-y="1.135816"
+     inkscape:transform-center-x="-0.60816508" />
+</svg>
diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg
index d81e92082..d4cf5a0c4 100644
--- a/navit/icons/drinking_water.svg
+++ b/navit/icons/drinking_water.svg
@@ -7,19 +7,31 @@
    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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
+   height="200"
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
    sodipodi:docname="drinking_water.svg"
    sodipodi:version="0.32"
    version="1.0"
-   width="22">
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\drinking_water.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
   <metadata
-     id="metadata2975">
+     id="metadata10">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -27,20 +39,10 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
         <dc:language>en</dc:language>
         <dc:title />
-        <dc:description>jfitie@gmail.com</dc:description>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
@@ -50,212 +52,86 @@
      guidetolerance="10.0"
      id="base"
      inkscape:current-layer="svg2"
-     inkscape:cx="50.806915"
-     inkscape:cy="45.424044"
-     inkscape:pageopacity="0"
+     inkscape:cx="24.94017"
+     inkscape:cy="6.5543801"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:window-height="820"
-     inkscape:window-width="1238"
-     inkscape:window-x="194"
-     inkscape:window-y="51"
-     inkscape:zoom="3.6867084"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1.2239456"
      objecttolerance="10.0"
-     pagecolor="#ff00ff"
+     pagecolor="#ffffff"
      showgrid="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4196">
-      <stop
-         style="stop-color:#000080;stop-opacity:1;"
-         offset="0"
-         id="stop4198" />
-      <stop
-         style="stop-color:#000080;stop-opacity:0;"
-         offset="1"
-         id="stop4200" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <symbol
-       id="symbol-university"
-       viewBox="244.5 110 489 219.9">
-      <path
-         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
-         id="path4460"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 94,176 73,215"
-         id="path4462"
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#000000;stroke-width:20" />
-      <path
-         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
-         id="path4464"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
-         id="path4466"
-         ill="none"
-         inkscape:connector-curvature="0"
-         style="stroke:#000000;stroke-width:20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2562"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective12"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4196"
-       id="linearGradient4206"
-       x1="29.023178"
-       y1="70.434334"
-       x2="44.755371"
-       y2="101.62747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21881295,0,0,0.21881295,0.47435352,6.2430753e-6)" />
-  </defs>
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
   <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       width="8"
-       x="2"
-       y="2" />
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
   </g>
   <path
-     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.58007604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 12.436868,0.57706224 c -1.756054,-0.0072 -1.452409,2.99148696 0.252488,2.67358796 1.004234,0.02611 2.749381,-1.106231 1.602985,-2.101222 -0.57279,-0.27373596 -1.209385,-0.56173696 -1.855473,-0.57236596 z"
-     id="path3340-5"
-     inkscape:connector-curvature="0" />
-  <path
-     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.58007604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 14.679609,0.57526524 c -0.967634,0.02427 -2.791986,0.83385096 -1.815038,2.00822396 0.936966,1.010616 3.464595,0.889184 3.186202,-0.922345 -0.111341,-0.633164 -0.72702,-1.12771896 -1.371164,-1.08587896 z"
-     id="path3345-3"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.16015208;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 13.593731,0.58335224 C 12.387334,1.1419522 12.828196,2.8169302 12.690704,3.9034352 c -0.09796,1.220051 0.240233,2.45467 1.030619,3.404995 1.232351,-1.82182 0.995002,-4.215759 0.538222,-6.19674 C 14.150204,0.83878924 13.923686,0.54027724 13.593731,0.58335224 Z"
-     id="path3347-5"
-     inkscape:connector-curvature="0" />
-  <path
-     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.16015208;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 13.531732,2.5506922 c -2.289178,0.593914 -2.305734,4.533935 -0.181504,5.311685 1.894657,0.169104 2.446142,-2.359225 1.920168,-3.786423 -0.201715,-0.799139 -0.840261,-1.581215 -1.738664,-1.525262 z"
-     id="path3349-6"
-     inkscape:connector-curvature="0" />
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:10.13824272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 62.783034,3.5735704 V 17.236455 h 14.94995 v 11.38778 H 18.27971 L 3.8247918,16.892039 V 72.335481 L 17.735175,61.048734 h 49.948669 c 0,0 2.33359,13.446294 16.48455,12.722288 11.60169,-0.593114 12.7718,-12.722288 12.7718,-12.722288 0,0 11.035676,-0.184073 19.553746,0 3.42,0.08181 4.25383,2.558569 4.20776,4.900756 -0.26158,13.293515 0,19.108279 0,19.108279 0,0 16.20905,-0.184073 26.13764,0 0.094,-15.012933 0.28634,-26.772332 0,-39.949066 -0.24583,-11.342378 -17.94482,-16.249267 -29.15731,-16.484468 -11.21251,-0.235201 -29.305866,0 -29.305866,0 l 8e-5,-11.38778 H 105.20721 V 3.5735704 Z"
+     id="path1679"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccscccccccccccc" />
   <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.93358684;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 15.122587,4.4650192 c -1.850678,0.206295 -3.768037,-0.221731 -5.5825924,0.192287 -1.630915,0.596785 -2.336053,2.429814 -1.874245,4.060378 2.6853604,-2.060836 9.0608744,-1.566868 9.5112554,-2.023261 1.426801,0.354491 1.511935,0.03612 1.618189,-1.214391 -0.09716,-1.36257 -1.743679,-1.069923 -3.672607,-1.015013 z"
-     id="path3351-2"
+     style="fill:none;stroke:#0089cd;stroke-width:4.09043884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 82.021684,96.425097 105.97417,196.52835 h 58.7514 L 187.7742,96.425097"
+     id="path1681"
      inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccc" />
+     sodipodi:nodetypes="cccc" />
   <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.23002474"
-     d="m 7.6774306,9.0732492 c -1.522412,-0.0067 -3.044753,0.105091 -4.548829,0.341892 0.533135,4.0678518 1.067027,8.1356058 1.600289,12.2034418 2.451669,0.29844 4.95269,0.41349 7.3967324,-0.0153 0.936237,-1.818906 0.557294,-3.973665 1.055444,-5.913623 0.275065,-2.090408 0.54868,-4.181007 0.823839,-6.2714018 -2.089757,-0.359069 -4.2138774,-0.361168 -6.3274754,-0.345038 z"
-     id="path3582"
-     inkscape:connector-curvature="0" />
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-0-4"
+     sodipodi:type="arc"
+     sodipodi:cx="104.94855"
+     sodipodi:cy="121.39098"
+     sodipodi:rx="15.029328"
+     sodipodi:ry="11.755445"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 119.97788,121.39098 a 15.029328,11.755445 0 0 1 -7.51467,10.18052 15.029328,11.755445 0 0 1 -15.029327,0 15.029328,11.755445 0 0 1 -7.514664,-10.18052" />
   <path
-     d="m 4.6291306,10.672236 7.5366344,0.06102 -1.220507,9.650504 -5.1566454,0.06102 -1.159482,-9.772555 z"
-     id="path2381"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.1;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-     inkscape:connector-curvature="0" />
-  <g
-     id="g3353"
-     transform="matrix(0.03867173,0,0,0.03867173,-1.8751227,0.43801824)">
-    <path
-       d="m 391.67731,24.490931 c -11.66352,4.361614 -27.64526,10.849786 -33.63434,10.849786 -5.98908,0 -10.84979,-4.860704 -10.84979,-10.849786 0,-5.989083 4.86071,-10.849787 10.84979,-10.849787 5.70837,0.219191 22.30594,6.964662 33.63434,10.849787 z"
-       id="path3340"
-       sodipodi:nodetypes="csscc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       transform="translate(15.189701,15.189701)"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 396.38288,39.680632 c 11.66352,4.361614 27.64526,10.849786 33.63434,10.849786 5.98908,0 10.84979,-4.860704 10.84979,-10.849786 0,-5.989083 -4.86071,-10.849787 -10.84979,-10.849787 -5.70837,0.219191 -22.30594,6.964662 -33.63434,10.849787 z"
-       id="path3345"
-       sodipodi:nodetypes="csscc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 401.4421,39.138141 0,66.183699 0.81374,25.76824"
-       id="path3347"
-       style="fill:none;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <ellipse
-       id="path3349"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       cx="401.44211"
-       cy="125.39394"
-       rx="22.784552"
-       ry="45.569103" />
-    <path
-       d="m 522.95971,130.81884 -177.93695,-1.00529 -14.10427,-0.0797 c -69.43863,-1.08498 -65.09872,64.01374 -65.09872,64.01374"
-       id="path3351"
-       sodipodi:nodetypes="cccc"
-       style="fill:none;stroke:#c02727;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-  </g>
-  <rect
-     style="opacity:0.44029852;fill:url(#linearGradient4206);fill-opacity:1;stroke:none;stroke-width:12;stroke-miterlimit:4;stroke-dasharray:none"
-     id="rect4179"
-     width="5.9945359"
-     height="6.0538883"
-     x="5.459908"
-     y="14.40297" />
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-8-2"
+     sodipodi:type="arc"
+     sodipodi:cx="135.36032"
+     sodipodi:cy="121.39098"
+     sodipodi:rx="15.029328"
+     sodipodi:ry="11.755445"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 150.38965,121.39098 a 15.029328,11.755445 0 0 1 -7.51466,10.18052 15.029328,11.755445 0 0 1 -15.02933,0 15.029328,11.755445 0 0 1 -7.51467,-10.18052" />
   <path
-     d="m 12.866673,10.209018 -0.0061,0 c 0.007,-0.006 0.01081,-0.01211 0.01081,-0.01823 0,-0.144298 -1.970328,-0.2612768 -4.4008944,-0.2612768 -2.430542,0 -4.400895,0.1169788 -4.400895,0.2612768 0,0.0061 0.0038,0.01221 0.01084,0.01823 l -0.01084,0 1.37352,10.473678 0.0062,0 c -0.01215,0.0065 -0.01859,0.01323 -0.01859,0.01995 0,0.0997 1.360979,0.180464 3.039818,0.180464 1.6788634,0 3.0398184,-0.08076 3.0398184,-0.180464 0,-0.0067 -0.0064,-0.01341 -0.01859,-0.01995 l 1.374931,-10.473678 z m -2.256784,9.707939 c -0.07036,0.06511 -4.2436584,0.0346 -4.3140214,-0.03052 l -1.304742,-9.043255 c 2.226935,0.0074 3.830658,0.11811 6.8578754,-0.06102 l -1.239112,9.134795 z"
-     id="path2209"
-     sodipodi:nodetypes="ccsssccccsssccccccc"
-     style="fill:#c02727"
-     inkscape:connector-curvature="0" />
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-1-1"
+     sodipodi:type="arc"
+     sodipodi:cx="165.61842"
+     sodipodi:cy="121.5046"
+     sodipodi:rx="15.029328"
+     sodipodi:ry="11.755445"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 180.64496,121.27798 a 15.029328,11.755445 0 0 1 -7.34521,10.33075 15.029328,11.755445 0 0 1 -15.11219,0.11395 15.029328,11.755445 0 0 1 -7.59846,-10.21808" />
 </svg>
diff --git a/navit/icons/emergency.svg b/navit/icons/emergency.svg
index c88c6aaa0..acffcc96b 100644
--- a/navit/icons/emergency.svg
+++ b/navit/icons/emergency.svg
@@ -9,16 +9,29 @@
    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"
-   height="22"
+   height="200"
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
    sodipodi:docname="emergency.svg"
    sodipodi:version="0.32"
    version="1.0"
-   width="22">
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\emergency.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
   <metadata
-     id="metadata2975">
+     id="metadata10">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -26,20 +39,10 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
         <dc:language>en</dc:language>
         <dc:title />
-        <dc:description>jfitie@gmail.com</dc:description>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
@@ -49,456 +52,68 @@
      guidetolerance="10.0"
      id="base"
      inkscape:current-layer="svg2"
-     inkscape:cx="78.817949"
-     inkscape:cy="44.555593"
-     inkscape:pageopacity="0"
+     inkscape:cx="63.25448"
+     inkscape:cy="100.6273"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:window-height="874"
-     inkscape:window-width="1440"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:zoom="3.6867085"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="2.1796875"
      objecttolerance="10.0"
-     pagecolor="#ff1dff"
+     pagecolor="#ffffff"
      showgrid="false"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-grids="false"
-     inkscape:snap-to-guides="false"
-     inkscape:window-maximized="1" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <symbol
-       id="symbol-university"
-       viewBox="244.5 110 489 219.9">
-      <path
-         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
-         id="path4460"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 94,176 73,215"
-         id="path4462"
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#000000;stroke-width:20" />
-      <path
-         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
-         id="path4464"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
-         id="path4466"
-         ill="none"
-         inkscape:connector-curvature="0"
-         style="stroke:#000000;stroke-width:20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4904"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="Arrow2Lend"
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         id="path4137"
-         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="Arrow1Mend"
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path4125"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="TriangleOutL"
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         id="path4214"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="scale(0.8,0.8)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="Arrow1Lend"
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path4119"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="Tail"
-       inkscape:stockid="Tail"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <g
-         id="g4152"
-         transform="scale(-1.2,-1.2)">
-        <path
-           d="M -3.8048674,-3.9585227 0.54352094,0"
-           id="path4154"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="M -1.2866832,-3.9585227 3.0617053,0"
-           id="path4156"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="M 1.3053582,-3.9585227 5.6537466,0"
-           id="path4158"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
-           id="path4160"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
-           id="path4162"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
-           id="path4164"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
-           inkscape:connector-curvature="0" />
-      </g>
-    </marker>
-    <marker
-       id="Arrow1Sstart"
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path4128"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.2,0,0,0.2,1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="Arrow1Send"
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path4131"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="SemiCircleOut"
-       inkscape:stockid="SemiCircleOut"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="m -2.5,-0.80913858 c 0,2.75999998 -2.24,4.99999998 -5,4.99999998 l 0,-10 c 2.76,0 5,2.24 5,5.00000002 z"
-         id="path4235"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
-         transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="Arrow2Send"
-       inkscape:stockid="Arrow2Send"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         id="path4149"
-         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="TriangleOutS"
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         id="path4220"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="scale(0.2,0.2)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="CurveIn"
-       inkscape:stockid="CurveIn"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="m 4.625493,-5.0456926 c -2.76,0 -5.00000002,2.24 -5.00000002,5.00000002 0,2.75999998 2.24000002,4.99999998 5.00000002,4.99999998"
-         id="path4238"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
-         transform="scale(0.6,0.6)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="InfiniteLineStart"
-       inkscape:stockid="InfiniteLineStart"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <g
-         id="g4298"
-         transform="translate(-13,0)">
-        <circle
-           cx="3"
-           cy="0"
-           id="circle4300"
-           r="0.80000001" />
-        <circle
-           cx="6.5"
-           cy="0"
-           id="circle4302"
-           r="0.80000001" />
-        <circle
-           cx="10"
-           cy="0"
-           id="circle4304"
-           r="0.80000001" />
-      </g>
-    </marker>
-    <marker
-       id="StopS"
-       inkscape:stockid="StopS"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 0,5.65 0,-5.65"
-         id="path4229"
-         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(0.2,0.2)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="Arrow2Sstart"
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         id="path4146"
-         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         transform="matrix(0.3,0,0,0.3,-0.69,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="DiamondS"
-       inkscape:stockid="DiamondS"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <path
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 Z"
-         id="path4202"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="scale(0.2,0.2)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       id="RazorWire"
-       inkscape:stockid="RazorWire"
-       orient="auto"
-       refX="0"
-       refY="0">
-       style=&quot;overflow:visible&quot;&gt;
-      <path
-   d="m 0.02272727,-0.74009011 0,1.4375 -7.78124997,2.31250001 18.4374997,0 -7.1874997,-2.31250001 0,-1.4375 7.2499997,-2.15624999 -18.4687497,0 7.74999997,2.15624999 z"
-   id="path4286"
-   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
-   transform="scale(0.8,0.8)"
-   inkscape:connector-curvature="0" />
-</marker>
-    <inkscape:perspective
-       id="perspective5233"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5412"
-       inkscape:persp3d-origin="250 : 166.66667 : 1"
-       inkscape:vp_x="0 : 250 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="500 : 250 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g1327"
+     transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
   <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       width="8"
-       x="2"
-       y="2" />
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
   </g>
   <g
-     id="g3448"
-     transform="matrix(0.21007753,0,0,0.21007654,0.15074743,0.8225434)">
-    <g
-       transform="translate(-119.6189,31.193137)"
-       id="g3440">
-      <g
-         id="g1327-3"
-         transform="matrix(0.18023212,0,0,0.18023212,118.90132,-35.074477)"
-         style="fill:#ffffff;stroke:#ffffff">
-        <path
-           d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-           id="path1329-6"
-           style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:3.40799999;stroke-opacity:0"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:3.47710228;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 168.77539,-26.714844 c -24.90882,0.65124 -45.67473,25.94229543 -41.17383,50.535156 3.15319,24.278992 29.43702,42.421637 53.26172,36.228516 C 205.34548,55.121653 221.58756,26.483972 212.6543,3.0039062 206.68201,-15.179354 187.88727,-27.91809 168.77539,-26.714844 Z"
-         id="path2207-7"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 135.40625,8.0332031 c 0,6.7701819 0,13.5403649 0,20.3105469 23.78385,0 47.56771,0 71.35156,0 -1.21558,-6.573853 1.68803,-13.539405 -0.66992,-19.890625 -3.17978,-5.0668552 -10.53922,-1.2344481 -15.33008,-2.4199219 -18.45052,0 -36.90104,0 -55.35156,0 l 0,1 0,1 z"
-         id="rect3180-5"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 159.92773,-16.488281 c 0,23.1171873 0,46.234375 0,69.351562 6.6053,-1.239496 13.63591,1.748711 19.99805,-0.724609 5.07576,-3.54689 1.01531,-11.203263 2.31055,-16.275391 0,-18.117187 0,-36.23437475 0,-54.351562 -7.4362,0 -14.8724,0 -22.3086,0 l 0,1 0,1 z"
-         id="rect3182-3"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:3.47710252;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 168.58789,-33.037109 c -26.875,0.732101 -50.02432,26.3501216 -47.70508,53.222656 1.03022,26.672013 26.49775,49.507971 53.19727,47.201172 27.06213,-1.027335 50.08523,-27.229656 47.11701,-54.273425 -1.67559,-26.180886 -26.35425,-48.021089 -52.6092,-46.150403 z"
-         id="path2438-5"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="matrix(0.18023212,0,0,0.18023212,-0.6781117,-3.9155248)"
-       id="g1327">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-         id="path1329"
-         d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" />
-    </g>
-    <circle
-       r="39.915974"
-       cy="48.346523"
-       cx="51.502563"
-       style="fill:none;stroke:#da0092;stroke-width:3.47710228;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2207" />
-    <rect
-       y="-55.501747"
-       x="-83.177666"
-       width="63.350189"
-       transform="scale(-1,-1)"
-       style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3180"
-       height="14.310408" />
-    <rect
-       y="44.34737"
-       x="-80.021637"
-       width="63.350189"
-       transform="matrix(0,-1,1,0,0,0)"
-       style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3182"
-       height="14.310408" />
-    <circle
-       r="46.242443"
-       cy="48.346523"
-       cx="51.502567"
-       style="fill:none;stroke:#da0092;stroke-width:3.47710252;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2438" />
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
   </g>
+  <circle
+     style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:17.50965309;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1494"
+     cx="101.07435"
+     cy="100.33749"
+     r="97.5" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:14.25435543;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1712"
+     width="125.35715"
+     height="41.785713"
+     x="38.395782"
+     y="79.444618" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:14.25435543;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1712-5"
+     width="125.35715"
+     height="41.785713"
+     x="37.658913"
+     y="-121.9672"
+     transform="rotate(90)" />
 </svg>
diff --git a/navit/icons/fish.svg b/navit/icons/fish.svg
new file mode 100644
index 000000000..d0abd3a4c
--- /dev/null
+++ b/navit/icons/fish.svg
@@ -0,0 +1,124 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="fish.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\fish.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="173.26216"
+     inkscape:cy="73.026273"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="2.1796875"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g1327"
+     transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:6.33289146;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.2249053,49.048542 C 30.777046,82.994317 71.553818,142.06288 121.68921,142.06288 c 50.13538,0 73.88372,-42.219274 73.88372,-42.219274 0,0 -26.26574,-51.881787 -80.48049,-50.795064 C 65.142738,50.049139 30.022314,103.05523 6.9055533,142.06288 11.156769,112.34642 9.3916793,75.312309 8.2249053,49.048542 Z"
+     id="path1729"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cscscc" />
+  <ellipse
+     style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:5.6151638;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1731"
+     cx="172.80457"
+     cy="87.727531"
+     rx="4.5818696"
+     ry="4.5818691"
+     inkscape:transform-center-x="-0.30408871"
+     inkscape:transform-center-y="1.001269e-006" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2.11096382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 193.21381,112.55034 c 0,0 -14.29218,0.91194 -24.93527,-3.64901"
+     id="path1733"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2.11096382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 145.16779,58.499749 c -20.98211,23.718999 -21.89437,55.648381 0.3042,76.630301"
+     id="path1735"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+</svg>
diff --git a/navit/icons/ghost_town.svg b/navit/icons/ghost_town.svg
new file mode 100644
index 000000000..864193db3
--- /dev/null
+++ b/navit/icons/ghost_town.svg
@@ -0,0 +1,124 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ghost_town.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\ghost_town.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="108.52408"
+     inkscape:cy="89.612292"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="2.1796875"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <circle
+     style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:17.50965309;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1494"
+     cx="98.991913"
+     cy="99.878708"
+     r="97.5" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.92267895;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 123.36122,18.558431 -48.152432,33.289147 -29.688226,36.87088 1.015127,74.757012 c 0,0 1.700314,11.31404 7.680633,15.36125 6.905494,-2.8917 3.74148,-24.1956 6.665489,-26.62376 4.311778,-1.27167 7.165717,14.85941 11.262377,16.39561 4.09666,1.53632 -0.3322,-18.21148 5.11404,-21.50962 3.67801,-2.22732 -0.49641,28.67642 11.28153,34.82143 11.777912,6.14501 10.51393,-10.84451 10.51393,-10.84451 l -1.81204,-15.22769 c -1.37767,-6.38709 3.099792,-10.78977 6.142232,-7.73411 6.90551,2.49474 -2.05004,13.82842 5.63118,21.50961 7.68125,7.68133 6.6497,-9.40304 6.78105,-14.95317 0.59392,-4.62497 -0.46451,-13.00551 7.04794,-14.23708 7.25195,-1.1895 2.52321,21.47675 15.36127,18.94313 10.80322,-2.13219 11.77953,-19.46016 11.77953,-19.46016 V 61.577661 Z"
+     id="path851"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccsscccscssccc" />
+  <rect
+     style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.42024088;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect858"
+     width="13.928572"
+     height="13.928572"
+     x="55.059704"
+     y="99.090843" />
+  <rect
+     style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.42024088;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect858-0"
+     width="13.928572"
+     height="13.928572"
+     x="80.097389"
+     y="99.090843"
+     inkscape:transform-center-x="14.064738"
+     inkscape:transform-center-y="-5.625892" />
+  <rect
+     style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.49845934;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect858-4"
+     width="9.411725"
+     height="21.349106"
+     x="69.626968"
+     y="122.25526" />
+</svg>
diff --git a/navit/icons/hotspring.svg b/navit/icons/hotspring.svg
new file mode 100644
index 000000000..b599a2124
--- /dev/null
+++ b/navit/icons/hotspring.svg
@@ -0,0 +1,131 @@
+<?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"
+   height="200"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="hotspring.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\hotspring.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       id="perspective24"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="111.45288"
+     inkscape:cy="153.74159"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1.4142136"
+     objecttolerance="10.0"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
+  <g
+     id="g1327"
+     transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2319"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2323"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2325"
+     transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+    <path
+       d=""
+       id="path2329"
+       style="fill:#0089cd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:11.36141205;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 34.810274,85.967742 a 97.499586,42.536584 0 0 0 -31.1265883,31.110308 97.499586,42.536584 0 0 0 97.4979743,42.53709 97.499586,42.536584 0 0 0 97.50202,-42.53709 97.499586,42.536584 0 0 0 -30.89871,-30.992296 83.340637,36.359397 0 0 1 16.73732,21.795526 83.340637,36.359397 0 0 1 -83.34063,36.3598 83.340637,36.359397 0 0 1 -83.340646,-36.3598 83.340637,36.359397 0 0 1 16.96926,-21.913538 z"
+     id="path839"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 64.414602,41.752013 c -10.78766,10.430467 -14.38354,13.559606 -14.38354,21.556298 0,7.996677 17.97942,10.082769 17.46572,16.341046 -0.5137,6.258278 -17.46572,22.599343 -16.95203,25.033113"
+     id="path858"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssc" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 93.527762,25.866212 c -10.78766,10.430463 -14.38354,13.559599 -14.38354,21.556297 0,7.996673 17.97942,10.082764 17.46572,16.341041 -0.5137,6.258278 -17.46572,22.59934 -16.95202,25.033109"
+     id="path858-9"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssc" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 122.64091,40.204384 c -10.78765,10.430462 -14.38353,13.559601 -14.38353,21.556293 0,7.996678 17.97941,10.082769 17.46572,16.341046 -0.51369,6.258278 -17.46572,22.599337 -16.95203,25.033107"
+     id="path858-9-4"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssc"
+     inkscape:transform-center-x="17.205763"
+     inkscape:transform-center-y="-14.340942" />
+  <path
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 151.75406,27.777961 c -10.78765,10.430463 -14.38353,13.559609 -14.38353,21.556298 0,7.996678 17.97941,10.08277 17.46572,16.341046 -0.51369,6.258278 -17.46572,22.59934 -16.95202,25.033109"
+     id="path858-9-4-0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssc"
+     inkscape:transform-center-x="17.205768"
+     inkscape:transform-center-y="-14.340945" />
+</svg>
diff --git a/navit/icons/navit_svg2png b/navit/icons/navit_svg2png
index 675207561..668613a61 100755
--- a/navit/icons/navit_svg2png
+++ b/navit/icons/navit_svg2png
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+exitwithhelp()
+{
+	echo "Usage: navit_svg2png <conversion_tool> <output_png_filename> [<width_px> <height_px>]"
+	echo "The input filename is the same than the output png one with svg or svgz extension"
+	echo "Possible conversion tools: ksvgtopng, ksvgtopng4, rsvg-convert, inkscape and convert"
+	echo "width_px and height_px arguments can be omitted if output png size is specified in the filename, like this: imagename_WIDTH_HEIGHT.png (ex. myPng_100_100.png)"
+	exit
+}
+
 svgtopng()
 {
 	case $svgtopng in
@@ -15,6 +24,10 @@ svgtopng()
 	*convert)
 		$svgtopng -alpha on -background none $3 -resize $1x$2 $4
 		;;
+	*)
+		echo "Error: unknown conversion tool"
+		exitwithhelp    # unknown conversion tool
+		;;
 	esac
 }
 
@@ -26,8 +39,27 @@ svgtopng=$1
 png=$2
 w=$3
 h=$4
+
+# if -h or --help arg is passed, print help and exit
+case "$1" in
+	'-h'|'--help'|'')
+		exitwithhelp
+		;;
+esac
+
+# args num must be == 2 or == 4
+if [ "$#" -ne 2 ] && [ "$#" -ne 4 ];
+then
+	echo "Error: wrong number of arguments"
+	exitwithhelp
+fi
+
 case "$png" in
 	*_[1-9]*_[1-9]*.png)
+		if [ "$#" -ne 2 ]; then
+			echo "Error: output png size is specified by filename and by arguments, plese use only one"
+			exitwithhelp    # png size musn't be specifed, only in filename
+		fi
 		svg=${png%_*_*.png};
 		h=${png##*_}
 		w=${png%_$h}
@@ -35,6 +67,10 @@ case "$png" in
 		w=${w##*_}
 		;;
 	*)
+		if [ "$#" -ne 4 ]; then
+			echo "Error: please, specify output png size"
+			exitwithhelp    # filename doesn't specify png size, must be done with args 3 and 4
+		fi
 		svg=${png%.png}
 		;;
 esac
author	Stefan Wildemann <metalstrolch@users.noreply.github.com>	2017-12-04 11:53:01 +0100
committer	GitHub <noreply@github.com>	2017-12-04 11:53:01 +0100
commit	39a8259e6d7d31e120ee5309e6a92760f08e43c9 (patch)
tree	c4ec096cf677f31a0c459d920a443b3596c60e9b /navit/icons
parent	0898653cefd5b32db8646516c3bf2cce9baa4b15 (diff)
parent	3584d6ece6016969a1a5a8b56879fa9ea4dfc0fe (diff)
download	navit-39a8259e6d7d31e120ee5309e6a92760f08e43c9.tar.gz