diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index a96aa516a..8642e57ea 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -443,6 +443,20 @@
       "tags": [
         "entrance=yes"
       ]
+    },
+    {
+      "title": {
+        "en": "an indoor door"
+      },
+      "preciseInput": {
+        "preferredBackground": "map",
+        "snapToLayer": [
+          "indoors"
+        ]
+      },
+      "tags": [
+        "indoor=door"
+      ]
     }
   ],
   "units": [
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index aa5e2aabd..d21921d33 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,19 +1,13 @@
 {
   "id": "mapcomplete-changes",
   "title": {
-    "en": "Changes made with MapComplete",
-    "de": "Mit MapComplete vorgenommene Änderungen",
-    "nl": "Wijzigingen gemaakt met MapComplete"
+    "en": "Changes made with MapComplete"
   },
   "shortDescription": {
-    "en": "Shows changes made by MapComplete",
-    "de": "Zeigt die mit MapComplete vorgenommenen Änderungen",
-    "nl": "Toont wijzigingen gemaakt met MapComplete"
+    "en": "Shows changes made by MapComplete"
   },
   "description": {
-    "en": "This maps shows all the changes made with MapComplete",
-    "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
-    "nl": "Deze kaart toont alle wijzigingen die met MapComplete werden gemaakt"
+    "en": "This maps shows all the changes made with MapComplete"
   },
   "maintainer": "",
   "icon": "./assets/svg/logo.svg",
@@ -28,8 +22,7 @@
     {
       "id": "mapcomplete-changes",
       "name": {
-        "en": "Changeset centers",
-        "de": "Zentrum der Änderungssätze"
+        "en": "Changeset centers"
       },
       "minzoom": 0,
       "source": {
@@ -43,47 +36,35 @@
       ],
       "title": {
         "render": {
-          "en": "Changeset for {theme}",
-          "de": "Änderungssatz für {theme}",
-          "nl": "Wijzigingset voor {theme}"
+          "en": "Changeset for {theme}"
         }
       },
       "description": {
-        "en": "Shows all MapComplete changes",
-        "de": "Zeigt alle MapComplete Änderungen",
-        "nl": "Toont alle wijzigingen met MapComplete"
+        "en": "Shows all MapComplete changes"
       },
       "tagRenderings": [
         {
           "id": "render_id",
           "render": {
-            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
-            "de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
-            "nl": "Wijzigingset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
           }
         },
         {
           "id": "contributor",
           "render": {
-            "en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
-            "de": "Geändert von <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
-            "nl": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
+            "en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
           }
         },
         {
           "id": "theme",
           "render": {
-            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
-            "de": "Änderung mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
-            "nl": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           },
           "mappings": [
             {
               "if": "theme~http.*",
               "then": {
-                "en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
-                "de": "Änderung mit <b>inoffiziellem</b> Thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
-                "nl": "Wijziging met <b>officieus</b> thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
+                "en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
               }
             }
           ]
@@ -395,9 +376,7 @@
                 }
               ],
               "question": {
-                "en": "Themename contains {search}",
-                "de": "Themenname enthält {search}",
-                "nl": "Themanaam bevat {search}"
+                "en": "Themename contains {search}"
               }
             }
           ]
@@ -413,9 +392,7 @@
                 }
               ],
               "question": {
-                "en": "Made by contributor {search}",
-                "de": "Erstellt von {search}",
-                "nl": "Gemaakt door bijdrager {search}"
+                "en": "Made by contributor {search}"
               }
             }
           ]
@@ -431,9 +408,7 @@
                 }
               ],
               "question": {
-                "en": "<b>Not</b> made by contributor {search}",
-                "de": "<b>Nicht</b> erstellt von {search}",
-                "nl": "<b>Niet</b> gemaakt door bijdrager {search}"
+                "en": "<b>Not</b> made by contributor {search}"
               }
             }
           ]
