[POI] Improve Attraction, Bicycle shop, Boat ramp, Bus, Cemetery and Cinema icons (#289)

* [POI] Improve Attraction, Bicycle shop, Boat ramp, Bus, Cemetery and Cinema icons

* Delete cemetery.xpm

7 files changed, 564 insertions, 286 deletions

diff --git a/navit/xpm/attraction.svg b/navit/xpm/attraction.svg
index 86ed5a4ab..a7bc8979c 100644
--- a/navit/xpm/attraction.svg
+++ b/navit/xpm/attraction.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -9,11 +10,11 @@
    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"
-   width="22"
-   height="22"
+   width="100"
+   height="100"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="attraction.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -57,16 +58,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.158254"
-     inkscape:cy="11.17505"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="34.284001"
+     inkscape:cy="54.825712"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
+     inkscape:window-width="1136"
+     inkscape:window-height="751"
+     inkscape:window-x="138"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -81,16 +83,35 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,78)">
+    <path
+       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.20956445;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       d="m 42.718746,-57.710749 c -0.122193,6.953957 -5.523667,12.578465 -11.834162,14.76615 -7.515099,3.140291 -15.889013,3.039926 -23.5150132,5.714306 -5.4358894,2.714126 0.5616946,8.116788 3.3670952,10.468555 3.64272,3.456324 8.747827,5.623906 10.687137,10.57382 4.721147,10.0508729 1.806189,21.3651347 2.084156,31.960817 -0.173259,6.480026 7.192676,4.357577 10.412268,1.617379 4.342441,-1.969392 7.664699,-6.909031 12.103004,-7.798733 9.647442,1.111976 18.473912,5.546752 27.922301,7.444073 6.023828,1.617661 7.60225,-5.577826 6.228087,-9.9958685 -0.911701,-5.8956519 -2.700058,-11.6105684 -4.509894,-17.2805075 6.295499,-6.419571 13.380156,-12.589206 17.192607,-20.902548 2.427009,-4.674448 -1.859224,-9.206975 -6.427707,-9.858417 -6.663182,-1.752942 -13.621389,-1.769487 -20.464769,-1.778598 -6.689509,-8.674888 -7.531377,-20.278635 -13.255932,-29.457505 -4.366498,-4.259109 -6.73083,4.260538 -7.918481,7.507185 -0.775117,2.31389 -1.444858,4.661712 -2.070697,7.019892 z"
+       id="path2383-5"
+       inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
-       style="opacity:1;fill:url(#linearGradient3157);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69094230999999995;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3157);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69094229;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
        id="path2383"
        sodipodi:sides="5"
        sodipodi:cx="8.3928576"
@@ -102,7 +123,7 @@
        inkscape:flatsided="false"
        inkscape:rounded="0"
        inkscape:randomized="0"
-       d="M 12.410715,13.767857 L 8.3912092,11.652205 L 4.3696665,13.763982 L 5.1396758,9.2874321 L 1.8885314,6.1152927 L 6.383929,5.4642852 L 8.396154,1.3920182 L 10.404453,5.4662229 L 14.899221,6.1215629 L 11.645021,9.2905675 L 12.410715,13.767857 z"
-       transform="matrix(1.4115471,0,0,1.4839561,-0.8483516,-0.2482945)" />
+       d="M 12.410715,13.767857 8.3912092,11.652205 4.3696665,13.763982 5.1396758,9.2874321 1.8885314,6.1152927 6.383929,5.4642852 l 2.012225,-4.072267 2.008299,4.0742047 4.494768,0.65534 -3.2542,3.1690046 z"
+       transform="matrix(5.6541004,0,0,5.9441423,3.5277342,-70.899029)" />
   </g>
 </svg>
diff --git a/navit/xpm/bicycle_shop.svg b/navit/xpm/bicycle_shop.svg
index 61dc8118f..3d0a6b5e3 100644
--- a/navit/xpm/bicycle_shop.svg
+++ b/navit/xpm/bicycle_shop.svg
@@ -9,14 +9,14 @@
    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="100"
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="car_dealer.svg"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bicycle_shop.svg"
    sodipodi:version="0.32"
    version="1.0"
