diff --git a/Models/Constants.ts b/Models/Constants.ts
index 99e609b..a245740 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -1,7 +1,7 @@
 import { Utils } from "../Utils";
 
 export default class Constants {
-    public static vNumber = "0.4.6";
+    public static vNumber = "0.4.7";
 
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {
diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
new file mode 100644
index 0000000..5267e94
--- /dev/null
+++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
@@ -0,0 +1,151 @@
+{
+  "id": "bicycle_tube_vending_machine",
+  "name": {
+    "en": "Bicycle tube vending machine"
+  },
+  "title": {
+    "render": {
+      "en": "Bicycle tube vending machine"
+    },
+    "mappings": [{
+      "if": "name~*",
+      "then": "Bicycle tube vending machine {name}"
+    }]
+  },
+  "icon": {
+    "render": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
+  },
+  "iconOverlays": [
+    {
+      "if": {
+        "or": [
+          "operational_status=broken",
+          "operational_status=closed"
+        ]
+      },
+      "then": "close:#c33",
+      "badge": true
+    }
+  ],
+  "iconSize": "50,50,bottom",
+  "overpassTags": {
+    "and": [
+      "amenity=vending_machine",
+      "vending~.*bicycle_tube.*"
+    ]
+  },
+  "minzoom": 13,
+  "wayHandling": 2,
+  "presets": [
+    {
+      "title": {
+        "en": "Bicycle tube vending machine"
+      },
+      "tags": [
+        "amenity=vending_machine",
+        "vending=bicycle_tube",
+        "vending:bicycle_tube=yes"
+      ]
+    }
+  ],
+  "color": "#6bc4f7",
+  "tagRenderings": [
+    "images",
+    {
+      "#": "Still in use?",
+      "question": {
+        "en": "Is this vending machine still operational?"
+      },
+      "render": {
+        "en": "The operational status is <i>{operational_status</i>"
+      },
+      "freeform": {
+        "key": "operational_status"
+      },
+      "mappings": [
+        {
+          "if": "operational_status=",
+          "then": {
+            "en": "This vending machine works"
+          }
+        },
+        {
+          "if": "operational_status=broken",
+          "then": {
+            "en": "This vending machine is broken"
+          }
+        },
+        {
+          "if": "operational_status=closed",
+          "then": {
+            "en": "This vending machine is closed"
+          }
+        }
+      ]
+    },
+    {
+      "question": "How much does a bicycle tube cost?",
+      "render": "A bicycle tube costs {charge}",
+      "freeform": {
+        "key": "charge"
+      }
+    },
+    {
+      "question": "How can one pay at this tube vending machine?",
+      "mappings": [
+        {
+          "if": "payment:coins=yes",
+          "then": "Payment with coins is possible"
+        },
+        {
+          "if": "payment:notes=yes",
+          "then": "Payment with notes is possible"
+        },
+        {
+          "if": "payment:cards=yes",
+          "then": "Payment with cards is possible"
+        }
+      ],
+      "multiAnswer": true
+    },
+    {
+      "question": "Which brand of tubes are sold here?",
+      "freeform": {
+        "key": "brand"
+      },
+      "mappings": [
+        {
+          "if": "brand=Continental",
+          "then": "Continental tubes are sold here"
+        },
+        {
+          "if": "brand=Schwalbe",
+          "then": "Schwalbe tubes are sold here"
+        }
+      ],
+      "multiAnswer": true
+    },
+    {
+      "question": "Are other bicycle bicycle accessories sold here?",
+      "mappings": [
+        {
+          "if": "vending:bicycle_light=yes",
+          "then": "Bicycle lights are sold here"
+        },
+        {
+          "if": "vending:gloves=yes",
+          "then": "Gloves are sold here"
+        },
+        {
+          "if": "vending:bicycle_repair_kit=yes",
+          "then": "Bicycle repair kits are sold here"
+        },
+        {
+          "if": "vending:bicycle_pump=yes",
+          "then": "Bicycle pumps are sold here"
+        }
+      ],
+      "multiAnswer": true
+    }
+  ]
+}
diff --git a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg
new file mode 100644
index 0000000..7ca9e67
--- /dev/null
+++ b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="25.929167mm"
+   height="30.958698mm"
+   viewBox="0 0 25.929167 30.958698"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="pinIcon.svg">
+  <defs
+     id="defs2">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       filterUnits="userSpaceOnUse"
+       height="63"
+       width="67"
+       y="23"
+       x="16"
+       id="filter0_d">
+      <feFlood
+         id="feFlood10"
+         result="BackgroundImageFix"
+         flood-opacity="0" />
+      <feColorMatrix
+         id="feColorMatrix12"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         type="matrix"
+         in="SourceAlpha" />
+      <feOffset
+         id="feOffset14"
+         dy="4" />
+      <feGaussianBlur
+         id="feGaussianBlur16"
+         stdDeviation="2" />
+      <feColorMatrix
+         id="feColorMatrix18"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         type="matrix" />
+      <feBlend
+         id="feBlend20"
+         result="effect1_dropShadow"
+         in2="BackgroundImageFix"
+         mode="normal" />
+      <feBlend
+         id="feBlend22"
+         result="shape"
+         in2="effect1_dropShadow"
+         in="SourceGraphic"
+         mode="normal" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       filterUnits="userSpaceOnUse"
+       height="63"
+       width="67"
+       y="23"
+       x="16"
+       id="filter0_d-3">
+      <feFlood
+         id="feFlood10-6"
+         result="BackgroundImageFix"
+         flood-opacity="0" />
+      <feColorMatrix
+         id="feColorMatrix12-7"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         type="matrix"
+         in="SourceAlpha" />
+      <feOffset
+         id="feOffset14-5"
+         dy="4" />
+      <feGaussianBlur
+         id="feGaussianBlur16-3"
+         stdDeviation="2" />
+      <feColorMatrix
+         id="feColorMatrix18-5"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         type="matrix" />
+      <feBlend
+         id="feBlend20-6"
+         result="effect1_dropShadow"
+         in2="BackgroundImageFix"
+         mode="normal" />
+      <feBlend
+         id="feBlend22-2"
+         result="shape"
+         in2="effect1_dropShadow"
+         in="SourceGraphic"
+         mode="normal" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.1303907"
+     inkscape:cx="36.194774"
+     inkscape:cy="71.950763"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="27.966223,64.089257"
+       orientation="1,0"
+       id="guide839"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="33.524427,68.420967"
+       orientation="0,1"
+       id="guide841"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-21.083817,-224.56459)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.82687008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 41.280692,238.51613 c 0,0.53966 -0.617389,0.97866 -1.385942,0.99147 -0.01148,2e-4 -10.875298,2.6e-4 -10.886847,2.6e-4 -0.784514,0 -1.420488,-0.44403 -1.420489,-0.99176 1e-6,-0.54772 0.635975,-0.99175 1.420489,-0.99175 0.01545,0 10.883142,1.6e-4 10.898474,3.6e-4 0.763143,0.0171 1.374315,0.45432 1.374316,0.99127 z"
+       id="path837"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csscsscc"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.82687008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 43.665973,238.47977 c -1e-6,1.55949 -1.353853,2.82693 -3.035183,2.85428 -0.01846,3e-4 -12.607711,4e-4 -12.626255,4e-4 -1.706945,0 -3.090699,-1.2781 -3.0907,-2.85472 -10e-7,-1.57662 1.383754,-2.85476 3.0907,-2.85476 0.02273,0 12.616119,2.3e-4 12.638718,8.8e-4 1.675556,0.0334 3.02272,1.2984 3.02272,2.85405 z"
+       id="path847"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssss"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.82687008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 46.014735,238.47978 c -2e-6,2.69259 -2.168416,4.87871 -4.854222,4.90735 -0.01778,2e-4 -13.766963,2.8e-4 -13.784791,2.8e-4 -2.710414,0 -4.907638,-2.19723 -4.90764,-4.90763 -10e-7,-2.7104 2.197224,-4.90763 4.90764,-4.90763 0.02907,0 13.789453,2.4e-4 13.818401,9.3e-4 2.670264,0.0465 4.820613,2.22555 4.820612,4.90689 z"
+       id="path849"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.23621552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect910"
+       width="2.2565947"
+       height="11.358825"
+       x="37.684917"
+       y="232.82724"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.0892781;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect924"
+       width="0.79356372"
+       height="5.3985114"
+       x="34.012344"
+       y="227.07784"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+  </g>
+</svg>
diff --git a/assets/layers/bicycle_tube_vending_machine/tube.svg b/assets/layers/bicycle_tube_vending_machine/tube.svg
new file mode 100644
index 0000000..c527b75
--- /dev/null
+++ b/assets/layers/bicycle_tube_vending_machine/tube.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="51.841461mm"
+   height="36.68618mm"
+   viewBox="0 0 51.841461 36.68618"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="tube.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6479131"
+     inkscape:cx="31.112488"
+     inkscape:cy="69.182578"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:window-width="597"
+     inkscape:window-height="464"
+     inkscape:window-x="628"
+     inkscape:window-y="207"
+     inkscape:window-maximized="0">
+    <sodipodi:guide
+       position="40.514968,7.9968472"
+       orientation="1,0"
+       id="guide839"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="46.073173,12.328557"
+       orientation="0,1"
+       id="guide841"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-8.5350726,-162.7447)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.68589711;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 52.819614,187.17927 c -1e-6,1.41536 -1.61917,2.56667 -3.634782,2.60026 -0.03011,5e-4 -28.521622,7e-4 -28.551907,7e-4 -2.057472,0 -3.725384,-1.16451 -3.725385,-2.60101 10e-7,-1.4365 1.667913,-2.60101 3.725385,-2.60101 0.04052,0 28.542192,4.5e-4 28.582402,10e-4 2.001425,0.0447 3.604287,1.19146 3.604288,2.59967 z"
+       id="path837"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csscsscc"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.92546511;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 56.121413,187.10232 c -3e-6,3.58651 -3.113572,6.50133 -6.980276,6.56424 -0.04246,6.9e-4 -28.995042,9.3e-4 -29.037689,9.3e-4 -3.925611,0 -7.107948,-2.93938 -7.107951,-6.56528 -2e-6,-3.6259 3.182336,-6.56529 7.107951,-6.56529 0.05225,0 29.014378,5.2e-4 29.066356,0.002 3.853419,0.0768 6.951609,2.98607 6.951609,6.56372 z"
+       id="path847"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssss"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 59.376534,187.10233 c -3e-6,5.69942 -4.589909,10.32682 -10.274983,10.38745 -0.03764,4e-4 -29.140686,6e-4 -29.178423,6e-4 -5.737163,0 -10.3880526,-4.65089 -10.3880554,-10.38805 -2.8e-6,-5.73717 4.6508884,-10.38806 10.3880554,-10.38806 0.06153,0 29.188289,5.3e-4 29.249565,0.002 5.652179,0.0983 10.203844,4.71082 10.203841,10.38646 z"
+       id="path849"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect910"
+       width="4.7765589"
+       height="24.04335"
+       x="41.744713"
+       y="175.13753"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.56908238;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect924"
+       width="1.4863302"
+       height="5.9807334"
+       x="31.488573"
+       y="169.11668"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 31.188119,163.65776 c 0.228413,-0.98336 1.556534,-1.43106 1.966818,0 l 0.96334,4.97725 h -3.612524 z"
+       id="rect936"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-xdpi="244.98"
+       inkscape:export-ydpi="244.98" />
+  </g>
+</svg>