diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json
new file mode 100644
index 0000000..ea66f4d
--- /dev/null
+++ b/assets/layers/bike_cleaning/bike_cleaning.json
@@ -0,0 +1,50 @@
+{
+  "id": "bike_cleaning",
+  "name": {
+    "en": "Bike cleaning service",
+    "nl": "Fietsschoonmaakpunt"
+  },
+  "title": {
+    "render": {
+      "en": "Bike cleaning service",
+      "nl": "Fietsschoonmaakpunt"
+    },
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": {
+          "en": "Bike cleaning service <i>{name}</i>",
+          "nl": "Fietsschoonmaakpunt <i>{name}</i>"
+        }
+      }
+    ]
+  },
+  "icon": {
+    "render": "./assets/layers/bike_cleaning/bike_cleaning.svg"
+  },
+  "iconSize": "50,50,bottom",
+  "overpassTags": {
+    "or": [
+      "service:bicycle:cleaning=yes",
+      "amenity=bicycle_wash"
+    ]
+  },
+  "minzoom": 13,
+  "wayHandling": 1,
+  "presets": [
+    {
+      "title": {
+        "en": "Bike cleaning service",
+        "nl": "Fietsschoonmaakpunt"
+      },
+      "tags": [
+        "amenity=bicycle_wash",
+        "service:bicycle:cleaning=yes"
+      ]
+    }
+  ],
+  "color": "#6bc4f7",
+  "tagRenderings": [
+    "images"
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/bike_cleaning/bike_cleaning.svg b/assets/layers/bike_cleaning/bike_cleaning.svg
new file mode 100644
index 0000000..ea83bac
--- /dev/null
+++ b/assets/layers/bike_cleaning/bike_cleaning.svg
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="98"
+   height="124"
+   viewBox="0 0 98 124"
+   fill="none"
+   version="1.1"
+   id="svg27"
+   sodipodi:docname="bike_cleaning.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata31">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview29"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="7.612903"
+     inkscape:cx="-16.727788"
+     inkscape:cy="90.863204"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3">
+    <sodipodi:guide
+       position="-18.915254,168.92373"
+       orientation="0,1"
+       id="guide1101"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="bg"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <circle
+       style="fill:#6bc4f7"
+       cx="49"
+       cy="49"
+       r="49"
+       id="circle4" />
+    <path
+       style="fill:#6bc4f7"
+       d="m 55.0445,114.094 c -1.7831,3.887 -7.3059,3.887 -9.089,0 L 15.2124,47.085 C 13.6928,43.7729 16.1129,40 19.7569,40 h 61.4862 c 3.644,0 6.0641,3.7729 4.5445,7.085 z"
+       id="path2"
+       inkscape:connector-curvature="0" />
+  </g>
+  <defs
+     id="defs25">
+    <filter
+       id="filter0_d"
+       x="16"
+       y="23"
+       width="67"
+       height="63"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood10" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix12" />
+      <feOffset
+         dy="4"
+         id="feOffset14" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur16" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix18" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend20" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend22" />
+    </filter>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="fg"
+     style="display:inline">
+    <path
+       style="fill:#fffffc;fill-opacity:1;stroke-width:0.88272834;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 29.290947,36.983983 c 0.177522,0.916926 1.141318,1.734153 2.152651,1.827133 v 0 c 1.009061,0.09339 1.683548,-0.575238 1.505341,-1.491556 l -0.778933,-3.979234 c -0.177995,-0.914898 -1.141321,-1.734153 -2.15265,-1.827137 v 0 c -1.008849,-0.09196 -1.681967,0.575447 -1.503969,1.490347 z"
+       id="path1030" />
+    <g
+       id="g853"
+       transform="rotate(-14.887196,22.514768,42.323076)">
+      <rect
+         id="rect1000"
+         height="4.3486524"
+         width="31.293177"
+         transform="matrix(-0.90869492,0.41746083,0.41746083,0.90869492,0,0)"
+         y="37.392448"
+         x="-38.035305"
+         style="fill:#fffffc;fill-opacity:1;stroke-width:0.47552237" />
+      <g
+         transform="matrix(-0.44591765,-0.16517664,-0.16517664,0.44591765,67.8395,17.448122)"
+         id="g1056"
+         style="fill:#fffffc;fill-opacity:1">
+        <path
+           id="path1054"
+           d="m 100,18.328 v -8 c -19.636,0 -22.542,2.165 -31.688,11.338 l -0.925,0.926 2.828,2.829 -5.577,-5.577 c -5.663,-5.663 -14.843,-5.663 -20.506,0 l 31.112,31.113 c 5.662,-5.663 5.662,-14.844 0,-20.506 l -2.201,-2.201 0.934,-0.935 c 7.766,-7.79 8.961,-8.987 26.023,-8.987 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="display:inline;fill:#fffffc;fill-opacity:1;stroke-width:0.88272834;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 30.604299,45.933279 c 0.177522,0.916926 1.141318,1.734153 2.152651,1.827133 v 0 c 1.009061,0.09339 1.683548,-0.575238 1.505341,-1.491556 l -0.778933,-3.979234 c -0.177995,-0.914898 -1.141321,-1.734153 -2.15265,-1.827137 v 0 c -1.008849,-0.09196 -1.681967,0.575447 -1.503969,1.490347 z"
+       id="path1030-1" />
+    <path
+       style="display:inline;fill:#fffffc;fill-opacity:1;stroke-width:0.88272834;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 36.337339,32.524819 c 0.595194,0.719731 1.832735,0.97518 2.764949,0.57217 v 0 c 0.930416,-0.401561 1.202022,-1.31163 0.606518,-2.030499 l -2.590483,-3.119364 c -0.594638,-0.717724 -1.832738,-0.975179 -2.76495,-0.572174 v 0 c -0.929545,0.402715 -1.200535,1.311056 -0.605894,2.02878 z"
+       id="path1030-2" />
+    <path
+       style="display:inline;fill:#fffffc;fill-opacity:1;stroke-width:0.84610248;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 41.803572,39.170925 c 0.535181,0.717421 1.708166,1.021795 2.620646,0.681415 v 0 c 0.910688,-0.339081 1.215009,-1.196589 0.679489,-1.913201 L 42.773781,34.829254 C 42.239036,34.11378 41.065612,33.807461 40.153135,34.147836 v 0 c -0.90991,0.340226 -1.213557,1.196111 -0.678808,1.911586 z"
+       id="path1030-7" />
+    <path
+       style="display:inline;fill:#fffffc;fill-opacity:1;stroke-width:0.88272834;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 43.859519,26.949791 c 0.870604,0.338107 2.075596,-0.04236 2.692927,-0.8488 v 0 c 0.616469,-0.804296 0.409796,-1.731271 -0.460658,-2.068474 l -3.782751,-1.460079 c -0.86914,-0.336626 -2.075598,0.04237 -2.692931,0.848797 v 0 c -0.615145,0.804879 -0.408777,1.730045 0.460366,2.066669 z"
+       id="path1030-0" />
+    <path
+       style="display:inline;fill:#fffffc;fill-opacity:1;stroke-width:0.88272834;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 52.723307,29.001623 c 0.889143,0.285817 2.069419,-0.165527 2.637779,-1.007196 v 0 c 0.567626,-0.83948 0.306279,-1.752549 -0.582661,-2.037473 l -3.862771,-1.232902 c -0.887593,-0.284427 -2.06942,0.16553 -2.637782,1.007193 v 0 c -0.56627,0.839983 -0.305334,1.751264 0.582263,2.035689 z"
+       id="path1030-9" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="cycle"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       id="g896">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 50.491776,73.912443 H 33.444983 l 9.298301,-20.633687 h 9.29819 6.71547 7.231926 m 0,0 -2.582831,-5.81969 h 3.615963 3.615963 m -4.649095,5.81969 1.033132,2.645404 2.066264,4.232492 5.682228,13.755791 m -8.781624,-20.633687 -4.907378,7.935991 -2.944516,4.761594 m -1.962973,3.174508 1.962973,-3.174508 m -11.777729,-6.877784 5.165661,11.63949 -10.331322,-23.278981 3.099397,6.348793 m 10.331322,17.988283 3.512671,-5.819801"
+         id="path10"
+         style="stroke:#ffffff;stroke-width:2.21892667" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 56.056733,73.012225 c 0,1.75162 -1.383057,3.148767 -3.061342,3.148767 -1.678174,0 -3.061231,-1.397147 -3.061231,-3.148767 0,-1.75151 1.383057,-3.148657 3.061231,-3.148657 1.678285,0 3.061342,1.397147 3.061342,3.148657 z"
+         id="path12"
+         style="stroke:#ffffff;stroke-width:1.10946333" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 45.170568,71.95424 c 0,6.717246 -5.310002,12.117115 -11.804689,12.117115 -6.494798,0 -11.804801,-5.399869 -11.804801,-12.117115 0,-6.717356 5.310003,-12.117225 11.804801,-12.117225 6.494687,0 11.804689,5.399869 11.804689,12.117225 z"
+         id="path14"
+         style="stroke:#ffffff;stroke-width:2.21892667" />
+      <g
+         id="g20"
+         transform="matrix(1.1094633,0,0,1.1094633,0.48127584,3.080534)">
+        <circle
+           style="stroke:#ffffff;stroke-width:2"
+           id="circle18"
+           r="11"
+           cy="63"
+           cx="66" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/bike_shop/bike_cleaning.svg b/assets/layers/bike_shop/bike_cleaning.svg
new file mode 100644
index 0000000..96c03ee
--- /dev/null
+++ b/assets/layers/bike_shop/bike_cleaning.svg
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="98"
+   height="98"
+   viewBox="0 0 98 98"
+   version="1.1"
+   id="svg27"
+   sodipodi:docname="bike_cleaning.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   style="fill:none">
+  <metadata
+     id="metadata31">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     id="namedview29"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="3.8064516"
+     inkscape:cx="-11.021894"
+     inkscape:cy="44.52432"
+     inkscape:window-x="0"
+     inkscape:window-y="1080"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer4">
+    <sodipodi:guide
+       position="-18.915254,142.92373"
+       orientation="0,1"
+       id="guide1101"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="bg"
+     style="display:inline">
+    <circle
+       style="fill:#6bc4f7"
+       cx="49"
+       cy="49"
+       r="49"
+       id="circle4" />
+  </g>
+  <defs
+     id="defs25">
+    <filter
+       id="filter0_d"
+       x="16"
+       y="23"
+       width="67"
+       height="63"
+       filterUnits="userSpaceOnUse"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood10" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix12" />
+      <feOffset
+         dy="4"
+         id="feOffset14" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur16" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix18" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend20" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend22" />
+    </filter>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="fg"
+     style="display:inline">
+    <path
+       style="stroke:#ffffff;stroke-width:2"
+       id="path10"
+       d="M 53.833,72.506562 H 38.4681 l 8.3809,-18.5979 h 8.3808 6.0529 6.5184 m 0,0 -2.328,-5.2455 h 3.2592 3.2592 m -4.1904,5.2455 0.9312,2.3844 1.8624,3.8149 5.1216,12.3986 m -7.9152,-18.5979 -4.4232,7.153 -2.654,4.2918 m -1.7693,2.8613 1.7693,-2.8613 m -10.6157,-6.1992 4.656,10.4911 -9.312,-20.9822 2.7936,5.7224 m 9.312,16.2135 3.1661,-5.2456"
+       inkscape:connector-curvature="0" />
+    <path
+       style="stroke:#ffffff"
+       id="path12"
+       d="m 58.8489,71.695162 c 0,1.5788 -1.2466,2.8381 -2.7593,2.8381 -1.5126,0 -2.7592,-1.2593 -2.7592,-2.8381 0,-1.5787 1.2466,-2.838 2.7592,-2.838 1.5127,0 2.7593,1.2593 2.7593,2.838 z"
+       inkscape:connector-curvature="0" />
+    <path
+       style="stroke:#ffffff;stroke-width:2"
+       id="path14"
+       d="m 49.0368,70.741562 c 0,6.0545 -4.7861,10.9216 -10.64,10.9216 -5.854,0 -10.6401,-4.8671 -10.6401,-10.9216 0,-6.0546 4.7861,-10.9217 10.6401,-10.9217 5.8539,0 10.64,4.8671 10.64,10.9217 z"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="translate(8.7566998,8.6631615)"
+       id="g20">
+      <circle
+         cx="66"
+         cy="63"
+         r="11"
+         id="circle18"
+         style="stroke:#ffffff;stroke-width:2" />
+    </g>
+    <g
+       id="g1094"
+       transform="matrix(-0.44591765,-0.16517664,-0.16517664,0.44591765,67.8395,17.448122)"
+       style="display:inline;fill:#fffffc;fill-opacity:1">
+      <rect
+         id="rect1000"
+         height="9.1450005"
+         width="65.807999"
+         transform="matrix(0.7071,0.7071,-0.7071,0.7071,44.7059,-26.5459)"
+         y="36.118999"
+         x="21.492001"
+         style="fill:#fffffc;fill-opacity:1" />
+      <g
+         id="g1008"
+         style="fill:#fffffc;fill-opacity:1">
+        <path
+           id="path1002"
+           d="m 27.304,32.959 c -0.825,0.409 -1.825,0.072 -2.233,-0.753 v 0 C 24.662,31.381 25,30.381 25.825,29.972 l 3.584,-1.776 c 0.825,-0.409 1.824,-0.071 2.233,0.754 v 0 c 0.409,0.825 0.071,1.825 -0.753,2.233 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+        <path
+           id="path1004"
+           d="m 16.922,39.164 c -0.789,0.47 -1.809,0.211 -2.278,-0.578 v 0 c -0.47,-0.789 -0.211,-1.809 0.579,-2.278 l 3.427,-2.04 c 0.788,-0.47 1.808,-0.211 2.277,0.578 v 0 c 0.47,0.789 0.211,1.809 -0.578,2.277 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+        <path
+           id="path1006"
+           d="M 6.539,45.369 C 5.786,45.9 4.747,45.719 4.216,44.967 v 0 c -0.53,-0.753 -0.35,-1.792 0.403,-2.323 l 3.27,-2.304 c 0.752,-0.53 1.792,-0.35 2.322,0.403 v 0 c 0.53,0.752 0.35,1.792 -0.403,2.322 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+      </g>
+      <g
+         id="g1016"
+         style="fill:#fffffc;fill-opacity:1">
+        <path
+           id="path1010"
+           d="m 65.089,70.024 c -0.526,0.757 -1.564,0.941 -2.32,0.415 v 0 c -0.755,-0.526 -0.94,-1.565 -0.414,-2.321 l 2.286,-3.28 c 0.525,-0.755 1.564,-0.941 2.32,-0.415 v 0 c 0.755,0.526 0.94,1.564 0.415,2.319 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+        <path
+           id="path1012"
+           d="m 58.977,80.461 c -0.465,0.793 -1.484,1.057 -2.274,0.592 v 0 c -0.791,-0.467 -1.056,-1.484 -0.59,-2.275 l 2.021,-3.438 c 0.465,-0.791 1.483,-1.056 2.274,-0.59 v 0 c 0.791,0.465 1.055,1.482 0.59,2.274 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+        <path
+           id="path1014"
+           d="m 52.865,90.898 c -0.404,0.829 -1.404,1.171 -2.23,0.767 v 0 c -0.827,-0.405 -1.17,-1.402 -0.766,-2.229 l 1.757,-3.594 c 0.404,-0.827 1.402,-1.17 2.229,-0.765 v 0 c 0.827,0.403 1.17,1.401 0.766,2.229 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+      </g>
+      <path
+         id="path1018"
+         d="m 59.759,64.613 c -0.59,0.708 -1.641,0.802 -2.348,0.211 v 0 c -0.706,-0.59 -0.8,-1.642 -0.21,-2.349 l 2.564,-3.067 c 0.589,-0.706 1.641,-0.802 2.348,-0.211 v 0 c 0.706,0.59 0.8,1.641 0.211,2.347 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1020"
+         d="m 52.76,74.477 c -0.533,0.75 -1.57,0.924 -2.318,0.391 v 0 C 49.694,74.335 49.52,73.298 50.053,72.55 l 2.314,-3.247 c 0.531,-0.747 1.569,-0.923 2.316,-0.39 v 0 c 0.748,0.533 0.922,1.57 0.39,2.318 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1022"
+         d="m 45.759,84.341 c -0.475,0.791 -1.5,1.044 -2.288,0.569 v 0 c -0.789,-0.477 -1.043,-1.499 -0.567,-2.288 l 2.064,-3.427 c 0.475,-0.789 1.5,-1.043 2.287,-0.567 v 0 c 0.789,0.475 1.042,1.498 0.568,2.288 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1024"
+         d="m 54.202,59.292 c -0.629,0.661 -1.675,0.686 -2.335,0.056 v 0 c -0.66,-0.629 -0.685,-1.676 -0.056,-2.337 l 2.736,-2.867 c 0.628,-0.66 1.675,-0.687 2.336,-0.057 v 0 c 0.66,0.63 0.684,1.675 0.056,2.335 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1026"
+         d="m 46.638,68.593 c -0.576,0.707 -1.613,0.812 -2.318,0.236 v 0 C 43.615,68.253 43.51,67.216 44.086,66.51 l 2.5,-3.061 c 0.574,-0.705 1.612,-0.812 2.316,-0.235 v 0 c 0.706,0.576 0.81,1.613 0.235,2.318 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1028"
+         d="m 39.073,77.896 c -0.521,0.751 -1.553,0.936 -2.3,0.414 v 0 c -0.749,-0.522 -0.935,-1.551 -0.413,-2.3 l 2.264,-3.256 c 0.521,-0.749 1.551,-0.934 2.299,-0.412 v 0 c 0.749,0.521 0.934,1.549 0.413,2.3 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1030"
+         d="m 48.646,53.97 c -0.669,0.616 -1.709,0.571 -2.324,-0.099 v 0 c -0.614,-0.668 -0.569,-1.71 0.1,-2.325 l 2.908,-2.667 c 0.668,-0.614 1.709,-0.571 2.324,0.099 v 0 c 0.613,0.669 0.568,1.709 -0.1,2.323 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1032"
+         d="m 40.517,62.709 c -0.619,0.665 -1.656,0.699 -2.318,0.081 v 0 C 37.537,62.172 37.501,61.135 38.12,60.472 l 2.686,-2.876 c 0.617,-0.662 1.655,-0.698 2.317,-0.08 v 0 c 0.663,0.619 0.698,1.655 0.08,2.318 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1034"
+         d="m 32.387,71.449 c -0.567,0.713 -1.604,0.827 -2.312,0.26 v 0 c -0.709,-0.568 -0.826,-1.602 -0.258,-2.312 l 2.465,-3.083 c 0.567,-0.71 1.603,-0.825 2.312,-0.259 v 0 c 0.71,0.568 0.825,1.602 0.258,2.312 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1036"
+         d="m 43.09,48.648 c -0.708,0.57 -1.743,0.456 -2.312,-0.253 v 0 c -0.568,-0.708 -0.454,-1.744 0.255,-2.313 l 3.079,-2.467 c 0.707,-0.569 1.743,-0.457 2.312,0.253 v 0 c 0.568,0.708 0.454,1.743 -0.253,2.312 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1038"
+         d="m 34.396,56.826 c -0.661,0.621 -1.699,0.587 -2.318,-0.074 v 0 c -0.619,-0.662 -0.585,-1.699 0.076,-2.319 l 2.872,-2.689 c 0.66,-0.619 1.698,-0.587 2.317,0.075 v 0 c 0.619,0.66 0.585,1.697 -0.075,2.318 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1040"
+         d="m 25.701,65.004 c -0.614,0.673 -1.656,0.719 -2.325,0.105 v 0 c -0.67,-0.615 -0.716,-1.654 -0.103,-2.324 l 2.665,-2.913 c 0.613,-0.671 1.654,-0.716 2.323,-0.104 v 0 c 0.671,0.613 0.717,1.652 0.104,2.325 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1042"
+         d="m 37.534,43.326 c -0.748,0.524 -1.777,0.341 -2.3,-0.408 v 0 c -0.522,-0.748 -0.338,-1.778 0.41,-2.301 l 3.251,-2.267 c 0.746,-0.523 1.777,-0.341 2.3,0.408 v 0 c 0.522,0.748 0.339,1.777 -0.408,2.3 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1044"
+         d="m 28.275,50.942 c -0.705,0.578 -1.743,0.476 -2.319,-0.229 v 0 c -0.576,-0.705 -0.474,-1.743 0.23,-2.319 l 3.058,-2.504 c 0.703,-0.577 1.742,-0.475 2.317,0.229 v 0 c 0.577,0.705 0.474,1.741 -0.23,2.319 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1046"
+         d="m 19.015,58.559 c -0.66,0.633 -1.707,0.609 -2.337,-0.05 v 0 c -0.63,-0.661 -0.608,-1.706 0.052,-2.337 l 2.865,-2.74 c 0.66,-0.632 1.706,-0.608 2.335,0.051 v 0 c 0.631,0.66 0.608,1.703 -0.051,2.337 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1048"
+         d="m 31.978,38.004 c -0.788,0.478 -1.812,0.226 -2.289,-0.563 v 0 c -0.476,-0.787 -0.223,-1.812 0.565,-2.29 l 3.422,-2.067 c 0.786,-0.477 1.812,-0.226 2.289,0.563 v 0 c 0.476,0.787 0.223,1.812 -0.563,2.288 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1050"
+         d="m 22.153,45.059 c -0.747,0.536 -1.785,0.363 -2.319,-0.383 v 0 c -0.533,-0.747 -0.361,-1.785 0.386,-2.319 l 3.244,-2.318 c 0.746,-0.535 1.785,-0.362 2.318,0.384 v 0 c 0.534,0.747 0.362,1.783 -0.385,2.319 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <path
+         id="path1052"
+         d="M 12.329,52.113 C 11.622,52.707 10.57,52.614 9.98,51.908 v 0 C 9.389,51.201 9.481,50.151 10.187,49.56 l 3.065,-2.57 c 0.706,-0.592 1.757,-0.499 2.348,0.206 v 0 c 0.592,0.706 0.5,1.754 -0.207,2.349 z"
+         inkscape:connector-curvature="0"
+         style="fill:#fffffc;fill-opacity:1" />
+      <g
+         id="g1056"
+         style="fill:#fffffc;fill-opacity:1">
+        <path
+           id="path1054"
+           d="m 100,18.328 v -8 c -19.636,0 -22.542,2.165 -31.688,11.338 l -0.925,0.926 2.828,2.829 -5.577,-5.577 c -5.663,-5.663 -14.843,-5.663 -20.506,0 l 31.112,31.113 c 5.662,-5.663 5.662,-14.844 0,-20.506 l -2.201,-2.201 0.934,-0.935 c 7.766,-7.79 8.961,-8.987 26.023,-8.987 z"
+           inkscape:connector-curvature="0"
+           style="fill:#fffffc;fill-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/bike_shop/pump.svg b/assets/layers/bike_shop/pump.svg
new file mode 100644
index 0000000..2fe723d
--- /dev/null
+++ b/assets/layers/bike_shop/pump.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="98"
+   height="98"
+   viewBox="0 0 98 98"
+   version="1.1"
+   id="svg42"
+   sodipodi:docname="pump.svg"
+   style="fill:none"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata46">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview44"
+     showgrid="false"
+     inkscape:zoom="1.9186992"
+     inkscape:cx="48.5"
+     inkscape:cy="36.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg42" />
+  <circle
+     cx="49"
+     cy="49"
+     r="49"
+     id="circle4"
+     style="fill:#e2783d" />
+  <g
+     clip-path="url(#clip0)"
+     id="g20"
+     style="filter:url(#filter0_d)"
+     transform="translate(-1)">
+    <path
+       d="m 59.2519,79.0738 c 1.2556,0 2.4598,-0.4987 3.3476,-1.3866 0.8879,-0.8878 1.3867,-1.3874 1.3867,-2.643 0,-1.2556 -0.4988,-1.6926 -1.3866,-2.5805 -0.8879,-0.8878 -2.0921,-1.3866 -3.3477,-1.3866 l -5.8964,0.0044 v -1.6031 l 1.5268,-0.0045 c 1.2553,-0.001 2.4589,-0.5001 3.3465,-1.3877 0.8876,-0.8876 2.0368,-1.8824 2.0378,-3.1377 l 0.0452,-31.3786 c 1e-4,-0.3476 0,-1 0.0892,-1.3193 0.1331,-0.3211 0.146,-0.6807 0.324,-0.8587 0.2458,-0.2457 0.3788,-0.4408 0.6999,-0.5738 0.3211,-0.1329 1.2275,-0.2483 1.5751,-0.2482 0.3475,0 0.9907,-0.003 1.3118,0.1301 0.3211,0.133 0.6771,0.5478 1,0.8699 0.2457,0.2457 0.2635,0.3596 0.3965,0.6807 0.1329,0.3211 0.2013,0.6652 0.2013,1.0128 l 0.0073,25.8777 h -1.051 c -0.2733,7e-4 -0.5353,0.1086 -0.7299,0.3004 -0.1946,0.1919 -0.3062,0.4523 -0.3109,0.7255 l -0.0664,4.7505 c -0.0096,0.6915 0.1184,1.378 0.3764,2.0196 0.2579,0.6416 0.6409,1.2255 1.1265,1.7178 0.4856,0.4924 1.0642,0.8833 1.7022,1.1501 0.6379,0.2668 1.3226,0.4041 2.0141,0.4041 h 3.1458 c 0.2768,-1e-4 0.5423,-0.11 0.738,-0.3058 0.1957,-0.1957 0.3057,-0.4611 0.3057,-0.7379 v -4.4287 c 0,-0.1388 -0.0278,-0.2762 -0.0817,-0.4041 -0.0538,-0.128 -0.1326,-0.2439 -0.2318,-0.341 -0.0992,-0.0972 -0.2167,-0.1735 -0.3458,-0.2247 -0.129,-0.0511 -0.267,-0.076 -0.4058,-0.0731 l -1.9611,0.042 -0.0502,-3.5665 c -0.0047,-0.2732 -0.1163,-0.5337 -0.3109,-0.7255 -0.1946,-0.1919 -0.4566,-0.2997 -0.7299,-0.3005 l -0.6708,-0.0022 0.3438,-25.5712 c 0,-1.2556 -0.5235,-3.1122 -1.4114,-4 -0.8878,-0.8879 -1.8118,-1.5 -4.3118,-1.5 -2.2097,0 -3.3003,0.6121 -4.1882,1.5 -0.8878,0.8878 -1.2723,2.4416 -1.2723,3.6972 v 31.477 c -0.0012,0.7016 -0.2804,1.3742 -0.7766,1.8703 -0.4961,0.4961 -1.1686,0.7754 -1.8703,0.7766 H 53.3555 V 35.2151 c 0,-0.2768 -0.11,-0.5422 -0.3057,-0.738 -0.1958,-0.1957 -0.4612,-0.3056 -0.738,-0.3057 h -0.8145 v -8.9843 h 9.2899 c 0.2768,-10e-5 0.5422,-0.11 0.738,-0.3057 0.1957,-0.1958 0.3057,-0.4612 0.3057,-0.738 v -5.1668 c -10e-5,-0.2768 -0.11,-0.5422 -0.3057,-0.738 -0.1958,-0.1957 -0.4612,-0.3056 -0.738,-0.3057 H 35.6913 c -0.2768,0 -0.5422,0.11 -0.7379,0.3057 -0.1957,0.1958 -0.3057,0.4612 -0.3058,0.738 v 5.1668 c 1e-4,0.2768 0.1101,0.5422 0.3058,0.738 0.1957,0.1957 0.4611,0.3056 0.7379,0.3057 h 9.2899 v 8.9843 h -0.8269 c -0.2768,1e-4 -0.5422,0.11 -0.7379,0.3057 -0.1958,0.1958 -0.3057,0.4612 -0.3058,0.738 v 35.862 h -5.884 c -1.2556,0 -2.4598,0.4988 -3.3476,1.3866 -0.8879,0.8879 -1.3867,1.3249 -1.3867,2.5805 0,1.2556 0.4988,1.7552 1.3867,2.643 0.8878,0.8878 2.092,1.3866 3.3476,1.3866 z m 8.8093,-14.2603 c 0.0019,0.1375 0.031,0.2734 0.0856,0.3996 0.0546,0.1263 0.1337,0.2405 0.2326,0.3362 0.0989,0.0956 0.2158,0.1707 0.3438,0.221 0.128,0.0503 0.2648,0.0748 0.4023,0.0721 l 1.9494,-0.0391 0.0022,2.3213 H 68.975 c -0.4151,1e-4 -0.826,-0.0823 -1.2089,-0.2424 -0.3829,-0.1602 -0.7302,-0.3948 -1.0216,-0.6904 -0.2914,-0.2955 -0.5211,-0.646 -0.6759,-1.0311 -0.1547,-0.3851 -0.2314,-0.7972 -0.2255,-1.2122 l 0.0495,-3.7237 h 2.1228 z M 36.735,23.0997 v -3.0794 h 23.0085 v 3.0794 h -9.2899 -4.4287 z m 10.3336,2.0874 h 2.3413 v 8.9843 h -2.3413 z m -2.2143,11.0717 h 1.1706 4.4287 1.1707 v 31.1277 h -6.77 z m 0,33.2151 h 6.77 v 4.5557 h -6.77 z m -10.2746,5.5703 c 0.0132,-0.6978 0.2963,-0.5963 0.7899,-1.0899 0.4935,-0.4935 1.1591,-0.7766 1.857,-0.7898 h 5.884 v 1.1416 c 1e-4,0.2768 0.11,0.5422 0.3057,0.738 0.1958,0.1957 0.4612,0.3057 0.738,0.3057 l 8.1575,0.0044 c 0.2768,0 0.5422,-0.11 0.738,-0.3057 0.1957,-0.1957 0.3057,-0.4612 0.3057,-0.738 v -1.1416 l 5.8964,-0.0044 c 0.348,-0.0015 0.6929,0.066 1.0147,0.1985 0.3218,0.1325 0.6142,0.3274 0.8602,0.5735 0.2461,0.246 0.441,-0.2287 0.5735,0.0931 0.1325,0.3218 0.2,0.6666 0.1985,1.0146 -0.0132,0.6979 -0.2963,0.6589 -0.7899,1.1524 -0.4935,0.4936 -1.1591,0.7767 -1.857,0.7898 H 37.2266 c -0.348,0.0015 -0.6929,-0.0659 -1.0147,-0.1984 -0.3218,-0.1325 -0.6141,-0.3274 -0.8602,-0.5735 -0.2461,-0.2461 -0.441,-0.5385 -0.5735,-0.8603 -0.1325,-0.3218 -0.1999,0.038 -0.1985,-0.31 z"
+       id="path6"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <rect
+       x="44.311798"
+       y="35.569801"
+       width="8"
+       height="39"
+       id="rect8"
+       style="fill:#ffffff" />
+    <rect
+       x="35.311798"
+       y="19.569901"
+       width="25"
+       height="4"
+       id="rect10"
+       style="fill:#ffffff" />
+    <rect
+       x="46.311901"
+       y="21.569799"
+       width="4"
+       height="14"
+       id="rect12"
+       style="fill:#ffffff" />
+    <rect
+       x="34.311798"
+       y="72.569801"
+       width="28"
+       height="5"
+       id="rect14"
+       style="fill:#ffffff" />
+    <rect
+       x="65.311897"
+       y="60.569801"
+       width="4"
+       height="8"
+       id="rect16"
+       style="fill:#ffffff" />
+    <rect
+       x="68.311798"
+       y="64.569901"
+       width="3"
+       height="4"
+       id="rect18"
+       style="fill:#ffffff" />
+  </g>
+  <defs
+     id="defs40">
+    <filter
+       id="filter0_d"
+       x="-3"
+       y="2"
+       width="102.479"
+       height="102.479"
+       filterUnits="userSpaceOnUse"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood22" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix24" />
+      <feOffset
+         dy="4"
+         id="feOffset26" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur28" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix30" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend32" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend34" />
+    </filter>
+    <clipPath
+       id="clip0">
+      <rect
+         width="66.806396"
+         height="66.806396"
+         transform="rotate(-45,59.937093,23.412543)"
+         id="rect37"
+         x="0"
+         y="0"
+         style="fill:#ffffff" />
+    </clipPath>
+  </defs>
+</svg>
diff --git a/assets/layers/bike_shop/repair_station.svg b/assets/layers/bike_shop/repair_station.svg
new file mode 100644
index 0000000..6607f79
--- /dev/null
+++ b/assets/layers/bike_shop/repair_station.svg
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="98"
+   height="98"
+   viewBox="0 0 98 98"
+   version="1.1"
+   id="svg98"
+   sodipodi:docname="repair_station.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   style="fill:none">
+  <metadata
+     id="metadata102">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview100"
+     showgrid="false"
+     inkscape:zoom="1.9504132"
+     inkscape:cx="49"
+     inkscape:cy="37.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg98" />
+  <circle
+     cx="49"
+     cy="49"
+     r="49"
+     id="circle4"
+     style="fill:#32adf2" />
+  <g
+     id="g22"
+     transform="matrix(1.9174844,0,0,1.9174844,-43.416489,-3.3191349)"
+     style="filter:url(#filter1_d)">
+    <path
+       d="m 39.0246,31.9734 -3.616,2.9572 -0.0183,0.0153 c -0.8417,0.7272 -1.3474,1.7815 -1.3877,2.8925 -0.0295,0.8133 0.193,1.6137 0.6225,2.2929 l 3.485,-3.4815 c 0.3438,-0.3435 0.9013,-0.3435 1.2452,0 0.3439,0.3435 0.3439,0.9005 0,1.2441 l -3.4848,3.4814 C 36.5103,41.7791 37.2574,42 38.0217,42 c 0.0479,0 0.0959,-9e-4 0.1439,-0.0026 1.1121,-0.0403 2.1674,-0.5455 2.8953,-1.3865 l 2.9753,-3.6307 z"
+       id="path10"
+       inkscape:connector-curvature="0"
+       style="fill:#fff7f7" />
+    <path
+       d="m 42.008,29.5336 -1.614,1.3199 4.7633,4.7586 1.3213,-1.6123 z"
+       id="path12"
+       inkscape:connector-curvature="0"
+       style="fill:#fff7f7" />
+    <path
+       d="m 44.8629,29.9 1.1944,-1.1932 1.245,1.2439 -1.1944,1.1932 z"
+       id="path14"
+       inkscape:connector-curvature="0"
+       style="fill:#fff7f7" />
+    <path
+       d="m 52.5127,22.2598 4.6927,-4.6882 1.2451,1.2439 -4.6927,4.6881 z"
+       id="path16"
+       inkscape:connector-curvature="0"
+       style="fill:#fff7f7" />
+    <path
+       d="M 57.5981,15.4757 61.0772,12 l 2.9182,2.9153 -3.4791,3.4758 z"
+       id="path18"
+       inkscape:connector-curvature="0"
+       style="fill:#fff7f7" />
+    <path
+       d="m 60.4798,30.9612 c -0.897,-0.8961 -1.9984,-1.3698 -3.1848,-1.3698 -0.3233,0 -0.6531,0.0356 -0.9803,0.1058 -0.3511,0.0752 -0.7327,-0.0406 -0.9903,-0.2981 L 44.7335,18.8186 C 44.4694,18.5548 44.3563,18.1695 44.4387,17.813 44.8015,16.2466 44.358,14.7415 43.1901,13.5748 42.1736,12.5592 40.822,12 39.3843,12 c -0.7345,0 -1.4478,0.1457 -2.12,0.4332 l -0.3986,0.1705 3.096,3.0929 -2.2608,2.2585 -3.0958,-3.093 -0.1707,0.3983 c -0.4184,0.9763 -0.5375,2.0464 -0.3446,3.0948 0.1976,1.0736 0.7119,2.0505 1.4872,2.8252 0.897,0.8961 1.9983,1.3698 3.1847,1.3698 0.3234,0 0.6533,-0.0356 0.9804,-0.1058 0.0725,-0.0156 0.1467,-0.0234 0.2209,-0.0234 0.2846,0 0.5651,0.1172 0.7695,0.3215 L 51.3233,33.323 c 0.2644,0.264 0.3774,0.6496 0.2947,1.0062 -0.3626,1.5659 0.0808,3.0709 1.2487,4.2376 1.0165,1.0156 2.3681,1.5749 3.8058,1.5748 0.7346,0 1.4479,-0.1458 2.1199,-0.4332 l 0.3988,-0.1705 -3.096,-3.0929 2.2607,-2.2584 3.0958,3.0928 0.1707,-0.3983 c 0.4184,-0.9762 0.5375,-2.0463 0.3446,-3.0946 -0.1976,-1.0737 -0.7119,-2.0507 -1.4872,-2.8253 z"
+       id="path20"
+       inkscape:connector-curvature="0"
+       style="fill:#fff7f7" />
+  </g>
+  <defs
+     id="defs96">
+    <filter
+       id="filter0_d"
+       x="58.84"
+       y="50.703999"
+       width="25.4126"
+       height="17.436001"
+       filterUnits="userSpaceOnUse"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood36" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix38" />
+      <feOffset
+         dy="4"
+         id="feOffset40" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur42" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix44" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend46" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend48" />
+    </filter>
+    <filter
+       id="filter1_d"
+       x="30"
+       y="12"
+       width="37.995399"
+       height="38"
+       filterUnits="userSpaceOnUse"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood51" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix53" />
+      <feOffset
+         dy="4"
+         id="feOffset55" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur57" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix59" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend61" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend63" />
+    </filter>
+    <filter
+       id="filter2_d"
+       x="11"
+       y="51"
+       width="54.766701"
+       height="38.142899"
+       filterUnits="userSpaceOnUse"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood66" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix68" />
+      <feOffset
+         dy="4"
+         id="feOffset70" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur72" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix74" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend76" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend78" />
+    </filter>
+    <filter
+       id="filter3_d"
+       x="41"
+       y="61"
+       width="28"
+       height="29"
+       filterUnits="userSpaceOnUse"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood81" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix83" />
+      <feOffset
+         dy="4"
+         id="feOffset85" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur87" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix89" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend91" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend93" />
+    </filter>
+  </defs>
+</svg>
diff --git a/assets/layers/drinking_water/drinking_water_broken.svg b/assets/layers/drinking_water/drinking_water_broken.svg
new file mode 100644
index 0000000..9d0ba40
--- /dev/null
+++ b/assets/layers/drinking_water/drinking_water_broken.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="98"
+   height="124"
+   viewBox="0 0 98 124"
+   fill="none"
+   version="1.1"
+   id="svg27"
+   sodipodi:docname="drinking_water_broken.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata31">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview29"
+     showgrid="false"
+     inkscape:zoom="1.9032258"
+     inkscape:cx="49"
+     inkscape:cy="62"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg27" />
+  <path
+     d="M55.0445 114.094C53.2614 117.981 47.7386 117.981 45.9555 114.094L15.2124 47.085C13.6928 43.7729 16.1129 40 19.7569 40L81.2431 40C84.8871 40 87.3072 43.7729 85.7876 47.085L55.0445 114.094Z"
+     fill="#6BC4F7"
+     id="path2" />
+  <circle
+     cx="49"
+     cy="49"
+     r="49"
+     fill="#6BC4F7"
+     id="circle4" />
+  <g
+     filter="url(#filter0_d)"
+     id="g8">
+    <path
+       d="M79 41.8705C79 39.3976 77.4079 35.6726 74.1327 30.4823C71.8064 26.7956 69.5171 23.8005 69.4208 23.6747C69.0964 23.2513 68.5726 23 68.0144 23C67.4562 23 66.9322 23.2514 66.6078 23.6748C66.3787 23.9738 61.828 29.939 59.0942 35.3688C54.8849 28.8794 50.9494 23.7307 50.9067 23.6748C50.5821 23.2513 50.0582 23 49.5 23C48.9418 23 48.4179 23.2513 48.0934 23.6747C48.0468 23.7357 43.367 29.8581 38.753 37.1701C38.2587 37.9536 37.7856 38.7192 37.3295 39.4706C34.9483 35.6504 32.5162 32.4661 32.3922 32.3043C32.0677 31.8809 31.5438 31.6296 30.9856 31.6296C30.4274 31.6296 29.9036 31.8809 29.5791 32.3043C29.4828 32.43 27.1935 35.4252 24.8672 39.1119C21.5921 44.3021 20 48.0271 20 50.5C20 55.6193 24.0504 59.8732 29.3205 60.6234C30.1402 70.3329 38.8775 78 49.5 78C60.6619 78 69.7429 69.5347 69.7429 59.1295C69.7429 57.2539 69.2077 54.9089 68.1449 52.1097C74.1423 52.0443 79 47.4766 79 41.8705V41.8705ZM23.457 50.5C23.457 49.457 24.0257 46.8053 27.8344 40.7656C28.9755 38.9562 30.126 37.2947 30.9856 36.0929C32.1576 37.7318 33.8718 40.2278 35.3741 42.8008C31.9223 48.9002 29.9183 53.7824 29.3954 57.3607C26.0053 56.6784 23.457 53.8613 23.457 50.5V50.5ZM49.5 74.7773C40.2443 74.7773 32.7142 67.7578 32.7142 59.1295C32.7142 56.3792 34.2766 50.6239 41.7201 38.8241C44.7375 34.0407 47.784 29.7745 49.5 27.4354C51.213 29.7702 54.2519 34.0258 57.2673 38.8042C64.7212 50.6167 66.2857 56.3773 66.2857 59.1296C66.2858 67.7578 58.7557 74.7773 49.5 74.7773V74.7773ZM68.0144 48.8887C67.5836 48.8887 67.156 48.8549 66.7362 48.7879C65.3713 45.8533 63.5372 42.506 61.2717 38.8163C62.8077 35.0043 66.1199 30.1147 68.0149 27.4638C68.8707 28.6601 70.0148 30.3125 71.153 32.1162C74.9727 38.1694 75.543 40.8257 75.543 41.8705C75.543 45.7402 72.1656 48.8887 68.0144 48.8887V48.8887Z"
+       fill="white"
+       id="path6" />
+  </g>
+  <defs
+     id="defs25">
+    <filter
+       id="filter0_d"
+       x="16"
+       y="23"
+       width="67"
+       height="63"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood10" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix12" />
+      <feOffset
+         dy="4"
+         id="feOffset14" />
+      <feGaussianBlur
+         stdDeviation="2"
+         id="feGaussianBlur16" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix18" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend20" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow"
+         result="shape"
+         id="feBlend22" />
+    </filter>
+  </defs>
+  <g
+     style="display:inline;fill:none"
+     id="g878"
+     transform="matrix(1.323177,0,0,1.323177,-54.427394,-2.8930963)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path842-3"
+       d="M 80.687554,63.907833 97.680134,47.211548"
+       style="display:inline;fill:none;stroke:#ff002f;stroke-width:7.93900013;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path842-3-6"
+       d="m 80.747314,46.886624 16.696285,16.99258"
+       style="display:inline;fill:none;stroke:#ff002f;stroke-width:7.93900013;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>