-   width="22">
+   width="100">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -26,10 +26,20 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
         <dc:language>en</dc:language>
         <dc:title></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
@@ -39,17 +49,17 @@
      guidetolerance="10.0"
      id="base"
      inkscape:current-layer="svg2"
-     inkscape:cx="12.998345"
-     inkscape:cy="8.2449461"
-     inkscape:pageopacity="0.0"
+     inkscape:cx="48.005267"
+     inkscape:cy="50.526624"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-height="692"
-     inkscape:window-width="1360"
+     inkscape:window-height="874"
+     inkscape:window-width="1440"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:zoom="16"
+     inkscape:window-y="0"
+     inkscape:zoom="2.8284271"
      objecttolerance="10.0"
-     pagecolor="#ffffff"
+     pagecolor="#ff00ff"
      showgrid="false"
      inkscape:window-maximized="1" />
   <defs
@@ -90,8 +100,9 @@
        refY="5"
        viewBox="0 0 10 10">
       <path
-         d="M 10 0 L 0 5 L 10 10 z"
-         id="path2295" />
+         d="M 10,0 0,5 10,10 Z"
+         id="path2295"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        id="ArrowEnd"
@@ -103,8 +114,9 @@
        refY="5"
        viewBox="0 0 10 10">
       <path
-         d="M 0 0 L 10 5 L 0 10 z"
-         id="path2292" />
+         d="M 0,0 10,5 0,10 Z"
+         id="path2292"
+         inkscape:connector-curvature="0" />
     </marker>
     <inkscape:perspective
        id="perspective7597"
@@ -115,69 +127,102 @@
        sodipodi:type="inkscape:persp3d" />
   </defs>
   <g
-     id="g1327"
-     transform="matrix(0.04255774,0,0,0.04255774,-1.4142136,-1.7673414)">
-    <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.04255774,0,0,0.04255774,36.006437,-0.20099864)">
-    <path
-       d=""
-       id="path2323"
-       style="fill:#ad30c0;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g2325"
-     transform="matrix(0.04255774,0,0,0.04255774,36.006437,-0.20099864)">
-    <path
-       d=""
-       id="path2329"
-       style="fill:#ad30c0;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g3787"
-     transform="matrix(1.0781825,0,0,1.0471574,265.35317,-299.49867)">
+     id="g3434"
+     transform="matrix(0.93127935,0,0,0.93128318,3.5584054,-7.8446365)">
     <g
