diff --git a/data/tags.yml b/data/tags.yml
index 01c18f2..9a5f016 100644
--- a/data/tags.yml
+++ b/data/tags.yml
@@ -108,6 +108,10 @@ tags:
   icon: [electricity]
 - tags: {building: apartments}
   icon: [apartments]
+- tags: {building: garages}
+  icon: [garages]
+- tags: {building: garage}
+  icon: [garage]
 - tags: {tourism: hotel}
   icon: [hotel]
 - tags: {tourism: hostel}
diff --git a/doc/grid.png b/doc/grid.png
index a0e18c6..4322ed9 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/icons/icons.svg b/icons/icons.svg
index 72017b2..3851010 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="95.427948"
-     inkscape:cy="364.76586"
+     inkscape:cx="315.6361"
+     inkscape:cy="453.31033"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
      showgrid="true"
@@ -383,6 +383,24 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5206"
+       d="m 279,151 -2.5,2 -1.5,0 0,1 10,0 0,-1 -1,0 -2,-2 z"
+       style="fill:#808080;stroke:#808080;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5204"
+       d="m 279,152 -2.5,2 -1.5,0 0,1 10,0 0,-1 -1,0 -2,-2 z"
+       style="fill:#ffd5d5;stroke:#ffd5d5;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 135,216 -1.5,3 0,3"
+       id="path5188"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
     <path
        style="fill:#808080;stroke:none"
        d="M 72 289 L 71.78125 290.03125 C 69.749061 290.14254 68.142543 291.74906 68.03125 293.78125 L 67 294 L 68.03125 294.1875 C 68.122146 296.11897 69.556624 297.67256 71.4375 297.9375 L 72 303 L 72.5625 297.9375 C 74.443376 297.67256 75.877854 296.11897 75.96875 294.1875 L 77 294 L 75.96875 293.78125 C 75.857457 291.74906 74.250939 290.14254 72.21875 290.03125 L 72 289 z M 71.59375 291.03125 L 71.15625 293.15625 L 69.03125 293.59375 C 69.215044 292.27006 70.270056 291.21504 71.59375 291.03125 z M 72.40625 291.03125 C 73.729944 291.21504 74.784956 292.27006 74.96875 293.59375 L 72.84375 293.15625 L 72.40625 291.03125 z M 69.03125 294.40625 L 71.09375 294.8125 L 71.3125 296.90625 C 70.125743 296.62187 69.201625 295.6333 69.03125 294.40625 z M 74.96875 294.40625 C 74.798375 295.6333 73.874257 296.62187 72.6875 296.90625 L 72.90625 294.8125 L 74.96875 294.40625 z "
@@ -5047,5 +5065,154 @@
        d="M 81.90625 226.5 C 81.555308 226.5737 81.402114 227.09075 81.65625 227.34375 L 82.5 228.1875 L 82.5 231 C 82.500026 231.26179 82.738208 231.49997 83 231.5 L 83.5 231.5 C 83.706749 231.497 83.904138 231.35266 83.96875 231.15625 L 84.71875 228.90625 L 85 229.1875 L 85 230.5 L 85 233.5 C 85 233.59965 85.043896 233.67219 85.09375 233.75 L 84.15625 235.625 C 83.817607 235.38426 83.491078 235.11608 83.1875 234.8125 C 83.078353 234.69408 82.909469 234.63377 82.75 234.65625 C 82.399058 234.72995 82.245864 235.247 82.5 235.5 C 85.815269 238.81527 91.184731 238.81527 94.5 235.5 C 94.75698 235.34282 94.806757 234.93176 94.59375 234.71875 C 94.380742 234.50574 93.969682 234.55549 93.8125 234.8125 C 93.508922 235.11608 93.182393 235.38426 92.84375 235.625 L 91.90625 233.75 C 91.956104 233.67219 92 233.59965 92 233.5 L 92 230.5 C 92 230.223 91.777 230 91.5 230 L 86.5 230 L 86.5 229 C 86.5 228.33333 86.172317 227.73482 85.71875 227.28125 C 85.265183 226.82768 84.666667 226.5 84 226.5 L 82 226.5 C 81.96884 226.497 81.93741 226.497 81.90625 226.5 z M 92.90625 227.5 C 92.732201 227.5368 92.583008 227.67355 92.53125 227.84375 L 92.03125 229.34375 C 91.928091 229.75301 92.524889 230.12027 92.84375 229.84375 L 93.84375 228.84375 L 94.34375 228.34375 C 94.606545 228.0666 94.381656 227.5146 94 227.5 L 93 227.5 C 92.96884 227.497 92.93741 227.497 92.90625 227.5 z M 86.0625 234 L 90.9375 234 L 92.03125 236.15625 C 89.837672 237.31891 87.162328 237.31891 84.96875 236.15625 L 86.0625 234 z "
        id="toy_horse"
        inkscape:label="#path5148" />