@@ -448,9 +423,7 @@
           {
             "id": "link_to_more",
             "render": {
-              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
-              "de": "Weitere Statistiken finden Sie <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>",
-              "nl": "Meer statistieken kunnen <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> gevonden worden"
+              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
             }
           },
           {
diff --git a/assets/themes/onwheels/elevator.svg b/assets/themes/onwheels/elevator.svg
index 35b934aee..2f3443d16 100644
--- a/assets/themes/onwheels/elevator.svg
+++ b/assets/themes/onwheels/elevator.svg
@@ -1 +1,86 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 228.57 239.29"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><path class="cls-1" d="M208.18,119.08V11.93c0-5.24,0-5.24,5.15-5.24,2.43,0,4.87,0,7.31,0,2.05,0,3.12.76,3,2.92-.07,1.13,0,2.27,0,3.4q0,106.5,0,213c0,.69-.06,1.39,0,2.09.13,1.9-.73,2.68-2.62,2.64-3.39-.05-6.79,0-10.19,0-1.84,0-2.73-.76-2.66-2.67s0-4,0-6Z"/><path class="cls-1" d="M20,119.06V226.75c0,3.9,0,3.92-3.91,4-3,0-5.93-.05-8.89,0-1.76,0-2.58-.7-2.55-2.47s0-3.31,0-5q0-106.12,0-212.25c0-4.17.22-4.39,4.45-4.36,2.52,0,5.05.08,7.58,0,2.26-.09,3.47.67,3.32,3.13-.1,1.47,0,3,0,4.44q0,52.41,0,104.82Z"/><path class="cls-1" d="M135.46,156.52a4.35,4.35,0,0,0-4.86-3.21,12.64,12.64,0,0,0-2.44.73c-2.07.72-4.13,1.47-6.22,2.21l-.26-.54q-1.94-4.52-3.88-9c-1.77-4.11-3.53-8.22-5.32-12.31a4.21,4.21,0,0,0-4.06-2.71c-4.84-.06-9.68-.07-14.52-.11L81,131.46c-.18,0-.5-.09-.52-.19-.16-.78-.27-1.58-.4-2.42H99.2c.35,0,.69,0,1,0a4.41,4.41,0,0,0,3.41-6.75,4.58,4.58,0,0,0-4.22-2.1q-10,0-20,0h-.72c-.52-3.24-1-6.39-1.54-9.56h-9c.55,3.45,1.11,6.9,1.66,10.35.83,5.11,1.71,10.2,2.47,15.32a4.76,4.76,0,0,0,4.92,4.29c9.22,0,18.45.11,27.68.15a.86.86,0,0,1,.91.61q4.72,11.05,9.48,22.08a4.49,4.49,0,0,0,6.12,2.69c3.69-1.31,7.39-2.61,11.07-3.95a6.74,6.74,0,0,0,1.67-1,4.71,4.71,0,0,0,1.49-2.56v-1.48C135.55,156.8,135.5,156.66,135.46,156.52Z"/><path class="cls-1" d="M53.61,145.09c.2-1.23.33-2.47.59-3.69a26.58,26.58,0,0,1,6.42-12.56,4.42,4.42,0,0,1,6.63,5.85,18.7,18.7,0,0,0-4.46,8.95,18.32,18.32,0,0,0,34.75,10.84,4.62,4.62,0,0,1,3.67-3,4.41,4.41,0,0,1,4.76,5.84,23.53,23.53,0,0,1-3.45,6.12,26.77,26.77,0,0,1-14.83,10c-1.46.38-3,.53-4.47.79l-.56.11H78.9c-.14,0-.29-.08-.43-.1a34.79,34.79,0,0,1-3.7-.6c-11-2.89-17.86-9.91-20.58-20.95-.29-1.19-.39-2.43-.58-3.64Z"/><ellipse class="cls-1" cx="72.62" cy="109.74" rx="4.51" ry="3.94"/><circle class="cls-1" cx="71.76" cy="95.49" r="8.93"/><path class="cls-1" d="M157.33,131.79H154v1.75q0,18,0,36c0,2.4-1,3.89-2.94,4.52a4.17,4.17,0,0,1-5.43-3.17,10.86,10.86,0,0,1-.13-2q0-31,0-61.93v-2.49h-2c0,.48-.07,1-.07,1.47,0,7.32,0,14.65,0,22,0,2.28-1.42,3.66-3.4,3.39a3,3,0,0,1-2.63-3.33c0-5.24,0-10.47,0-15.7,0-4.38,0-8.75,0-13.13,0-5.09,2.76-7.89,7.83-7.92q10.48-.06,21,0c4.89,0,7.67,2.88,7.67,7.77q0,14.49,0,29c0,2.3-1.56,3.7-3.6,3.31-1.57-.3-2.41-1.44-2.41-3.35q0-10.84,0-21.69v-1.76h-2v1.76q0,31.32,0,62.64a10.81,10.81,0,0,1-.17,2.13,4.23,4.23,0,0,1-4.41,3.27,4.18,4.18,0,0,1-3.9-4c0-2.95,0-5.9,0-8.84V131.79Z"/><path class="cls-1" d="M155.74,89.56a9,9,0,0,1-9.1-9,9,9,0,0,1,18,0A9,9,0,0,1,155.74,89.56Z"/><path class="cls-1" d="M191.93,36.94h-71V24.12h10l-17-17-17,17h10V36.94h-71a5.83,5.83,0,0,0-5.83,5.83V197.05a5.83,5.83,0,0,0,5.83,5.83h71V215.7h-10l17,17,17-17h-10V202.88h71a5.83,5.83,0,0,0,5.83-5.83V42.77A5.83,5.83,0,0,0,191.93,36.94Zm-7.5,147a5.83,5.83,0,0,1-5.83,5.84H49.22a5.83,5.83,0,0,1-5.83-5.84V56a5.83,5.83,0,0,1,5.83-5.83H178.6A5.83,5.83,0,0,1,184.43,56Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="Layer_1"
+   data-name="Layer 1"
+   viewBox="0 0 228.57 239.29"
+   version="1.1"
+   sodipodi:docname="elevator.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview25"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     showgrid="false"
+     inkscape:zoom="3.4309834"
+     inkscape:cx="113.23284"
+     inkscape:cy="173.41967"
+     inkscape:window-width="1920"
+     inkscape:window-height="1007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#1d1d1b;}</style>
+  </defs>
+  <path
+     class="cls-1"
+     d="M 178.82351,119.26779 V 45.570743 c 0,-3.604037 0,-3.604037 3.54214,-3.604037 1.67133,0 3.34955,0 5.02776,0 1.40998,0 2.14592,0.522723 2.06338,2.008357 -0.0481,0.777206 0,1.56129 0,2.338497 q 0,73.24998 0,146.49996 c 0,0.47458 -0.0413,0.95603 0,1.43749 0.0894,1.3068 -0.50209,1.84328 -1.80201,1.81577 -2.33162,-0.0344 -4.67012,0 -7.00862,0 -1.26554,0 -1.87767,-0.52272 -1.82953,-1.83641 0.0481,-1.31368 0,-2.75117 0,-4.12676 z"
+     id="path6"
+     style="stroke-width:0.687793" />
+  <path
+     class="cls-1"
+     d="m 49.394579,119.25403 v 74.06846 c 0,2.68239 0,2.69615 -2.689272,2.75117 -2.06338,0 -4.078614,-0.0344 -6.114482,0 -1.210516,0 -1.774506,-0.48146 -1.753873,-1.69885 0.02063,-1.21739 0,-2.2766 0,-3.43897 q 0,-72.98861 0,-145.984111 c 0,-2.868098 0.151315,-3.019412 3.06068,-2.998778 1.733239,0 3.473356,0.05502 5.213473,0 1.554413,-0.0619 2.386643,0.460821 2.283474,2.152792 -0.06878,1.011056 0,2.06338 0,3.053802 q 0,36.047244 0,72.094485 z"
+     id="path8"
+     style="stroke-width:0.687793" />
+  <path
+     class="cls-1"
+     d="m 128.80719,145.01877 a 2.9919006,2.9919006 0 0 0 -3.34268,-2.20782 8.6937065,8.6937065 0 0 0 -1.67821,0.50209 c -1.42374,0.49521 -2.84059,1.01106 -4.27808,1.52002 l -0.17883,-0.37141 q -1.33431,-3.10882 -2.66863,-6.19013 c -1.2174,-2.82683 -2.42791,-5.65366 -3.65906,-8.46674 a 2.8956095,2.8956095 0 0 0 -2.79244,-1.86392 c -3.32892,-0.0413 -6.65784,-0.0481 -9.98676,-0.0757 l -8.872534,-0.0825 c -0.123803,0 -0.343897,-0.0619 -0.357652,-0.13068 -0.110047,-0.53648 -0.185705,-1.08672 -0.275118,-1.66446 H 103.8678 c 0.24073,0 0.47458,0 0.6878,0 a 3.0331682,3.0331682 0 0 0 2.34537,-4.64261 3.150093,3.150093 0 0 0 -2.90249,-1.44436 q -6.877929,0 -13.755861,0 h -0.495211 c -0.357653,-2.22845 -0.687793,-4.395 -1.059202,-6.57531 h -6.190139 c 0.378286,2.37289 0.763451,4.74578 1.141737,7.11866 0.570868,3.51463 1.176126,7.0155 1.698849,10.537 a 3.2738958,3.2738958 0 0 0 3.383943,2.95063 c 6.341454,0 12.689784,0.0757 19.038114,0.10317 a 0.59150218,0.59150218 0 0 1 0.62589,0.41955 q 3.24639,7.60012 6.52028,15.18648 a 3.0881916,3.0881916 0 0 0 4.2093,1.85016 c 2.53796,-0.90101 5.08279,-1.79514 7.61387,-2.71678 a 4.6357264,4.6357264 0 0 0 1.14861,-0.68779 3.2395061,3.2395061 0 0 0 1.02482,-1.76076 v -1.01793 c -0.0344,-0.0963 -0.0688,-0.19258 -0.0963,-0.28887 z"
+     id="path10"
+     style="stroke-width:0.687793" />
+  <path
+     class="cls-1"
+     d="m 72.511309,137.15729 c 0.137559,-0.84599 0.226972,-1.69885 0.405798,-2.53796 a 18.281544,18.281544 0 0 1 4.415633,-8.63868 3.0407035,3.0407035 0 0 1 4.560069,4.02359 12.861734,12.861734 0 0 0 -3.067558,6.15575 12.600372,12.600372 0 0 0 23.900819,7.45568 3.1776048,3.1776048 0 0 1 2.5242,-2.06338 3.0331682,3.0331682 0 0 1 3.27389,4.01671 16.183775,16.183775 0 0 1 -2.37288,4.2093 18.412225,18.412225 0 0 1 -10.199977,6.87793 c -1.004178,0.26136 -2.06338,0.36453 -3.074436,0.54336 l -0.385164,0.0756 H 89.9056 c -0.09629,0 -0.19946,-0.055 -0.295751,-0.0688 a 23.928327,23.928327 0 0 1 -2.544835,-0.41267 c -7.565725,-1.98773 -12.283987,-6.81603 -14.154785,-14.40927 -0.19946,-0.81847 -0.268239,-1.67134 -0.39892,-2.50357 z"
+     id="path12"
+     style="stroke-width:0.687793" />
+  <ellipse
+     class="cls-1"
+     cx="85.586258"
+     cy="112.8438"
+     rx="3.1019475"
+     ry="2.7099054"
+     id="ellipse14"
+     style="stroke-width:0.687793" />
+  <circle
+     class="cls-1"
+     cx="84.994759"
+     cy="103.04275"
+     r="6.141994"
+     id="circle16"
+     style="stroke-width:0.687793" />
+  <path
+     class="cls-1"
+     d="m 143.84922,128.00964 h -2.29035 v 1.20364 q 0,12.38028 0,24.76056 c 0,1.6507 -0.68779,2.67551 -2.02211,3.10882 a 2.8680978,2.8680978 0 0 1 -3.73472,-2.1803 7.4694346,7.4694346 0 0 1 -0.0894,-1.37559 q 0,-21.32159 0,-42.59504 v -1.7126 h -1.37559 c 0,0.33014 -0.0481,0.68779 -0.0481,1.01106 0,5.03464 0,10.07617 0,15.13145 0,1.56817 -0.97667,2.51732 -2.3385,2.33162 a 2.0633797,2.0633797 0 0 1 -1.8089,-2.29036 c 0,-3.60403 0,-7.20119 0,-10.79835 0,-3.01253 0,-6.01819 0,-9.03072 0,-3.50087 1.89831,-5.42669 5.38543,-5.44733 q 7.20807,-0.0413 14.44365,0 c 3.36331,0 5.27538,1.98085 5.27538,5.34416 q 0,9.96612 0,19.946 c 0,1.58192 -1.07296,2.54483 -2.47606,2.2766 -1.07983,-0.20634 -1.65758,-0.99043 -1.65758,-2.30411 q 0,-7.45568 0,-14.91824 v -1.21051 h -1.37559 v 1.21051 q 0,21.54169 0,43.08337 a 7.4350449,7.4350449 0 0 1 -0.11692,1.465 2.9093654,2.9093654 0 0 1 -3.03317,2.24908 2.8749757,2.8749757 0 0 1 -2.68239,-2.75117 c 0,-2.02899 0,-4.05798 0,-6.08009 v -20.42746 z"
+     id="path18"
+     style="stroke-width:0.687793" />
+  <path
+     class="cls-1"
+     d="m 142.75563,98.964132 a 6.1901391,6.1901391 0 0 1 -6.25892,-6.190139 6.19014,6.19014 0 0 1 12.38028,0 6.1901391,6.1901391 0 0 1 -6.12136,6.190139 z"
+     id="path20"
+     style="stroke-width:0.687793" />
+  <path
+     class="cls-1"
+     d="m 167.64687,62.772452 h -48.83332 v -8.817509 h 6.87793 L 113.999,42.262457 102.30651,53.954943 h 6.87793 v 8.817509 H 60.351125 A 4.0098346,4.0098346 0 0 0 56.34129,66.782286 V 172.89503 a 4.0098346,4.0098346 0 0 0 4.009835,4.00983 h 48.833315 v 8.81751 h -6.87793 l 11.69249,11.69249 11.69248,-11.69249 h -6.87793 v -8.81751 h 48.83332 a 4.0098346,4.0098346 0 0 0 4.00983,-4.00983 V 66.782286 a 4.0098346,4.0098346 0 0 0 -4.00983,-4.009834 z m -5.15845,101.105608 a 4.0098346,4.0098346 0 0 1 -4.00983,4.01671 H 69.491897 a 4.0098346,4.0098346 0 0 1 -4.009835,-4.01671 V 75.881791 a 4.0098346,4.0098346 0 0 1 4.009835,-4.009835 h 88.986693 a 4.0098346,4.0098346 0 0 1 4.00983,4.009835 z"
+     id="path22"
+     style="stroke-width:0.687793" />
+</svg>
diff --git a/assets/themes/onwheels/entrance.svg b/assets/themes/onwheels/entrance.svg
index aaee24c6f..0415bea8a 100644
--- a/assets/themes/onwheels/entrance.svg
+++ b/assets/themes/onwheels/entrance.svg
@@ -1,5 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" version="1.1" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;" viewBox="0 0 846.66 846.66" x="0px" y="0px" fill-rule="evenodd" clip-rule="evenodd"><defs><style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xml:space="preserve"
+   version="1.1"
+   style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;"
+   viewBox="0 0 846.66 846.66"
+   x="0px"
+   y="0px"
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   id="svg10"
+   sodipodi:docname="entrance.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     showgrid="false"
+     inkscape:zoom="0.96969271"
+     inkscape:cx="423.32999"
+     inkscape:cy="572.34627"
+     inkscape:window-width="1920"
+     inkscape:window-height="1007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" /><defs
+     id="defs4"><style
+       type="text/css"
+       id="style2">
    
     .fil0 {fill:black}
    
-  </style></defs><g><path class="fil0" d="M226.16 46.72l394.34 0c23.82,0 43.18,19.37 43.18,43.19l0 666.85c0,23.83 -19.36,43.19 -43.18,43.19l-394.34 0c-23.15,0 -42.22,-18.35 -43.14,-41.47l-0.01 -0.05 0 -0.07 0 -0.13 -0.01 -0.12 0 -0.11 0 -0.13 -0.01 0 0 -0.12 0 -0.12 0 -0.13 0 -0.12 -0.01 -0.06 0 -0.06 0 -0.13 0 -0.12 0 -0.12 0 -0.13 0 -666.85 0 -0.12 0 -0.13 0 -0.12 0 -0.13 0 -0.06 0.01 -0.06 0 -0.12 0 -0.13 0 -0.12 0 -0.12 0.01 0 0 -0.13 0 -0.12 0.01 -0.12 0 -0.13 0 -0.06 0.01 -0.06c0.94,-23.11 19.98,-41.46 43.14,-41.46zm137.19 322.13l47.68 0 0 108.99 -47.68 0 0 -108.99zm-72.48 -270.63l167.25 89.02c8.64,4.62 13.58,13.47 13.58,22.63 0.12,142.31 0.1,284.62 0.1,426.93 0,10.66 -6.49,19.81 -15.74,23.72l-165.2 87.93 321.33 0 0 -650.23 -321.32 0z"></path></g></svg>
\ No newline at end of file
+  </style></defs><g
+     id="g8"
+     transform="matrix(0.80128517,0,0,0.80128517,84.121948,84.122941)"><path
+       class="fil0"
+       d="M 226.16,46.72 H 620.5 c 23.82,0 43.18,19.37 43.18,43.19 v 666.85 c 0,23.83 -19.36,43.19 -43.18,43.19 H 226.16 c -23.15,0 -42.22,-18.35 -43.14,-41.47 l -0.01,-0.05 v -0.07 -0.13 L 183,758.11 V 758 757.87 h -0.01 v -0.12 -0.12 -0.13 -0.12 l -0.01,-0.06 v -0.06 -0.13 -0.12 -0.12 -0.13 -666.85 -0.12 -0.13 -0.12 -0.13 -0.06 l 0.01,-0.06 V 89.17 89.04 88.92 88.8 H 183 v -0.13 -0.12 l 0.01,-0.12 V 88.3 88.24 l 0.01,-0.06 C 183.96,65.07 203,46.72 226.16,46.72 Z m 137.19,322.13 h 47.68 V 477.84 H 363.35 Z M 290.87,98.22 458.12,187.24 c 8.64,4.62 13.58,13.47 13.58,22.63 0.12,142.31 0.1,284.62 0.1,426.93 0,10.66 -6.49,19.81 -15.74,23.72 l -165.2,87.93 H 612.19 V 98.22 Z"
+       id="path6" /></g></svg>
diff --git a/assets/themes/onwheels/license_info.json b/assets/themes/onwheels/license_info.json
index 08172bc9f..c088ed77a 100644
--- a/assets/themes/onwheels/license_info.json
+++ b/assets/themes/onwheels/license_info.json
@@ -117,16 +117,6 @@
       "https://www.ctsteward.com/"
     ]
   },