-       inkscape:export-ydpi="4.2362185"
-       inkscape:export-xdpi="4.2362185"
-       transform="matrix(-0.03470696,0,0,0.04139347,-219.73719,282.04237)"
-       id="g3138">
-      <circle
-         sodipodi:ry="161"
-         sodipodi:rx="161"
-         sodipodi:cy="409"
-         sodipodi:cx="215"
-         id="FrontWheel"
-         style="fill:none;stroke:#ad30c0;stroke-width:40px;stroke-opacity:1"
-         cx="215"
-         cy="409"
-         r="161"
-         transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
-         d="m 376,409 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
-      <circle
-         sodipodi:ry="161"
-         sodipodi:rx="161"
-         sodipodi:cy="406"
-         sodipodi:cx="790"
-         id="RearWheel"
-         style="fill:none;stroke:#ad30c0;stroke-width:40px;stroke-opacity:1"
-         cx="790"
-         cy="406"
-         r="161"
-         transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
-         d="m 951,406 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
+       transform="translate(118.79394,48.436814)"
+       style="fill:#ffffff;stroke:#ffffff"
+       id="g3427">
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:4.5436573px;stroke-opacity:1"
+         d="m -38.595703,2.7226562 c -14.222509,-0.1286533 -23.28553,15.5553378 -20.576172,28.4941408 1.512856,11.07171 12.204407,20.875239 23.726563,18.46875 C -20.98167,47.608068 -13.895667,29.788229 -19.361328,17.144531 -22.256762,9.1212667 -29.783735,2.5959143 -38.595703,2.7226562 Z"
+         id="FrontWheel-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:4.5436573px;stroke-opacity:1"
+         d="m -99.28125,2.3554688 c -14.22064,-0.1293854 -23.28506,15.5501662 -20.57813,28.4882812 1.50877,11.073624 12.20249,20.883374 23.726568,18.474609 C -81.669998,47.24314 -74.582775,29.421646 -80.048828,16.779297 -82.941436,8.7556024 -90.470456,2.2297682 -99.28125,2.3554688 Z"
+         id="RearWheel-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.11359143;stroke-opacity:1"
+         d="m -65.273438,-23.683594 c -0.655203,3.750836 -0.90656,9.496532 4.064454,10.310547 1.939071,1.019167 5.028287,-0.86626 6.353515,0.751953 -5.719316,-0.589672 -14.176836,0.491784 -18.427734,-0.564453 3.30802,-4.17767 -1.733926,-9.624013 -6.394531,-8.390625 -5.563673,1.759909 -13.226605,-2.987804 -17.21875,2.955078 -1.807802,3.027427 -1.033524,6.744251 -0.433594,9.9941409 2.351075,-1.0542051 6.586198,-1.5962109 4.480469,2.2558593 -4.238599,11.8722937 -10.602451,23.2855768 -13.052731,35.6386718 1.25521,7.1566 10.426241,5.304958 15.486324,5.175781 7.454653,-0.718381 15.974035,1.925759 22.771485,-1.855468 7.355822,-6.471973 12.587875,-17.07851 18.568359,-23.1542972 2.483532,7.1262622 2.184494,16.2032902 7.525391,22.1621092 5.735086,3.596906 11.392711,-4.598662 8.296875,-9.630859 -4.572241,-14.3585426 -6.562677,-29.6594047 -12.767578,-43.429688 -4.546289,-5.925303 -12.88962,-3.858896 -19.289063,-4.296875 0.01237,0.692709 0.02474,1.385417 0.03711,2.078125 z"
+         id="path3405"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.11359143;stroke-opacity:1"
+         d="m -86.455078,-5.5117188 c 4.19734,13.0696137 8.39787,26.1382038 12.597656,39.2070308 11.019023,-13.909527 22.038038,-27.8190609 33.054688,-41.7304682 -15.497398,-0.030317 -30.994793,-0.062055 -46.492188,-0.09375 0.279948,0.8723958 0.559896,1.7447916 0.839844,2.6171874 z"
+         id="path3403"
+         inkscape:connector-curvature="0" />
       <path
-         d="m 419.33591,187.76277 c -81.15626,0.791 -67.39292,-8.38456 -111.05594,131.93826 -35.56995,112.11783 -31.69552,99.89097 -31.88155,107.75543 -0.13037,6.10982 4.80163,10.95404 10.99923,11.36869 12.88887,-1.30322 7.46752,1.39395 52.15306,-137.36977 163.27931,172.24394 102.021,144.31296 189.89195,147.81092 115.48553,-1.10739 124.87203,6.01158 126.24309,-10.91575 -0.1582,-5.74792 -2.84759,-9.17557 -82.10546,-185.56784 l 7.59356,-20.88232 26.1029,-0.4746 -0.9492,-21.83151 -97.2926,0 c -8.5955,11.75949 3.48039,11.70675 46.98521,21.35692 l -7.59357,21.3569 -194.11061,0.47461 c 13.07781,-45.66688 5.69518,-42.8193 64.54534,-42.71383 l 0.47459,-22.30611 z m -70.62884,88.427 189.94107,-0.33678 -54.89431,147.50742 -135.04676,-147.17064 z m 212.84176,8.75614 -53.88399,141.44548 117.87123,0.33677 -63.98724,-141.78225 z"
-         id="Frame"
-         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61219299;stroke-opacity:1"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.11359143;stroke-opacity:1"
+         d="M -87.457031,-8.9472656 C -92.520914,4.0450342 -97.581356,17.038675 -102.64453,30.03125 c 10.566404,-0.0355 21.132816,-0.06896 31.699218,-0.105469 -4.828418,-14.688483 -9.659284,-29.37616069 -14.488282,-44.064453 -0.674479,1.730469 -1.348958,3.460938 -2.023437,5.1914064 z"
+         id="Frame-9"
          inkscape:connector-curvature="0" />
     </g>
