diff --git a/data/tags.yml b/data/tags.yml
index fc355b6..c9690ec 100644
--- a/data/tags.yml
+++ b/data/tags.yml
@@ -81,6 +81,8 @@ node_icons:
 
   - tags: {amenity: ferry_terminal}
     icon: [anchor]
+  - tags: {amenity: ferry_terminal, cargo: vehicle}
+    icon: [car_on_ferry]
   - tags: {aeroway: aerodrome}
     icon: [plane]
   - tags: {aeroway: helipad}
diff --git a/doc/grid.png b/doc/grid.png
index 8604f2c..97a9919 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/icons/icons.svg b/icons/icons.svg
index 7c4ee1e..1b94f98 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -145,12 +145,12 @@
      inkscape:object-paths="true"
      inkscape:guide-bbox="true"
      showguides="false"
-     showgrid="false"
+     showgrid="true"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="160.16206"
-     inkscape:cx="283.31529"
-     inkscape:zoom="2"
+     inkscape:cy="124.0821"
+     inkscape:cx="199.04752"
+     inkscape:zoom="8"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -14383,5 +14383,104 @@
       <title
          id="title6477">book</title>
     </path>
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path6479"
+       d="m 199,454 -2.5,2 -1.5,0 0,1 10,0 0,-1 -1,0 -2,-2 z"
+       style="fill:none;stroke:#cccccc;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <rect
+       ry="2"
+       rx="2"
+       y="456"
+       x="195"
+       height="4"
+       width="4"
+       id="rect6481"
+       style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6483"
+       width="4"
+       height="4"
+       x="201"
+       y="456"
+       rx="2"
+       ry="2" />
+    <rect
+       ry="1"
+       style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6485"
+       width="2"
+       height="2"
+       x="196"
+       y="457"
+       rx="1" />
+    <rect
+       ry="1"
+       style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6487"
+       width="2"
+       height="2"
+       x="202"
+       y="457"
+       rx="1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 193,460 14,0 -2,1 -1,1 0,-1 -8,0 0,1 z"
+       id="path6490"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6492"
+       sodipodi:type="arc"
+       sodipodi:cx="196"
+       sodipodi:cy="461"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       sodipodi:start="0"
+       sodipodi:end="1.5707963"
+       sodipodi:open="true"
+       d="m 197,461 a 1,1 0 0 1 -1,1" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6494"
+       cx="198"
+       cy="461"
+       r="1" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6496"
+       cx="200"
+       cy="461"
+       r="1" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6498"
+       cx="202"
+       cy="461"
+       r="1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6500"
+       sodipodi:type="arc"
+       sodipodi:cx="204"
+       sodipodi:cy="461"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       sodipodi:start="1.5707963"
+       sodipodi:end="3.1415927"
+       d="M 204,462 A 1,1 0 0 1 203.29289,461.70711 1,1 0 0 1 203,461 l 1,0 z" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 199,469 c -0.22713,-1.7e-4 -0.44755,0.077 -0.625,0.21875 L 196.14844,471 195,471 c -0.55226,6e-5 -0.99994,0.44774 -1,1 l 0,1 c 6e-5,0.55226 0.44774,0.99994 1,1 0,-1.108 0.892,-2 2,-2 1.108,0 2,0.892 2,2 l 2,0 c 0,-1.108 0.892,-2 2,-2 1.108,0 2,0.892 2,2 0.55226,-6e-5 0.99994,-0.44774 1,-1 l 0,-1 c -6e-5,-0.55226 -0.44774,-0.99994 -1,-1 l -0.58594,0 -1.70703,-1.70703 C 202.51952,469.10543 202.2652,469.00005 202,469 Z m -2,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 6,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -10,3 3,2 c 0.55228,0 1,-0.44772 1,-1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 4e-5,0.2652 0.10542,0.51953 0.29297,0.70703 C 203.48047,477.89458 204,478 204,478 l 3,-2 z"
+       id="car_on_ferry"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccsccsccccccccsssssssssscccscscsccccc"
+       inkscape:label="#path6503">
+      <title
+         id="title6544">car_on_ferry</title>
+    </path>
   </g>
 </svg>