Changed icon styles

7 files changed, 90 insertions, 289 deletions

diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js
index 52eea1d0..c79406b0 100644
--- a/web/app/DeviceImages.js
+++ b/web/app/DeviceImages.js
@@ -39,6 +39,7 @@ Ext.define('Traccar.DeviceImages', {
         svg.getElementById(device.get('fillId')).style.fill = color;
         // Prepare rotate transformation
         rotateTransform = 'rotate(' + angle + ' ' + (width / 2) + ' ' + (height / 2) + ')';
+        svg.getElementById(device.get('rotateId')).setAttribute('transform', rotateTransform);
 
         // Adjust size and prepare scale transformation
         width *= device.get('scale');
@@ -51,9 +52,13 @@ Ext.define('Traccar.DeviceImages', {
             scaleTransform = 'scale(' + device.get('scale') + ') ';
         }
 
-        //Apply both transformation in right order
-        transform = scaleTransform + ' ' + rotateTransform;
-        svg.getElementById(device.get('rotateId')).setAttribute('transform', transform);
+        if (device.get('scaleId') !== device.get('rotateId')) {
+            svg.getElementById(device.get('scaleId')).setAttribute('transform', scaleTransform);
+        } else {
+            svg.getElementById(device.get('scaleId')).setAttribute('transform', scaleTransform + ' ' + rotateTransform);
+        }
+        //transform = scaleTransform + ' ' + rotateTransform;
+        
 
         // Set dimension attributes
         svg.documentElement.setAttribute('width', width);
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index 22a7872f..e7ad4cbc 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -17,35 +17,39 @@
  */
 Ext.define('Traccar.store.DeviceImages', {
     extend: 'Ext.data.Store',
-    fields: ['key', 'name', 'url', 'svg', 'fillId', 'rotateId', 'scale'],
+    fields: ['key', 'name', 'svg', 'fillId', 'rotateId', 'scaleId', 'scale'],
 
     data: [{
         key: 'default',
         name: Strings.categoryDefault,
         svg: document.getElementById('arrowSvg').contentDocument,
-        rotateId: 'arrow',
         fillId: 'arrow',
+        rotateId: 'arrow',
+        scaleId: 'arrow',
         scale: 1
     }, {
         key: 'car',
         name: Strings.categoryCar,
         svg: document.getElementById('carSvg').contentDocument,
-        fillId: 'path4149',
-        rotateId: 'g4207',
-        scale: 0.06,
+        fillId: 'path4148',
+        rotateId: 'path4148',
+        scaleId: 'layer2',
+        scale: 1
     }, {
         key: 'bus',
         name: Strings.categoryBus,
         svg: document.getElementById('busSvg').contentDocument,
-        fillId: 'path4713',
-        rotateId: 'layer2',
-        scale: 0.12,
+        fillId: 'path4148',
+        rotateId: 'path4148',
+        scaleId: 'layer2',
+        scale: 1
     }, {
         key: 'truck',
         name: Strings.categoryTruck,
         svg: document.getElementById('truckSvg').contentDocument,
-        fillId: 'path4718',
-        rotateId: 'layer2',
-        scale: 0.1,
+        fillId: 'path4148',
+        rotateId: 'path4148',
+        scaleId: 'layer2',
+        scale: 1
     }]
 });
\ No newline at end of file
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 829a8ea5..2f72e81c 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -309,14 +309,17 @@ Ext.define('Traccar.view.MapController', {
     },
 
     resizeMarker: function (style, zoom) {
-        var newStyle = new ol.style.Style({
-            image: Traccar.DeviceImages.getImageIcon(style.getImage().fill,
-                    zoom,
-                    style.getImage().angle,
-                    style.getImage().category),
-            text: style.getText()
+        var image, text;
+        image = Traccar.DeviceImages.getImageIcon(style.getImage().fill,
+                zoom,
+                style.getImage().angle,
+                style.getImage().category);
+        text = style.getText();
+        text.setOffsetY(- image.getSize()[1] / 2 - Traccar.Style.mapTextOffset);
+        return newStyle = new ol.style.Style({
+            image: image,
+            text: text
         });
-        return newStyle;
     },
     
     rotateMarker: function (style, angle) {
diff --git a/web/images/arrow.svg b/web/images/arrow.svg
index 538b0581..a85201d8 100644
--- a/web/images/arrow.svg
+++ b/web/images/arrow.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1.2px;" transform="" /></svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
diff --git a/web/images/bus.svg b/web/images/bus.svg
index 4e3d1f7a..2847eab4 100644
--- a/web/images/bus.svg
+++ b/web/images/bus.svg
@@ -9,15 +9,15 @@
    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="500px"
-   height="500px"
-   viewBox="0 0 500.00001 500.00001"
-   id="svg4144"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
+   id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="bus.svg">
   <defs
-     id="defs4146" />
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,27 +25,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="203.40483"
-     inkscape:cy="161.67936"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="-4.2362527"
+     inkscape:cy="18.152102"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:window-height="981"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata4149">
+     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:title>
+        <dc:title />
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
@@ -71,152 +71,16 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="opacity:1;fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:8px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 196.11953,55.873016 0.0829,391.607144 c 3.72662,13.54113 11.5055,22.80612 24.73849,24.46428 l 57.14286,0.35714 c 15.35608,-3.67133 22.29313,-12.95537 24.82143,-25.17856 l 0.7143,-390.892861 c -0.2913,-5.886565 -2.12374,-9.65786 -5.18591,-13.644643 l 24.97726,-0.374645 C 321.1664,37.001224 307.61725,27.363695 297.51536,40.879459 293.08957,33.592704 284.57147,29.058489 276.47667,28.015873 L 222.36952,27.8373 c -11.06058,1.916208 -17.21769,7.780519 -21.69229,14.905049 -11.14642,-16.386951 -25.50315,-2.099791 -25.63481,0.838857 l 24.90118,0.425857 c -2.37652,4.331728 -3.38012,8.63026 -3.82407,11.865953 z"
-       id="path4713"
+       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
+       id="path4148"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <g
-       id="g4818"
-       style="fill:#f2f2f2">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4735"
-         d="M 249.91072,39.732142 C 231.04598,39.712452 205.58753,37.16641 201.25,43.749999 l 5.17857,17.678572 c 7.57822,-5.855074 19.92572,-4.245259 43.21429,-4.285715 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4735-1"
-         d="m 249.82219,39.7043 c 18.86474,-0.01969 43.96605,-2.655018 48.30358,3.928571 l -5.17857,17.678572 c -7.57822,-5.85507 -19.79179,-4.155974 -43.08036,-4.196434 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4752"
-         d="m 201.14663,43.411049 c -6.8176,6.360856 -5.00544,36.02672 -5.08906,59.457411 l 8.81082,-0.0446 c 0.34555,-15.012868 -1.01474,-36.78369 1.58154,-41.29316 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="102.85714"
-         x="196.07143"
-         height="53.660713"
-         width="8.7946253"
-         id="rect4754"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="156.60713"
-         x="196.11607"
-         height="53.035713"
-         width="8.7053576"
-         id="rect4756"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="209.73213"
-         x="196.16071"
-         height="53.035721"
-         width="8.7053614"
-         id="rect4758"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="262.71875"
-         x="196.20045"
-         height="53.30722"
-         width="8.6079798"
-         id="rect4760"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="315.89285"
-         x="196.16072"
-         height="53.839287"
-         width="8.5714283"
-         id="rect4762"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="369.6167"
-         x="196.23468"
-         height="53.419014"
-         width="8.4974623"
-         id="rect4764"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4752-5"
-         d="m 298.17268,43.254296 c 7.90416,5.274295 5.11759,35.914567 5.08906,59.457414 l -8.81082,-0.0446 c -0.34555,-15.012873 1.01474,-36.783695 -1.58154,-41.293165 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="102.70039"
-         x="-303.24789"
-         height="53.660713"
-         width="8.7946253"
-         id="rect4754-4"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="156.45038"
-         x="-303.20325"
-         height="53.035713"
-         width="8.7053576"
-         id="rect4756-5"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="209.57536"
-         x="-303.1586"
-         height="53.035721"
-         width="8.7053614"
-         id="rect4758-6"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="262.56201"
-         x="-303.11887"
-         height="53.30722"
-         width="8.6079798"
-         id="rect4760-9"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="315.73611"
-         x="-303.1586"
-         height="53.839287"
-         width="8.5714283"
-         id="rect4762-5"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="369.45996"
-         x="-303.08463"
-         height="53.419014"
-         width="8.4974623"
-         id="rect4764-2"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path4801"
-         d="m 204.47033,423.30342 c -3.64856,22.24167 9.12482,44.86492 26.42857,45.17854 l 37.14286,-0.17853 c 18.9215,0.41739 30.05186,-22.16657 26.96428,-45.53573 0.76011,18.51126 -12.10167,34.0046 -27.14285,34.10713 l -37.32617,-0.16888 c -11.82277,-0.73357 -25.86632,-12.71876 -26.06669,-33.40253 z"
-         style="opacity:1;fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 227.05992,65.086657 0.0829,382.056203"
-       id="path4837"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.8434273;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 25,10.444761 C 16.961442,10.444954 10.444954,16.961442 10.444761,25 10.444954,33.038558 16.961442,39.555046 25,39.555239 33.038558,39.555046 39.555046,33.038558 39.555239,25 39.555046,16.961442 33.038558,10.444954 25,10.444761 Z m -0.164733,4.556013 0.0024,0 c 3.155084,0.0979 6.515016,0.567167 7.217613,2.520398 0.583475,2.537942 1.473743,4.963655 1.461405,7.532955 l 0.0071,7.036405 -1.437875,-0.0071 0.0094,1.656732 c 0.0036,1.678026 -2.685458,1.674435 -2.725136,0.02824 l 0.01412,-1.675559 -8.70255,0.01181 0.0047,1.475528 c 0.0035,1.863548 -2.688814,1.852016 -2.751022,0.01181 l 0.0071,-1.508474 -1.463761,0.0047 0.02824,-7.212904 c 0.150002,-2.626816 0.92017,-5.079313 1.543772,-7.476474 0.814705,-1.822141 3.854148,-2.309935 6.7846,-2.398025 z m 3.779421,1.750865 -7.187017,0.02589 c -0.748177,-0.0063 -0.767618,1.489368 -0.04075,1.489831 L 28.6366,18.3065 c 0.84169,-0.0068 0.817847,-1.561956 -0.02192,-1.554848 z m 1.449641,3.012147 -10.145131,0.0071 c -0.514212,0.03547 -0.646498,0.31785 -0.729527,0.510669 l -0.804832,3.892472 c 0.01567,0.625782 0.271458,0.822646 0.63304,0.830719 l 12.011308,0.01883 c 0.295009,-0.132124 0.641506,-0.162229 0.651867,-0.863667 l -0.790712,-3.763037 c -0.072,-0.198901 -0.09149,-0.593618 -0.826013,-0.633043 z m 0.635395,7.342429 c -0.799321,-4.68e-4 -1.447491,0.64454 -1.447287,1.440227 -2.04e-4,0.795688 0.647966,1.440697 1.447287,1.440228 0.798401,-8.25e-4 1.445138,-0.645454 1.444934,-1.440228 2.04e-4,-0.794772 -0.646533,-1.439401 -1.444934,-1.440227 z m -11.364148,0.0047 c -0.799321,-4.69e-4 -1.447491,0.644541 -1.447287,1.440228 -2.04e-4,0.795687 0.647966,1.440695 1.447287,1.440227 0.799321,4.68e-4 1.447492,-0.64454 1.447287,-1.440227 2.05e-4,-0.795687 -0.647966,-1.440697 -1.447287,-1.440228 z"
+       id="path4179"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 272.14286,65.043328 0.12627,382.521662"
-       id="path4839"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 249.53825,65.169597 0.0829,382.521663"
-       id="path4841"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccc" />
   </g>
 </svg>
diff --git a/web/images/car.svg b/web/images/car.svg
index e12ed9a0..0f56cc59 100644
--- a/web/images/car.svg
+++ b/web/images/car.svg
@@ -9,8 +9,9 @@
    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="500"
-   height="500"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -24,12 +25,13 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-332.69084"
-     inkscape:cy="476.11054"
+     inkscape:zoom="32.000001"
+     inkscape:cx="28.992205"
+     inkscape:cy="19.572065"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer2"
      showgrid="false"
+     units="px"
      inkscape:window-width="1920"
      inkscape:window-height="981"
      inkscape:window-x="0"
@@ -65,55 +67,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g4207">
-      <path
-         sodipodi:nodetypes="zccczczccczcz"
-         inkscape:connector-curvature="0"
-         id="path4149"
-         d="m 164.31862,85.468446 c -4.19906,39.571694 6.55669,91.762434 6.06092,147.482284 -10.52016,-1.80797 -20.2496,-2.39539 -19.86866,17.20586 l 19.27693,-7.70658 c -1.71236,42.20755 -11.244,119.22302 -5.46918,163.23681 5.77482,44.01379 37.68226,70.86495 98.99495,68.69037 57.16171,-0.22437 86.65984,-29.45295 90.49531,-70.49531 3.83547,-41.04236 -5.62278,-121.15641 -7.1144,-159.69692 l 20.41226,5.93837 c 2.35433,-15.05893 -9.06025,-22.05503 -20.45559,-18.18275 -1.71417,-0.64282 8.60748,-110.55723 6.06091,-143.946754 -2.54656,-33.389517 -38.86205,-60.167876 -92.5497,-62.358976 -53.46176,1.44606 -91.64469,20.261919 -95.84375,59.833596 z"
-         style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:18px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="zcccccccz"
-         inkscape:connector-curvature="0"
-         id="path4151"
-         d="m 256.92615,171.78049 c -44.12883,0.0136 -75.14588,18.92974 -76.71251,52.74454 l 5.82327,27.11352 33.05682,-9.37798 38.66401,-1.22862 38.32614,0.83942 34.40484,9.26211 5.51905,-27.34552 c 0.87812,-33.65356 -34.95279,-52.02103 -79.08162,-52.00747 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczccc"
-         inkscape:connector-curvature="0"
-         id="path4153"
-         d="m 198.15874,345.07766 -1.51523,52.02286 c 5.65793,29.35218 29.45066,42.46306 59.09392,42.42641 29.64326,-0.0367 60.86511,-12.41133 65.15484,-43.43656 l -0.50508,-51.51778 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczc"
-         inkscape:connector-curvature="0"
-         id="path4157"
-         d="m 180.22853,226.53267 -3.03046,98.0894 c 5.0681,37.51079 14.77304,32.79101 14.39468,-18.68782 -0.37837,-51.47882 -2.37697,-64.13759 -11.36422,-79.40158 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczc"
-         inkscape:connector-curvature="0"
-         id="path4157-3"
-         d="m 336.17606,224.45923 4.54569,98.61614 c -5.0681,37.51079 -14.77304,32.79101 -14.39468,-18.68782 0.37837,-51.47882 3.63966,-56.58311 9.84899,-79.92832 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <ellipse
-         ry="16.293392"
-         rx="12.721964"
-         cy="64.4645"
-         cx="198.43823"
-         id="path4174"
-         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:5" />
-      <ellipse
-         ry="16.293392"
-         rx="12.721964"
-         cy="63.750187"
-         cx="316.84073"
-         id="path4174-6"
-         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:5" />
-    </g>
+     id="layer2"
+     inkscape:label="Layer 2">
+    <path
+       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
+       id="path4148"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.60713017;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 25,10.33164 A 14.668712,14.668712 0 0 0 10.33164,25 14.668712,14.668712 0 0 0 25,39.66836 14.668712,14.668712 0 0 0 39.66836,25 14.668712,14.668712 0 0 0 25,10.33164 Z m -3.865712,6.635744 7.835774,0.04032 c 1.53138,0.145913 2.201745,0.919069 2.637222,1.864078 l 1.128883,4.49893 c 1.541149,-0.02204 2.241616,0.731963 2.485439,1.845106 l 0,4.546362 -1.247463,0.0166 0,1.501224 c 0.0043,2.349095 -3.798813,2.290352 -3.794564,-0.0095 l 0.01186,-1.517826 -10.352045,0.02135 -0.0047,1.460907 c 0.0074,2.412595 -3.843637,2.383667 -3.813536,-0.0047 l 0.02371,-1.444305 -1.052991,-0.0095 c -0.113588,0.0033 -0.213279,-0.01916 -0.213445,-0.237161 l 0.0072,-4.311572 c 0.36842,-1.045963 0.870527,-1.961458 2.549472,-1.845107 l 1.107538,-4.562963 c 0.252447,-0.737352 1.125378,-1.818866 2.691768,-1.852221 z m 0.03083,2.56133 c -0.180038,0.01554 -0.320307,0.07228 -0.362855,0.225302 l -0.879865,3.675983 10.269038,0 -0.93204,-3.555031 c -0.08363,-0.303493 -0.218321,-0.308551 -0.346254,-0.346254 l -7.748024,0 z m -3.199292,5.435712 a 1.6132596,1.6218878 0 0 0 -1.61506,1.622177 1.6132596,1.6218878 0 0 0 1.61506,1.622174 1.6132596,1.6218878 0 0 0 1.61269,-1.622174 1.6132596,1.6218878 0 0 0 -1.61269,-1.622177 z m 14.092061,0.0498 a 1.6132596,1.6218878 0 0 0 -1.612689,1.622175 1.6132596,1.6218878 0 0 0 1.612689,1.619805 1.6132596,1.6218878 0 0 0 1.61269,-1.619805 1.6132596,1.6218878 0 0 0 -1.61269,-1.622175 z"
+       id="path4179"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/web/images/truck.svg b/web/images/truck.svg
index 1f65e0dc..f9a34d49 100644
--- a/web/images/truck.svg
+++ b/web/images/truck.svg
@@ -9,9 +9,9 @@
    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="500"
-   height="500"
-   viewBox="0 0 500.00001 500.00001"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="195.16338"
-     inkscape:cy="286.29962"
+     inkscape:zoom="16"
+     inkscape:cx="40.268129"
+     inkscape:cy="20.202497"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
@@ -71,57 +71,16 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 190.79351,28.531817 C 177.60808,29.049025 171.0544,44.782872 171.3023,50.256254 l -0.0396,61.172316 -21.40626,-0.22779 c -16.86908,2.86168 -11.58456,23.89093 -0.28466,24.08815 l 10.97663,-0.0797 c 0.98536,-5.38348 1.35729,-10.66472 10.16589,-17.35207 l 0.71428,111.42857 c -4.24692,-0.33046 -7.28269,-0.19489 -7.22579,4.62119 l -0.16961,235.20922 c -0.23841,3.16729 1.19892,4.56696 5.67097,4.03317 l 166.39639,0.1696 c 1.15311,-0.32283 2.67054,0.26515 2.55383,-3.23223 l 0,-238.1134 c 0.0879,-3.22046 -1.18803,-3.6906 -5.20548,-3.60732 l 0.41841,-111.01388 c 8.11407,4.34267 9.84097,11.11853 11.00273,18.10969 l 12.13401,-3.7e-4 c 15.62702,-6.6151 9.83035,-22.17132 -0.75992,-24.63941 l -22.37682,0.6066 -0.59173,-65.48649 c -0.0903,-5.888911 -9.72969,-17.446043 -19.47262,-17.496921 z"
-       id="path4718"
+       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
+       id="path4148"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccc" />
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 171.34713,229.15285 162.04573,-0.75999"
-       id="path4739"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 214.46429,28.392856 c -5.80071,1.089231 -5.50629,6.100613 -6.47005,9.466144 L 200,105.35714"
-       id="path4741"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 291.45828,28.52044 c 5.80071,1.089231 5.50629,6.100613 6.47005,9.466144 l 7.99424,67.498136"
-       id="path4741-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 171.64234,122.98288 25.47002,27.23648 111.48924,0.0785 24.30679,-27.52665 0.0631,-5.74525 c -2.39904,-9.44151 -31.06848,-13.2503 -37.75445,-13.51078 l -84.60027,0 c -8.97913,0.17928 -34.45033,4.81556 -39.02612,13.74429 z"
-       id="path4758"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 176.7767,128.76894 0.32387,70.726 20.9633,1.17603 -0.84691,-50.51026 z"
-       id="path4760"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 329.22204,127.27242 -0.1976,72.49377 -20.9633,1.17603 0.84691,-50.51026 z"
-       id="path4760-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 203.04066,28.511299 c -1.81103,5.394916 -1.5885,11.016271 -10.6066,13.637059 l -19.1929,0.252538 c 1.93578,-3.984031 7.27783,-12.810686 16.28871,-13.889597 z"
-       id="path4801"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 302.30988,28.661154 c 1.81103,5.394916 1.5885,11.016271 10.6066,13.637059 l 19.1929,0.252538 C 330.1736,38.56672 324.83155,29.740065 315.82067,28.661154 Z"
-       id="path4801-5"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84430718;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 25,10.429576 C 16.953056,10.429769 10.429769,16.953056 10.429576,25 10.429769,33.046944 16.953056,39.570231 25,39.570424 33.046944,39.570231 39.570231,33.046944 39.570424,25 39.570231,16.953056 33.046944,10.429769 25,10.429576 Z m 8.841196,6.770477 c 0.460634,0.02953 0.622705,0.267803 0.650193,0.603076 l 0.03534,11.540907 c -0.07256,0.299323 -0.236494,0.572403 -0.69024,0.579519 l -0.770337,0.01885 c -0.07661,3.844781 -5.58244,3.657007 -5.564323,-0.0025 l -4.29221,-0.01183 c 0.0137,3.807627 -5.659897,3.856665 -5.630285,-0.01413 l -1.394615,-0.0047 c -0.958858,0.01435 -0.940133,-1.339998 0.01182,-1.363989 l 0.0025,-5.029565 c 0,0 0.03734,-0.309502 0.55596,-0.904614 l 2.108412,-2.113124 c 0.192955,-0.194626 0.404056,-0.415465 1.144904,-0.433461 l 1.821009,0.0025 -0.0047,-2.167306 c 0.02174,-0.279544 0.07758,-0.641486 0.636056,-0.69024 z m -13.472636,4.461824 -2.433508,2.13197 0.0071,0.525336 3.868171,-0.04004 0.02827,-2.617258 z m 0.02356,7.293457 c -0.565965,7.6e-4 -1.024459,0.465576 -1.02476,1.038894 3.01e-4,0.573318 0.458795,1.038134 1.02476,1.038894 0.566886,5.56e-4 1.026813,-0.464646 1.027115,-1.038894 -3.02e-4,-0.574249 -0.460229,-1.03945 -1.027115,-1.038894 z m 9.92485,0.05653 c -0.566874,7.61e-4 -1.025743,0.467012 -1.024759,1.041249 3.01e-4,0.573316 0.458793,1.038133 1.024759,1.038894 0.566885,5.57e-4 1.026813,-0.464645 1.027115,-1.038894 9.85e-4,-0.575169 -0.45932,-1.041808 -1.027115,-1.041249 z"
+       id="path4179"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" />
   </g>
 </svg>