+    <g
+       transform="matrix(0.19606923,0,0,0.19606923,164.66253,7.7144016)"
+       id="g2319">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;stroke:none"
+         id="path2323"
+         d="" />
+    </g>
+    <g
+       transform="matrix(0.19606923,0,0,0.19606923,164.66253,7.7144016)"
+       id="g2325">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;stroke:none"
+         id="path2329"
+         d="" />
+    </g>
+    <g
+       transform="matrix(4.9673316,0,0,4.8243948,1221.2937,-1371.1902)"
+       id="g3787">
+      <g
+         id="g3138"
+         transform="matrix(-0.03470696,0,0,0.04139347,-219.73719,282.04237)"
+         inkscape:export-xdpi="4.2362185"
+         inkscape:export-ydpi="4.2362185">
+        <circle
+           transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
+           r="161"
+           cy="409"
+           cx="215"
+           style="fill:none;stroke:#ad30c0;stroke-width:40px;stroke-opacity:1"
+           id="FrontWheel" />
+        <circle
+           transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
+           r="161"
+           cy="406"
+           cx="790"
+           style="fill:none;stroke:#ad30c0;stroke-width:40px;stroke-opacity:1"
+           id="RearWheel" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61219299;stroke-opacity:1"
+           id="Frame"
+           d="m 419.33591,187.76277 c -81.15626,0.791 -67.39292,-8.38456 -111.05594,131.93826 -35.56995,112.11783 -31.69552,99.89097 -31.88155,107.75543 -0.13037,6.10982 4.80163,10.95404 10.99923,11.36869 12.88887,-1.30322 7.46752,1.39395 52.15306,-137.36977 163.27931,172.24394 102.021,144.31296 189.89195,147.81092 115.48553,-1.10739 124.87203,6.01158 126.24309,-10.91575 -0.1582,-5.74792 -2.84759,-9.17557 -82.10546,-185.56784 l 7.59356,-20.88232 26.1029,-0.4746 -0.9492,-21.83151 -97.2926,0 c -8.5955,11.75949 3.48039,11.70675 46.98521,21.35692 l -7.59357,21.3569 -194.11061,0.47461 c 13.07781,-45.66688 5.69518,-42.8193 64.54534,-42.71383 l 0.47459,-22.30611 z m -70.62884,88.427 189.94107,-0.33678 -54.89431,147.50742 -135.04676,-147.17064 z m 212.84176,8.75614 -53.88399,141.44548 117.87123,0.33677 -63.98724,-141.78225 z" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.19606923,0,0,0.19606923,65.732605,-32.499009)"
+       id="g2319-3">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;stroke:none"
+         id="path2323-6"
+         d="" />
+    </g>
+    <g
+       transform="matrix(0.19606923,0,0,0.19606923,65.732605,-32.499009)"
+       id="g2325-7">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;stroke:none"
+         id="path2329-5"
+         d="" />
+    </g>
   </g>
 </svg>