-  {
-    "path": "reception.svg",
-    "license": "CC-BY-SA",
-    "authors": [
-      "CT Steward"
-    ],
-    "sources": [
-      "https://www.ctsteward.com/"
-    ]
-  },
   {
     "path": "repair.svg",
     "license": "CC-BY-SA",
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 9991c8ab2..9c90f58db 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -28,33 +28,6 @@
         "passAllFeatures": true
       }
     },
-    {
-      "builtin": "bike_repair_station",
-      "override": {
-        "minzoom": 15,
-        "shownByDefault": false,
-        "mapRendering": [
-          {
-            "icon": {
-              "render": "./assets/themes/onwheels/repair.svg",
-              "mappings": [
-                {
-                  "if": "service:bicycle:pump=yes",
-                  "then": "./assets/themes/onwheels/bicycle_pump.svg"
-                }
-              ]
-            },
-            "iconSize": "40,40,bottom"
-          }
-        ]
-      }
-    },
-    {
-      "builtin": "bike_shop",
-      "override": {
-        "shownByDefault": false
-      }
-    },
     {
       "builtin": "pedestrian_path",
       "override": {
@@ -92,7 +65,7 @@
         "minzoom": 19,
         "mapRendering": [
           {
-            "icon": "./assets/themes/onwheels/entrance.svg",
+            "icon": "circle:white;./assets/themes/onwheels/entrance.svg",
             "iconSize": "40,40,center"
           }
         ],
@@ -199,23 +172,6 @@
         ]
       }
     },
