diff --git a/doc/grid.png b/doc/grid.png
index 23cda54..2fcf9f0 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/icons/icons.svg b/icons/icons.svg
index ef2eeb3..d76d263 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -148,8 +148,8 @@
      showgrid="true"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="416.28723"
-     inkscape:cx="404.02113"
+     inkscape:cy="416.16223"
+     inkscape:cx="62.521128"
      inkscape:zoom="8"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -6099,7 +6099,7 @@
     <path
        inkscape:label="#path5018"
        id="bicycle"
-       d="m 22,181 a 0.50005,0.50005 0 0 0 -0.46484,0.31445 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.67578 l 1.14844,0.23047 a 0.50005,0.50005 0 0 0 0.0332,0.0566 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.0117 L 27.27734,184 28,184 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 26.97461,182.9941 0.50005,0.50005 0 0 0 26.92578,183 L 26,183 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.45313 L 21.6875,183.62695 22.33789,182 23.5,182 a 0.50005,0.50005 0 1 0 0,-1 z m 1.43164,3.99609 1.81641,0.36329 -0.76172,1.21875 z M 20.5,185 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
+       d="m 22,180 a 0.50005,0.50005 0 0 0 -0.46484,0.31445 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.67578 l 1.14844,0.23047 a 0.50005,0.50005 0 0 0 0.0332,0.0566 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.0117 L 27.27734,183 28,183 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 26.97461,181.994 0.50005,0.50005 0 0 0 26.92578,182 L 26,182 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.45313 L 21.6875,182.62695 22.33789,181 23.5,181 a 0.50005,0.50005 0 1 0 0,-1 z m 1.43164,3.99609 1.81641,0.36329 -0.76172,1.21875 z M 20.5,184 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        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;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:1px;stroke-linecap:round;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"
        inkscape:connector-curvature="0">
       <title
@@ -6189,7 +6189,7 @@
     <path
        inkscape:label="#rect5099"
        id="bicycle_p"
-       d="m 49.5,177 c -0.277,0 -0.5,0.20256 -0.5,0.45508 l 0,0.0449 0,0.0449 0,1.91015 0,0.0898 0,1.95508 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 1.5,0 A 1.5,1.5 0 0 0 53,178.5 1.5,1.5 0 0 0 51.5,177 Z m 0.5,1 1.5,0 a 0.5,0.5 0 0 1 0.5,0.5 0.5,0.5 0 0 1 -0.5,0.5 l -1.5,0 z m 4,3 a 0.50005,0.50005 0 0 0 -0.46484,0.31445 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.67578 l 1.14844,0.23047 a 0.50005,0.50005 0 0 0 0.0332,0.0566 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.0117 L 59.27734,184 60,184 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 58.97461,182.9941 0.50005,0.50005 0 0 0 58.92578,183 L 58,183 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.45313 L 53.6875,183.62695 54.33789,182 55.5,182 a 0.50005,0.50005 0 1 0 0,-1 z m 1.43164,3.99609 1.81641,0.36329 -0.76172,1.21875 z M 52.5,185 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
+       d="m 49.5,178 c -0.277,0 -0.5,0.20256 -0.5,0.45508 l 0,0.0449 0,0.0449 0,1.91015 0,0.0898 0,1.95508 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 1.5,0 A 1.5,1.5 0 0 0 53,179.5 1.5,1.5 0 0 0 51.5,178 Z m 0.5,1 1.5,0 a 0.5,0.5 0 0 1 0.5,0.5 0.5,0.5 0 0 1 -0.5,0.5 l -1.5,0 z m 4,3 a 0.50005,0.50005 0 0 0 -0.46484,0.31445 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.67578 l 1.14844,0.23047 a 0.50005,0.50005 0 0 0 0.0332,0.0566 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.0117 L 59.27734,185 60,185 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 58.97461,183.994 0.50005,0.50005 0 0 0 58.92578,184 L 58,184 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.45313 L 53.6875,184.62695 54.33789,183 55.5,183 a 0.50005,0.50005 0 1 0 0,-1 z m 1.43164,3.99609 1.81641,0.36329 -0.76172,1.21875 z M 52.5,186 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:connector-curvature="0">
       <title
@@ -6238,7 +6238,7 @@
     <path
        inkscape:label="#path5142"
        id="no_bicycle"
-       d="m 33.49414,176.99414 a 0.50005,0.50005 0 0 0 -0.34766,0.85938 L 34.29297,179 l -1.14649,1.14648 a 0.50005,0.50005 0 1 0 0.70704,0.70704 L 35,179.70703 l 1.14648,1.14649 a 0.50005,0.50005 0 1 0 0.70704,-0.70704 L 35.70703,179 l 1.14649,-1.14648 a 0.50005,0.50005 0 0 0 -0.36329,-0.85743 0.50005,0.50005 0 0 0 -0.34375,0.15039 L 35,178.29297 33.85352,177.14648 a 0.50005,0.50005 0 0 0 -0.35938,-0.15234 z M 38,181 a 0.50005,0.50005 0 0 0 -0.46484,0.31445 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.67578 l 1.14844,0.23047 a 0.50005,0.50005 0 0 0 0.0332,0.0566 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.0117 L 43.27734,184 44,184 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 42.97461,182.9941 0.50005,0.50005 0 0 0 42.92578,183 L 42,183 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.45313 L 37.6875,183.62695 38.33789,182 39.5,182 a 0.50005,0.50005 0 1 0 0,-1 z m 1.43164,3.99609 1.81641,0.36329 -0.76172,1.21875 z M 36.5,185 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
+       d="m 33.49414,177.99414 a 0.50005,0.50005 0 0 0 -0.34766,0.85938 L 34.29297,180 l -1.14649,1.14648 a 0.50005,0.50005 0 1 0 0.70704,0.70704 L 35,180.70703 l 1.14648,1.14649 a 0.50005,0.50005 0 1 0 0.70704,-0.70704 L 35.70703,180 l 1.14649,-1.14648 a 0.50005,0.50005 0 0 0 -0.36329,-0.85743 0.50005,0.50005 0 0 0 -0.34375,0.15039 L 35,179.29297 33.85352,178.14648 a 0.50005,0.50005 0 0 0 -0.35938,-0.15234 z M 38,182 a 0.50005,0.50005 0 0 0 -0.46484,0.31445 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.67578 l 1.14844,0.23047 a 0.50005,0.50005 0 0 0 0.0332,0.0566 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.0117 L 43.27734,185 44,185 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 42.97461,183.994 0.50005,0.50005 0 0 0 42.92578,184 L 42,184 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.45313 L 37.6875,184.62695 38.33789,183 39.5,183 a 0.50005,0.50005 0 1 0 0,-1 z m 1.43164,3.99609 1.81641,0.36329 -0.76172,1.21875 z M 36.5,186 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        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;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:1px;stroke-linecap:round;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"
        inkscape:connector-curvature="0">
       <title
diff --git a/scheme/default.yml b/scheme/default.yml
index 43c9bc8..8c7f750 100644
--- a/scheme/default.yml
+++ b/scheme/default.yml
@@ -526,6 +526,8 @@ node_icons:
       shapes: [charging_station]
     - tags: {amenity: bicycle_repair_station}
       shapes: [bicycle_repair]
+    - tags: {amenity: bicycle_rental}
+      shapes: [{shape: bicycle, offset: [0, 2]}, {shape: key, offset: [1, -4]}]
     - tags: {amenity: fuel}
       shapes: [fuel_station]
     - tags: {amenity: parking}