diff --git a/navit/xpm/boat_ramp.svg b/navit/xpm/boat_ramp.svg
index 1ccc88b7b..798b9b137 100644
--- a/navit/xpm/boat_ramp.svg
+++ b/navit/xpm/boat_ramp.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -8,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
+   width="100"
+   height="100"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="boat_ramp.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -36,19 +37,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="15.902761"
-     inkscape:cy="9.2438685"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="27.711486"
+     inkscape:cy="46.174477"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="38"
-     inkscape:window-y="24"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
+     inkscape:snap-global="false"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -63,32 +65,83 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#3d6b98;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 0.65911209,15.560037 L 20.545958,15.515843 L 19.597655,21.589701 L 3.4774734,21.545507 L 0.65911209,15.560037 z"
-       id="rect2381"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 6.4053422,0.51263443 L 10.619456,0.51263443 L 10.57834,13.451186 L 0.54037468,13.49538 L 6.4053422,0.51263443 z"
-       id="path3154"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
-       d="M 15.547394,3.454693 L 12.467784,3.4104988 L 12.491839,13.416625 L 20.557566,13.416625 L 15.547394,3.454693 z"
-       id="path3156"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.545578,0.0090946102 L 11.545578,15.053346"
-       id="path3158"
-       sodipodi:nodetypes="cc" />
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3391"
+       transform="translate(118.44039,37.299882)" />
+    <g
+       id="g3408"
+       transform="matrix(0.93840541,0,0,0.9384035,4.2479097,-1.6528705)">
+      <g
+         id="g3397"
+         transform="translate(118.44039,37.29988)">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect2381-3"
+           d="m -24.189453,-49.107422 c -32.111976,0.07378 -63.074914,1.026643 -95.186887,1.10068 5.3956,11.45783 9.64265,22.031544 15.03454,33.491117 25.68685,0.07091 51.373697,0.14209 77.06055,0.210937 1.813652,-11.602582 3.623461,-23.205766 5.435547,-34.808593 -0.78125,0.002 -1.5625,0.0039 -2.34375,0.0059 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3154-6"
+           d="m -92,-114.0957 c -9.65306,21.370408 -17.89279,40.79588 -27.54477,62.166781 18.15494,-0.07914 34.895674,1.783866 53.050629,1.706263 0.06733,-21.682946 0.137852,-43.365882 0.205079,-65.048824 l -25.179688,0 -0.411749,0.91129 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3156-7"
+           d="m -66.152344,-100.51562 c 0.03693,16.71875 0.08011,33.437491 0.117188,50.156245 15.351562,0 30.703125,0 46.054687,0 -8.699351,-17.300719 -17.401625,-34.599967 -26.101562,-51.900395 -6.691403,-0.0966 -13.382814,-0.19259 -20.074219,-0.28906 0.0013,0.67774 0.0026,1.35547 0.0039,2.03321 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3158-5"
+           d="m -65.517578,-115.5918 c -5.745429,0.11003 -5.452576,7.40481 -4.640625,11.42188 -0.01453,19.51398 -0.107833,39.175322 -0.05859,58.749998 3.976838,1.680534 8.943175,-1.045553 8.318359,-5.695312 -1.044411,-18.603485 0.09213,-37.34228 -0.318359,-56.025386 -0.646687,-3.48319 2.084709,-9.24994 -3.300781,-8.45118 z"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2381"
+         d="M 3.7107426,-6.7124887 91.418937,-6.9074002 87.236577,19.880514 16.140737,19.685602 3.7107426,-6.7124887 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#3d6b98;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3154"
+         d="m 29.053699,-73.076985 18.585768,0 -0.181336,57.0637 -44.2710634,0.194911 25.8666314,-57.258611 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3156"
+         d="m 69.373459,-60.101441 -13.582196,-0.194911 0.106113,44.13064 35.572778,0 -22.096673,-43.935728 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3158"
+         d="m 51.724001,-75.297778 0,66.3505985"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.41036224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/navit/xpm/bus.svg b/navit/xpm/bus.svg
index 8ef93e642..13b34d342 100644
--- a/navit/xpm/bus.svg
+++ b/navit/xpm/bus.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -9,11 +10,11 @@
    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"
-   width="22"
-   height="22"
+   width="100"
+   height="100"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="bus.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -59,7 +60,8 @@
        y1="12.919525"
        x2="13.280306"
        y2="4.8899608"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.7280586,0,0,4.7280586,-4.1607651,-78.721961)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3181"
@@ -69,7 +71,7 @@
        y1="8.9047422"
        x2="13.129622"
        y2="-6.9136248"
-       gradientTransform="matrix(0.8888038,0,0,0.8888038,1.2344919,0.9901737)" />
+       gradientTransform="matrix(4.2023165,0,0,4.2023165,1.675985,-74.040363)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -78,16 +80,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="10.658503"
-     inkscape:cy="11.00096"
+     inkscape:zoom="3.959798"
+     inkscape:cx="21.801782"
+     inkscape:cy="76.440013"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1024"
-     inkscape:window-height="699"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
      inkscape:window-x="0"