+    <rect
+       ry="0.5"
+       rx="0.5"
+       y="214"
+       x="132"
+       height="4"
+       width="8"
+       id="rect5173"
+       style="fill:#d4aa00;stroke:none" />
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5175"
+       d="m 130,215 0.5,0 1,-3 1,1 0,1.5 0.5,-0.5 0,-1 c 0,-1 -1,-2 -2,-2 l -2,0 1,1 z"
+       style="fill:#d4aa00;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path5177"
+       d="m 133.5,216 -3,3 0,3"
+       style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path5179"
+       d="m 138,216 2.5,2 0,4"
+       style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#d4aa00;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 141.5,216.5 c 0,-0.78519 0,-0.72909 0,-1 0,-0.55228 -0.44772,-1 -1,-1 l -1,0"
+       id="path5183"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path5190"
+       d="m 137,216 1.5,3 0,3"
+       style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       style="fill:#808080;stroke:#808080;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 279,153 -2.5,2 -1.5,0 0,1 10,0 0,-1 -1,0 -2,-2 z"
+       id="path5192"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="fill:#ffd5d5;stroke:none"
+       id="rect5194"
+       width="4"
+       height="4"
+       x="275"
+       y="155"
+       rx="2"
+       ry="2" />
+    <rect
+       ry="2"
+       rx="2"
+       y="155"
+       x="281"
+       height="4"
+       width="4"
+       id="rect5196"
+       style="fill:#ffd5d5;stroke:none" />
+    <rect
+       rx="1"
+       y="156"
+       x="276"
+       height="2"
+       width="2"
+       id="rect5198"
+       style="fill:#808080;stroke:none"
+       ry="1" />
+    <rect
+       rx="1"
+       y="156"
+       x="282"
+       height="2"
+       width="2"
+       id="rect5200"
+       style="fill:#808080;stroke:none"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 273.5,149.5 1,-1 11,0 1,1"
+       id="path5202"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 274.34375,162 c -0.0741,0.0356 -0.13911,0.0898 -0.1875,0.15625 l -1,1 c -0.25698,0.15718 -0.30568,0.56716 -0.0927,0.78017 0.21301,0.21301 0.62299,0.16431 0.78017,-0.0927 L 274.6875,163 l 10.625,0 0.84375,0.84375 c 0.15718,0.25698 0.56716,0.30568 0.78017,0.0927 0.21301,-0.21301 0.16431,-0.62299 -0.0927,-0.78017 l -1,-1 C 285.75511,162.06243 285.62896,162.00509 285.5,162 l -11,0 c -0.0312,-0.003 -0.0626,-0.003 -0.0937,0 -0.0208,-0.001 -0.0417,-0.001 -0.0625,0 z m 4.46875,2 c -0.16087,0.0354 -0.31266,0.11129 -0.4375,0.21875 L 276.15625,166 275,166 c -0.52358,5e-5 -0.99995,0.47642 -1,1 l 0,0.84375 c 0.0743,-0.46957 0.52463,-0.84954 1,-0.84375 l 1.15625,0 2.21875,-1.78125 c 0.1508,-0.12243 0.33796,-0.1995 0.53125,-0.21875 0.0312,-0.001 0.0625,-0.001 0.0937,0 l 3,0 c 0.26406,-0.006 0.52897,0.0976 0.71875,0.28125 L 284.4375,167 285,167 c 0.49376,-0.002 0.95367,0.41467 1,0.90625 L 286,167 c -5e-5,-0.52358 -0.47642,-0.99995 -1,-1 l -0.5625,0 -1.71875,-1.71875 C 282.52897,164.09755 282.26406,163.99388 282,164 l -3,0 c -0.0312,-0.001 -0.0625,-0.001 -0.0937,0 -0.0312,-0.001 -0.0625,-0.001 -0.0937,0 z m 0.0937,3 c -0.19329,0.0192 -0.38045,0.0963 -0.53125,0.21875 L 276.15625,169 275,169 c -0.52358,5e-5 -0.99995,0.47642 -1,1 l 0,1 c 5e-5,0.52358 0.47642,0.99995 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.52358,-5e-5 0.99995,-0.47642 1,-1 l 0,-1 c -5e-5,-0.52358 -0.47642,-0.99995 -1,-1 l -0.5625,0 -1.71875,-1.71875 C 282.52897,167.09755 282.26406,166.99388 282,167 l -3,0 c -0.0312,-0.001 -0.0625,-0.001 -0.0937,0 z M 277,171 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"
+       id="garages"
+       inkscape:label="#path5208"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccsccccscccccccccccccccccccccccccccccccccccccsccscccccccccssssssssss" />
+    <path
+       sodipodi:nodetypes="cccsccccscccccccsccccsccscccccccccsssssssssssss"
+       inkscape:connector-curvature="0"
+       inkscape:label="#path5208"
+       id="garage"
+       d="m 290.34375,163 c -0.0741,0.0356 -0.13911,0.0898 -0.1875,0.15625 l -1,1 c -0.25698,0.15718 -0.30568,0.56716 -0.0927,0.78017 0.21301,0.21301 0.62299,0.16431 0.78017,-0.0927 L 290.6875,164 l 10.625,0 0.84375,0.84375 c 0.15718,0.25698 0.56716,0.30568 0.78017,0.0927 0.21301,-0.21301 0.16431,-0.62299 -0.0927,-0.78017 l -1,-1 C 301.75512,163.06238 301.62896,163.00509 301.5,163 l -11,0 c -0.0312,-0.003 -0.0626,-0.003 -0.0937,0 -0.0208,-0.001 -0.0417,-0.001 -0.0625,0 z m 4.56245,3 c -0.19329,0.0192 -0.38045,0.0963 -0.53125,0.21875 L 292.15625,168 291,168 c -0.52358,5e-5 -0.99995,0.47642 -1,1 l 0,1 c 5e-5,0.52358 0.47642,0.99995 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.52358,-5e-5 0.99995,-0.47642 1,-1 l 0,-1 c -5e-5,-0.52358 -0.47642,-0.99995 -1,-1 l -0.5625,0 -1.71875,-1.71875 C 298.52897,166.09755 298.26406,165.99388 298,166 l -3,0 c -0.0312,-0.001 -0.0625,-0.001 -0.0937,0 z M 293,170 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"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       style="fill:#000000;stroke:none"
+       d="m 307,155 0,-1 9,0 0,1 -2,4 -5,0 z"
+       id="path5241"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="fill:#000000;stroke:none"
+       id="rect5245"
+       width="1"
+       height="8"
+       x="311"
+       y="149"
+       ry="0.5"
+       rx="0.5" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;stroke:none"
+       id="path5247"
+       sodipodi:cx="311.5"
+       sodipodi:cy="149.5"
+       sodipodi:rx="2.5"
+       sodipodi:ry="2.5"
+       d="m 313.26777,147.73223 a 2.5,2.5 0 1 1 -3.53554,0 L 311.5,149.5 z"
+       sodipodi:start="5.4977871"
+       sodipodi:end="10.210176"
+       transform="translate(0,-1.5)" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 307,158 1,1 7,0 1,-1 z"
+       id="path5251"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#000000;stroke:none"
+       id="rect5253"
+       width="5"
+       height="4"
+       x="309"
+       y="147"
+       rx="2"
+       ry="2" />
+    <path
+       style="fill:#000000;stroke:none"
+       d="m 309,148 5,0 0,1 -5,0 z"
+       id="rect5255"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
   </g>
 </svg>