-    {
-      "builtin": "picnic_table",
-      "override": {
-        "shownByDefault": false
-      }
-    },
-    {
-      "builtin": "school",
-      "override": {
-        "shownByDefault": false,
-        "mapRendering": [
-          {
-            "label": null
-          }
-        ]
-      }
-    },
     {
       "builtin": "shops",
       "override": {
@@ -245,7 +201,6 @@
         ]
       }
     },
-    "viewpoint",
     {
       "builtin": "pharmacy",
       "override": {
@@ -293,13 +248,7 @@
       "builtin": "reception_desk",
       "override": {
         "minzoom": 19,
-        "syncSelection": "theme-only",
-        "mapRendering": [
-          {
-            "icon": "./assets/themes/onwheels/reception.svg",
-            "iconSize": "40,40,bottom"
-          }
-        ]
+        "syncSelection": "theme-only"
       }
     },
     "walls_and_buildings",
@@ -310,7 +259,7 @@
         "syncSelection": "theme-only",
         "mapRendering": [
           {
-            "icon": "./assets/themes/onwheels/elevator.svg",
+            "icon": "circle:white;./assets/themes/onwheels/elevator.svg",
             "iconSize": "40,40,bottom"
           }
         ]
diff --git a/assets/themes/onwheels/reception.svg b/assets/themes/onwheels/reception.svg
deleted file mode 100644
index 0e818387a..000000000
--- a/assets/themes/onwheels/reception.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100.4 122.34"><defs><style>.cls-1{fill:#fdfeff;}.cls-2{fill:#fcfeff;}.cls-3{fill:#55b3e6;}</style></defs><path class="cls-3" d="M50.2,122.34c-16.98-12.77-29.59-24.98-37.84-36.63C4.12,74.06,0,62.6,0,51.32c0-8.43,1.52-15.84,4.56-22.22,3.04-6.38,6.97-11.74,11.81-16.08,4.83-4.34,10.23-7.59,16.18-9.76S44.38,0,50.2,0s11.71,1.08,17.66,3.25,11.34,5.42,16.18,9.76c4.83,4.34,8.77,9.7,11.81,16.08,3.04,6.38,4.56,13.79,4.56,22.22,0,11.28-4.12,22.75-12.36,34.4-8.24,11.65-20.86,23.86-37.84,36.63Zm0-71.03h0Z"/><g><path class="cls-2" d="M73.81,51.92c-.16-.08-.21-.17-.21-.34,0-2.09,0-4.17,0-6.26,0-.6-.39-1-.99-1.01-1.34,0-2.68,0-4.02,0-.61,0-1.01,.41-1.01,1.02,0,1.66,0,3.33,0,4.99,0,.19-.04,.25-.25,.25-2.52,0-5.04,0-7.56,0-.58,0-.96,.37-.97,.95,0,.32,0,.65,0,.97,0,.72,.35,1.07,1.06,1.07,2.5,0,5,0,7.5,0,.16,0,.21,.04,.21,.2,0,.81,0,1.62,0,2.42,0,.18-.04,.24-.23,.24-1.77,0-3.54,0-5.3,0-1.4,0-2.8,0-4.21,0-.34,0-.58,.12-.76,.43-.61,1.08-1.25,2.15-1.87,3.22-1.24,2.13-2.48,4.25-3.72,6.38-.07,.13-.13,.16-.26,.07-.21-.15-.42-.28-.64-.41-.41-.24-.83-.13-1.08,.26-.11,.17-.22,.35-.33,.52-.34,.53-.25,.92,.28,1.26,.76,.48,1.51,.97,2.27,1.45,.64,.41,1.29,.83,1.94,1.23,.44,.27,.87,.15,1.13-.28,.17-.3,.35-.6,.52-.89,.43-.75,.87-1.5,1.3-2.26,.08,.05,.08,.13,.1,.19,.71,1.93,1.81,3.6,3.34,4.96,3.3,2.91,7.13,3.93,11.41,2.92,6.4-1.51,10.53-7.79,9.4-14.26-.75-4.27-3.17-7.35-7.05-9.28Zm-2.07,20.54c-5.19,1.82-10.81-.96-12.51-6.15-.26-.81-.41-1.64-.47-2.49,0-.09,.01-.16,.06-.24,.45-.78,.9-1.55,1.34-2.33,.08-.14,.18-.13,.29-.13,3.99,0,7.98,0,11.97,0,.12,0,.23,0,.35-.01,.52-.04,.83-.37,.83-.89,0-1.66,0-3.31,0-4.97,0-.07-.02-.15,.03-.24,.24,.14,.46,.29,.68,.46,2.11,1.61,3.41,3.72,3.81,6.34,.73,4.82-2.14,9.16-6.39,10.65Z"/><path class="cls-1" d="M52.97,40.36c-2.58-2.33-5.21-4.61-7.75-6.99-.17-.16-.37-.22-.6-.22-1.62,0-3.25,0-4.87,0-2.17,0-4.34,0-6.51,0-.24,0-.44,.07-.62,.23-.72,.67-1.44,1.35-2.18,2-1.85,1.66-3.71,3.31-5.56,4.97-.43,.38-.45,.86-.07,1.29,.36,.4,.71,.81,1.08,1.2,.35,.38,.85,.41,1.23,.07,1.95-1.74,3.89-3.48,5.84-5.21,.23-.2,.48-.38,.75-.6v.3c0,2.14,0,4.28,0,6.42,0,.58,.24,.82,.82,.82,2.94,0,5.87,0,8.81,0,.56,0,.8-.24,.8-.81,0-2.15,0-4.3,0-6.44,0-.08-.02-.16,.03-.26,.24,.19,.49,.37,.71,.57,1.94,1.73,3.88,3.47,5.82,5.2,.41,.37,.91,.34,1.28-.07,.35-.39,.7-.78,1.05-1.17,.38-.43,.36-.91-.07-1.29Z"/><path class="cls-1" d="M43.49,55.01c-1.52,0-3.04,0-4.56,0s-3.05,0-4.58,0c-.49,0-.68,.21-.61,.7,.15,1.04,.31,2.09,.47,3.13,.24,1.61,.48,3.22,.73,4.83,.26,1.74,.52,3.48,.78,5.22,.07,.45,.32,.67,.77,.67,1.63,0,3.26,0,4.89,0,.43,0,.7-.24,.77-.66,.25-1.66,.5-3.33,.75-4.99,.41-2.73,.81-5.46,1.22-8.18,.07-.5-.11-.71-.62-.71Z"/><path class="cls-2" d="M38.85,31.64c1.96,0,3.53-1.54,3.53-3.48,0-1.92-1.56-3.48-3.49-3.49-1.94,0-3.48,1.54-3.48,3.48,0,1.92,1.54,3.48,3.43,3.49Z"/><path class="cls-2" d="M70.63,42.88c1.92,0,3.47-1.56,3.48-3.47,0-1.92-1.58-3.51-3.5-3.5-1.92,0-3.47,1.56-3.47,3.48,0,1.96,1.54,3.5,3.49,3.49Z"/><path class="cls-1" d="M52.28,51.85c-.07-.16-.17-.3-.28-.43-1.14-1.32-2.28-2.65-3.42-3.97-.23-.27-.52-.47-.85-.61-.43-.18-.88-.25-1.35-.25-9.59,0-19.19,0-28.78,0h-1.72s-.04,0-.05,0h-.26v6.73h2.03c2.6-.01,5.21-.02,7.81-.02,8.6,0,17.2,0,25.79,0,.07,0,.14,0,.21,0,.8-.04,1.21-.72,.87-1.45Z"/><path class="cls-1" d="M71.34,26.56c-.15-.31-.44-.4-.75-.25-.16,.08-.31,.19-.41,.34-.08,.1-.14,.11-.26,.06-2.39-1.13-4.79-2.25-7.19-3.37-.1-.04-.15-.11-.18-.21-.08-.24-.2-.46-.37-.64-.07-.08-.09-.16-.09-.26,0-2.06,0-4.11,0-6.17v-1.44h-2.8v2.14h0c0,1.8,0,3.6,0,5.39,0,.17-.03,.3-.15,.43-.13,.13-.22,.3-.28,.48-.05,.15-.14,.23-.28,.3-2.29,1.07-4.57,2.13-6.85,3.21-.28,.13-.46,.19-.73-.08-.46-.47-.98-.27-1.08,.38-.14,.89,.14,1.67,.73,2.32,.32,.35,.59,.38,1.03,.18,.05-.02,.1-.04,.15-.07,2.59-1.22,5.19-2.43,7.78-3.65,.13-.06,.24-.07,.37-.01,.44,.18,.89,.18,1.33,.02,.19-.07,.33-.05,.5,.03,2.62,1.24,5.25,2.47,7.88,3.7,.4,.19,.66,.14,.98-.17,.43-.42,.65-.95,.75-1.53,.07-.38,.08-.76-.1-1.11Z"/></g></svg>
\ No newline at end of file