-     inkscape:window-y="25">
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -102,97 +105,120 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3159"
-       width="3.0357144"
-       height="5.3571458"
-       x="3.0357141"
-       y="15.669642"
-       rx="1"
-       ry="1" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3163"
-       width="3.0357144"
-       height="5.3571458"
-       x="16.107141"
-       y="15.758928"
-       rx="1"
-       ry="1" />
-    <path
-       style="fill:#516280;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.1964286,1.0625 C 7.0673776,0.17836005 14.927626,-0.024420878 21.035716,1.1071428 L 21.07143,11.084821 L 21.07143,19.062499 L 1.1160715,19.062499 L 1.1160715,11.084821 L 1.1964286,1.0625 z"
-       id="rect2386"
-       sodipodi:nodetypes="ccccccc" />
-    <rect
-       style="opacity:1;fill:#babd00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3165"
-       width="17.723225"
-       height="3.2500007"
-       x="2.3035712"
-       y="2"
-       rx="1"
-       ry="0.95535707" />
-    <path
-       style="fill:url(#linearGradient3175);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.155573,3 L 20,3.0446429 L 19.826461,12.919525 L 2.0485408,12.919525 L 2.155573,3 z"
-       id="path3167"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3187"
-       width="2.9017856"
-       height="1.8749995"
-       x="2.0535715"
-       y="15.035714" />
-    <rect
-       style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3415"
-       width="2.9017856"
-       height="1.8749995"
-       x="15.125"
-       y="15" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3413"
-       width="2.9017856"
-       height="1.8749995"
-       x="17.125"
-       y="15" />
-    <rect
-       style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3417"
-       width="2.9017856"
-       height="1.8749995"
-       x="3.9642856"
-       y="15" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 14.373479,8.5271747 L 15.676062,8.5271747 C 16.372813,8.5271747 16.933736,9.0630558 16.933736,9.7287019 L 16.933736,11.884714 L 16.953387,13.002022 L 13.138263,13.016058 L 13.115805,11.884714 L 13.115805,9.7287019 C 13.115805,9.0630558 13.676728,8.5271747 14.373479,8.5271747 z"
-       id="rect3419"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3421"
-       sodipodi:cx="17.901785"
-       sodipodi:cy="6.1071429"
-       sodipodi:rx="1.1071428"
-       sodipodi:ry="1.1071428"
-       d="M 19.008928,6.1071429 A 1.1071428,1.1071428 0 1 1 16.794642,6.1071429 A 1.1071428,1.1071428 0 1 1 19.008928,6.1071429 z"
-       transform="matrix(1.2576734,0,0,1.2576734,-7.4785958,-0.6807912)" />
-    <path
-       style="fill:url(#linearGradient3179);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 4.0927349,3.5854032 L 18.121763,3.5060325 C 18.795114,5.9461485 18.919421,10.138186 18.856325,12.473096 L 3.3329939,12.473096 C 3.335812,10.305907 3.3579912,6.2753972 4.0927349,3.5854032 z"
-       id="path3177"
-       sodipodi:nodetypes="ccccc" />
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g4235"
+       transform="matrix(0.92925653,0,0,0.92925653,4.6687013,-2.6978558)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3159-6"
+         d="m 44.909514,-80.500443 c -15.86237,0.23187 -31.71187,1.520829 -47.3867205,3.974609 -0.28658,30.788752 -0.51179,61.578861 -0.40625,92.369141 2.90480003,1.051928 7.0449,-0.951187 9.36719,0.59375 -0.85233,7.790006 9.0546105,10.764473 15.1816405,8.585938 4.24426,-0.698021 7.05574,-4.816893 6.95313,-8.982422 13.01726,0.04326 26.19722,-0.08633 39.11328,0.06445 -0.18119,6.160195 5.91821,10.86098 11.806639,9.830078 5.419494,0.773496 11.06969,-3.735344 10.984375,-9.320312 4.828147,0.192527 11.098512,-2.915111 9.484372,-8.6816415 -1.238765,-18.5942465 -0.194585,-37.4784905 -0.622325,-56.1854705 -0.0292,-9.3171 -0.0692,-18.634162 -0.10228,-27.951248 -17.893022,-3.484834 -36.171391,-4.544919 -54.373051,-4.296875 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         ry="4.7280588"
+         rx="4.7280588"
+         y="-4.634974"
+         x="10.192269"
+         height="25.328899"
+         width="14.353036"
+         id="rect3159"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         ry="4.7280588"
+         rx="4.7280588"
+         y="-4.2128253"
+         x="71.994743"
+         height="25.328899"
+         width="14.353036"
+         id="rect3163"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="rect2386"
+         d="m 1.4960195,-73.698399 c 27.7581905,-4.180266 64.9219065,-5.139026 93.8013145,0.211074 l 0.168838,47.175047 0,37.718928 -94.3501045,0 0,-37.718928 0.379952,-47.386121 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#516280;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         ry="4.516984"
+         rx="4.7280588"
+         y="-69.265846"
+         x="6.7306547"
+         height="15.366194"
+         width="83.796448"
+         id="rect3165"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babd00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3167"
+         d="m 6.0309104,-64.537786 84.3694966,0.211074 -0.820503,46.689022 -84.0550481,0 0.5060545,-46.900096 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3175);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.6322241"
+         x="5.5486412"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3187"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.8010826"
+         x="67.35112"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3415"
+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.8010826"
+         x="76.807243"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3413"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.8010826"
+         x="14.582609"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3417"
+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         id="rect3419"
+         d="m 63.797887,-38.40498 6.158688,0 c 3.29428,0 5.946357,2.533678 5.946357,5.680891 l 0,10.193752 0.0929,5.282697 -18.03813,0.06638 -0.106189,-5.349061 0,-10.193751 c 0,-3.147214 2.652078,-5.680891 5.946357,-5.680891 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <circle
+         r="6.5834627"
+         cy="-45.625553"
+         cx="66.930336"
+         id="path3421"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3177"
+         d="m 15.189926,-61.769965 66.330066,-0.375269 c 3.183643,11.53701 3.771375,31.35721 3.473053,42.396801 l -73.39522,0 c 0.01334,-10.246596 0.118187,-29.303083 3.592101,-42.021532 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3179);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
   </g>
 </svg>
diff --git a/navit/xpm/cemetery.svg b/navit/xpm/cemetery.svg
new file mode 100644
index 000000000..b0a1b57e8
--- /dev/null
+++ b/navit/xpm/cemetery.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="cemetery.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/bus.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3181">
+      <stop
+         id="stop3183"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop3185"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         style="stop-color:#656565;stop-opacity:1;"
+         offset="1"
+         id="stop3173" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#0083f4"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="64.037739"
+     inkscape:cy="39.543761"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3406"
+       transform="matrix(0.94144861,0,0,0.94144803,3.792252,2.146684)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3372-3"
+         d="m 43.832872,-84.613281 c -17.92762,-0.627537 -32.33686,15.314328 -35.3261796,32.083984 -3.11721,13.190543 -5.26845,28.206941 1.20899,40.72461 8.5231496,13.6481381 24.8409996,19.0241691 38.4296896,26.041015 10.18907,4.643537 23.10901,9.709129 33.6582,3.394531 10.71723,-7.9345419 10.62546,-22.9406289 11.20508,-34.943359 0.13852,-15.481624 1.55905,-32.264284 -5.72852,-46.494141 -8.06987,-12.402375 -23.34418,-17.557201 -37.13507,-20.395041 -2.08942,-0.29086 -4.2023,-0.434831 -6.31219,-0.411599 z"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         style="fill:#8c8c8c"
+         d="M 32.599638,2.0998956 C 12.057521,-9.0364221 7.8998213,-16.701744 10.157468,-39.275517 c 3.613403,-36.129808 25.158436,-49.979645 55.935084,-35.956869 19.901521,9.067742 23.139307,16.222333 23.139307,51.131341 0,45.579182 -11.269507,50.793029 -56.632221,26.2009406 z"
+         id="path3372"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#3f3f3f"
+         d="m 35.370645,-19.420155 c -11.969156,-7.735063 -11.969156,-8.732492 0,-8.976869 11.969156,-0.244351 11.969156,-1.241806 0,-8.976869 -7.405917,-4.786072 -9.425713,-8.701945 -4.488435,-8.701945 4.937278,0 15.036256,3.915873 22.442173,8.701945 11.969156,7.735063 11.969156,8.732492 0,8.976869 -11.969156,0.24435 -11.969156,1.241806 0,8.976869 7.405917,4.786072 9.425712,8.701943 4.488434,8.701943 -4.937277,0 -15.036255,-3.915871 -22.442172,-8.701943 z"
+         id="path3370"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/cemetery.xpm b/navit/xpm/cemetery.xpm
deleted file mode 100644
index 5722e8f3f..000000000
--- a/navit/xpm/cemetery.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * cemetery_xpm[] = {
-"14 16 8 1",
-" 	c None",
-".	c #8E8E8E",
-"+	c #8D8D8D",
-"@	c #404040",
-"#	c #8E8D8E",
-"$	c #8C8C8C",
-"%	c #8F8F8F",
-"&	c #898989",
-"              ",
-"              ",
-"              ",
-"    .++.      ",
-"   .++++++    ",
-"  +.++++++.   ",
-"  ++++++++.   ",
-"  .+@@+++++   ",
-"  .+++@@+++   ",
-"  #+@@++++.   ",
-"  #.++@@+++   ",
-"   .+++++++   ",
-"     $%....   ",
-"       $%.&   ",
-"              ",
-"              "};
diff --git a/navit/xpm/cinema.svg b/navit/xpm/cinema.svg
index dbfa6b60c..c204332dd 100644
--- a/navit/xpm/cinema.svg
+++ b/navit/xpm/cinema.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -9,11 +10,11 @@
    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"
-   width="22"
-   height="22"
+   width="100"
+   height="100"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="cinema.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -57,7 +58,8 @@
        x2="2.0625"
        y2="4.65625"
        gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
+       spreadMethod="reflect"
+       gradientTransform="matrix(4.9592696,0,0,4.9592696,-3.33272,-83.487192)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -66,16 +68,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="10.642241"
-     inkscape:cy="12.077112"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="82.273623"
+     inkscape:cy="48.388215"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="943"
      inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -90,41 +93,70 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.4375,6.5625 L 19.625,7.6875 L 19.625,19.6875 L 3.3125,20.5625 L 1.4375,6.5625 z"
-       id="rect2381"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:url(#linearGradient3162);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.5,3.5625 L 19.6875,1.5625 L 19.8125,4.5 L 1.375,5.625 L 1.5,3.5625 z"
-       id="path3154"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.331029,9.2720779 L 17,9.8907964"
-       id="path3168" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.1265242,13.537243 L 16.955806,13.581436"
-       id="path3170"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.7010484,18.023379 L 17.027728,17.581437"
-       id="path3172"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.45597485"
-       d="M 12.52167,13.831883 L 12.521671,17.441048"
-       id="path3174"
-       sodipodi:nodetypes="cc" />
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3407"
+       transform="matrix(0.9240695,0,0,0.9240695,4.544277,-0.43471249)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2381-5"
+         d="m 95.99219,-80.94922 c -32.05588,3.52573 -64.11198,7.04949 -96.16796964,10.57422 1.49032004,6.3509 -1.99300996,12.90195 0.008,18.96484 C 3.0962104,-27.04692 6.3576804,-2.6833402 9.6232404,21.679688 39.07975,20.102686 68.53598,18.520546 97.99238,16.941406 c 0,-22.3554662 0,-44.710936 0,-67.066406 -22.32107,-1.37852 -44.64191,-2.76069 -66.96289,-4.14062 22.68555,-1.38331 45.37103,-2.76785 68.05664,-4.1504 -0.3233,-7.58914 -0.64629,-15.17831 -0.9668,-22.76757 -0.70898,0.0781 -1.41797,0.15625 -2.12695,0.23437 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2381"
+         d="m 3.79623,-50.941986 90.196716,5.579178 0,59.511236 -80.898086,4.33936 -9.29863,-69.429774 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.95926952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3154"
+         d="M 4.1061843,-65.819795 94.3029,-75.738334 94.922809,-61.170479 3.4862756,-55.591301 4.1061843,-65.819795 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3162);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.95926952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3168"
+         d="m 18.14602,-37.504459 62.828843,3.068392"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3170"
+         d="m 22.091096,-16.352355 58.664597,0.21915"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3172"
+         d="M 24.940316,5.8956029 81.112374,3.7038934"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3174"
+         d="m 58.765617,-14.891156 5e-6,17.8988225"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.45597486" />
+    </g>
   </g>
 </svg>