diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index 0e7d24f8c..86e254224 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -200,6 +200,17 @@
       "location": [
         "point",
         "centroid"
+      ],
+      "iconBadges": [
+        {
+          "if": {
+            "and": [
+              "capacity:disabled~*",
+              "capacity:disabled!=no"
+            ]
+          },
+          "then": "circle:white;./assets/layers/toilet/wheelchair.svg"
+        }
       ]
     },
     {
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 794824f3f..28b42e3b8 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -274,6 +274,13 @@
             "ru": "Недоступно пользователям кресел-колясок",
             "es": "Sin acceso para sillas de ruedas"
           }
+        },
+        {
+          "if": "wheelchair=designated",
+          "then": {
+            "en": "There is only a dedicated toilet for wheelchair users",
+            "nl": "Er is alleen een toilet voor rolstoelgebruikers"
+          }
         }
       ]
     },
@@ -533,7 +540,9 @@
             "de": "Rollstuhlgerecht",
             "es": "Accesible con sillas de ruedas"
           },
-          "osmTags": "wheelchair=yes"
+          "osmTags": {
+            "or": ["wheelchair=yes", "wheelchair=designated"]
+          }
         }
       ]
     },
@@ -609,7 +618,9 @@
         "render": "./assets/layers/toilet/toilets.svg",
         "mappings": [
           {
-            "if": "wheelchair=yes",
+            "if": {
+              "or": ["wheelchair=yes", "wheelchair=designated"]
+            },
             "then": "circle:white;./assets/layers/toilet/wheelchair.svg"
           },
           {
@@ -623,6 +634,7 @@
           }
         ]
       },
+      
       "iconBadges": [
         {
           "if": "opening_hours~*",
diff --git a/assets/themes/onwheels/bicycle_pump.svg b/assets/themes/onwheels/bicycle_pump.svg
new file mode 100644
index 000000000..98d33fb00
--- /dev/null
+++ b/assets/themes/onwheels/bicycle_pump.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#999932;}</style></defs><path class="cls-2" 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.76C38.49,1.08,44.38,0,50.2,0s11.71,1.08,17.66,3.25c5.95,2.17,11.34,5.42,16.18,9.76,4.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"/><path class="cls-1" d="M85.07,41.39h-4.71c-1.49,0-2.82,.95-3.32,2.36h-.81c-3.58,0-6.48,2.9-6.48,6.48v8.84c0,2.28-1.85,4.13-4.13,4.13s-4.13-1.85-4.13-4.13v-1.77c0-3.9-3.15-7.07-7.05-7.07-1.75,0-3.44,.64-4.74,1.82V31.37c0-1.95-1.58-3.53-3.54-3.54h-2.36v-7.07h7.07c1.95,0,3.54-1.58,3.54-3.54s-1.58-3.54-3.54-3.54h-16.5c-1.95,0-3.54,1.58-3.54,3.54s1.58,3.54,3.54,3.54h7.07v7.07h-2.36c-1.95,0-3.53,1.58-3.54,3.54v34.18h-4.71c-1.95,0-3.53,1.58-3.54,3.54v2.36c0,.65,.53,1.18,1.18,1.18h28.29c.65,0,1.18-.53,1.18-1.18h0v-2.36c0-1.95-1.58-3.53-3.54-3.54h-4.71v-8.25c0-2.6,2.11-4.71,4.71-4.71s4.71,2.11,4.71,4.71v1.77c0,3.58,2.9,6.48,6.48,6.48s6.48-2.9,6.48-6.48v-8.84c0-2.28,1.85-4.12,4.13-4.13h.81c.5,1.41,1.83,2.35,3.32,2.36h4.71c.65,0,1.18-.53,1.18-1.18v-4.71c0-.65-.53-1.18-1.18-1.18ZM33.2,17.22c0-.65,.53-1.18,1.18-1.18h16.5c.65,0,1.18,.53,1.18,1.18s-.53,1.18-1.18,1.18h-16.5c-.65,0-1.18-.53-1.18-1.18Zm22.4,51.86v1.18H29.67v-1.18c0-.65,.53-1.18,1.18-1.18h23.57c.65,0,1.18,.53,1.18,1.18Zm-17.68-3.54V31.37c0-.65,.53-1.18,1.18-1.18h7.07c.65,0,1.18,.53,1.18,1.18v34.18h-9.43Zm45.97-19.45h-3.54c-.65,0-1.18-.53-1.18-1.18s.53-1.18,1.18-1.18h3.54v2.36Z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/cafe.svg b/assets/themes/onwheels/cafe.svg
new file mode 100644
index 000000000..266130911
--- /dev/null
+++ b/assets/themes/onwheels/cafe.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#ed6e18;}</style></defs><path class="cls-2" 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"/><path class="cls-1" d="M71.39,41.28H31.96c-.66,0-1.19,.53-1.19,1.19v13.14c0,3.47,1.17,6.83,3.31,9.56h-10.48c-.35,0-.68,.15-.91,.42s-.32,.62-.27,.97l.53,3.17c.47,2.89,2.97,5,5.89,4.99h39.69c2.92,0,5.42-2.11,5.89-4.99l.53-3.17c.06-.35-.04-.7-.27-.97s-.56-.42-.91-.42h-10.48c.77-.97,1.42-2.03,1.93-3.16l8.65-2.49c3.5-1.08,5.88-4.32,5.87-7.98v-1.9c0-4.62-3.75-8.36-8.36-8.36Zm-4.78,7.17h3.79c1.09,.01,2,.82,2.15,1.9s-.53,2.1-1.57,2.4l-4.36,1.19v-5.5Zm5.46,20.9c-.28,1.73-1.78,3-3.54,2.99H28.84c-1.75,0-3.25-1.26-3.54-2.99l-.3-1.78h47.36l-.3,1.78Zm-34.77-4.17c-2.64-2.48-4.14-5.94-4.14-9.56v-11.95h31.06v11.95c0,3.62-1.51,7.08-4.15,9.56h-22.78Zm40.06-13.63c.01,2.61-1.68,4.92-4.17,5.69l-7.04,2.03c.22-.93,.36-1.88,.41-2.83l5.04-1.37c2.22-.6,3.64-2.75,3.34-5.03s-2.25-3.98-4.54-3.97h-3.79v-2.39h4.78c3.3,0,5.97,2.68,5.97,5.97v1.9Z"/><path class="cls-1" d="M46.3,37.69c0,.66,.53,1.19,1.19,1.19s1.19-.53,1.19-1.19c-.03-1.13,.33-2.24,1.01-3.15,.93-1.29,1.41-2.84,1.38-4.42,.03-1.58-.45-3.13-1.38-4.42-.68-.91-1.04-2.01-1.01-3.15-.03-1.13,.33-2.24,1.01-3.14,.93-1.28,1.41-2.84,1.38-4.42,0-.66-.53-1.19-1.19-1.19s-1.19,.53-1.19,1.19c.03,1.13-.33,2.24-1.01,3.14-.93,1.28-1.41,2.84-1.38,4.42-.03,1.58,.45,3.13,1.38,4.42,.68,.91,1.04,2.02,1.01,3.15,.03,1.13-.33,2.24-1.01,3.15-.93,1.29-1.41,2.84-1.38,4.42Z"/><path class="cls-1" d="M39.07,19.21c.35-.56,.18-1.3-.38-1.65-.56-.35-1.3-.18-1.65,.38l-.12,.19c-.93,1.29-1.41,2.84-1.38,4.42-.03,1.58,.45,3.13,1.38,4.42,.68,.91,1.04,2.02,1.01,3.15,.03,1.13-.33,2.24-1.01,3.15l-.13,.2c-.35,.56-.18,1.3,.38,1.65,.56,.35,1.3,.18,1.65-.38l.12-.19c.93-1.29,1.41-2.84,1.38-4.42,.03-1.58-.45-3.13-1.38-4.42-.68-.91-1.04-2.01-1.01-3.15-.03-1.13,.33-2.24,1.01-3.14l.13-.2Z"/><path class="cls-1" d="M60.58,19.21c.35-.56,.18-1.3-.38-1.65-.56-.35-1.3-.18-1.65,.38l-.12,.19c-.93,1.29-1.41,2.84-1.38,4.42-.03,1.58,.45,3.13,1.38,4.42,.68,.91,1.04,2.02,1.01,3.15,.03,1.13-.33,2.24-1.01,3.15l-.13,.2c-.35,.56-.18,1.3,.38,1.65,.56,.35,1.3,.18,1.65-.38l.12-.19c.93-1.29,1.41-2.84,1.38-4.42,.03-1.58-.45-3.13-1.38-4.42-.68-.91-1.04-2.01-1.01-3.15-.03-1.13,.33-2.24,1.01-3.14l.13-.2Z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/cone.svg b/assets/themes/onwheels/cone.svg
new file mode 100644
index 000000000..884d7849a
--- /dev/null
+++ b/assets/themes/onwheels/cone.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#be1622;}</style></defs><path class="cls-2" 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-1" d="M33.54,54.4c.08,.47,.16,.63,.13,.76-1.3,4.56-.71,6.16,3.75,7.92,8.39,3.32,16.88,3.24,25.32,.08,.87-.33,1.71-.82,2.47-1.36,2.34-1.64,2.68-2.85,1.72-5.58-.18-.5-.32-1.01-.65-2.08,4.72,1.98,9.1,3.62,13.29,5.64,2.25,1.08,1.96,3.32-.52,4.75-3.33,1.93-6.76,3.7-10.15,5.53-4.09,2.2-8.16,4.42-12.28,6.55-4.26,2.2-8.62,2.28-12.89,.03-7.3-3.85-14.56-7.79-21.84-11.68-1.28-.68-2.63-1.42-2.62-3.05,.02-1.8,1.56-2.42,2.95-2.99,3.7-1.51,7.43-2.97,11.29-4.51Z"/><path class="cls-1" d="M39.09,40.14c5.3,5.44,18.14,4.63,22.09-.09,1.12,3.13,2.23,6.13,3.27,9.17,.57,1.67-.54,2.7-1.68,3.56-2.33,1.76-5.08,2.48-7.91,2.84-5.21,.67-10.38,.56-15.29-1.64-3.82-1.71-4.36-3.05-2.98-6.95,.81-2.29,1.65-4.56,2.49-6.89Z"/><path class="cls-1" d="M50.25,20.37c3.35,.02,4.11,.58,5.28,3.84,.71,1.99,1.38,4,2.18,5.96,.52,1.28,.18,2.14-.98,2.71-4.37,2.13-8.76,2.11-13.12,0-1.11-.54-1.58-1.33-1.01-2.68,.82-1.94,1.42-3.98,2.13-5.97,1.15-3.25,2.06-3.88,5.54-3.86Z"/></g></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/doctor.svg b/assets/themes/onwheels/doctor.svg
new file mode 100644
index 000000000..6d0c787ed
--- /dev/null
+++ b/assets/themes/onwheels/doctor.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#c55c47;}</style></defs><path class="cls-2" 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"/><path class="cls-1" d="M59.16,41.54c0,3.47-.1,6.94,.03,10.4,.1,2.63-.86,4.75-2.54,6.63-2.81,3.13-6.29,5.32-10.35,6.25-2.03,.47-2.4,1.33-2.33,3.17,.26,6.71,5.12,12.12,11.82,12.96,6.09,.76,12.16-3.45,13.92-9.67,.54-1.92,.44-3.9,.45-5.86,.02-4.57-.03-9.14,.03-13.7,.02-1.32-.29-2.06-1.66-2.65-4.14-1.79-6.18-6.01-5.23-10.24,.96-4.27,4.71-7.33,8.98-7.31,4.14,.02,7.98,3.08,8.93,7.13,.98,4.17-1.06,8.53-5.15,10.34-1.47,.65-1.73,1.46-1.72,2.86,.06,5.2,.04,10.4,.02,15.59-.05,10.04-7.55,17.78-17.22,17.77-9.73,0-17.33-7.69-17.35-17.69,0-1.63-.4-2.29-2.07-2.66-3.6-.8-6.71-2.67-9.4-5.19-2.46-2.3-3.83-5.02-3.74-8.55,.16-6.53,.05-13.07,.04-19.61,0-4.18,1.64-7.47,5.27-9.65,.7-.42,1.14-1,1.6-1.66,1.39-2.02,3.82-2.56,5.81-1.37,1.86,1.11,2.59,3.57,1.66,5.58-.94,2.04-3.27,3.21-5.32,2.13-2.61-1.39-3.34,.28-4.21,1.98-.51,.99-.55,2.11-.55,3.23,.02,6.62,.04,13.23-.01,19.85-.01,1.51,.41,2.76,1.33,3.91,6.01,7.5,17.78,7.41,23.68-.17,.76-.98,1.09-2.03,1.09-3.27-.03-6.93-.02-13.86,0-20.79,0-1.36-.16-2.67-1-3.8-.87-1.17-1.56-2.12-3.38-1.02-2.02,1.22-4.55,.11-5.6-1.95-1.02-2-.35-4.38,1.56-5.58,2.01-1.27,4.42-.85,5.82,1.2,.6,.88,1.33,1.47,2.18,2.04,3,2.03,4.65,4.83,4.64,8.52,0,3.62,0,7.25,0,10.87Zm17.92-.82c0-2.74-2.26-5.01-4.93-4.95-2.63,.05-4.97,2.48-4.9,5.09,.07,2.57,2.29,4.71,4.92,4.73,2.87,.02,4.91-2,4.9-4.86Z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/hospital.svg b/assets/themes/onwheels/hospital.svg
new file mode 100644
index 000000000..96a7c7b24
--- /dev/null
+++ b/assets/themes/onwheels/hospital.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#dd463b;}</style></defs><path class="cls-2" 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.25c5.95,2.17,11.34,5.42,16.18,9.76,4.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-1" d="M78.72,32.6h-8.49v-3.54c0-2.9-2.36-5.25-5.25-5.25h-2.71c-.51-6.25-5.75-11.18-12.13-11.18s-11.62,4.93-12.13,11.18h-2.58c-2.9,0-5.25,2.36-5.25,5.25v3.54h-8.49c-2.11,0-3.83,1.72-3.83,3.83v40.94H82.56V36.43c0-2.11-1.72-3.83-3.83-3.83ZM50.14,14.62c5.62,0,10.18,4.57,10.18,10.18s-4.57,10.18-10.18,10.18-10.18-4.57-10.18-10.18,4.57-10.18,10.18-10.18Zm-19.97,60.75h-10.32V36.43c0-1.01,.82-1.83,1.83-1.83h8.49v40.77Zm19.03-16.53l.03,16.53h-7.48v-16.53h7.45Zm2.03,16.53l-.03-16.53h7.51v16.53h-7.49Zm17,0h-7.52v-18.53h-20.97v18.53h-7.58V29.06c0-1.79,1.46-3.25,3.25-3.25h2.58c.51,6.25,5.75,11.18,12.13,11.18s11.62-4.93,12.13-11.18h2.71c1.79,0,3.25,1.46,3.25,3.25v46.31Zm12.32,0h-10.32V34.6h8.49c1.01,0,1.83,.82,1.83,1.83v38.94Z"/><path class="cls-1" d="M44.51,26.98h3.25v3.25c0,.76,.62,1.38,1.38,1.38h1.85c.76,0,1.38-.62,1.38-1.38v-3.25h3.25c.76,0,1.38-.62,1.38-1.38v-1.85c0-.76-.62-1.38-1.38-1.38h-3.25v-3.25c0-.76-.62-1.38-1.38-1.38h-1.85c-.76,0-1.38,.62-1.38,1.38v3.25h-3.25c-.76,0-1.38,.62-1.38,1.38v1.85c0,.76,.62,1.38,1.38,1.38Z"/><path class="cls-1" d="M45.84,40.68h-7.32c-1.35,0-2.45,1.1-2.45,2.45v3.58c0,1.35,1.1,2.45,2.45,2.45h7.32c1.35,0,2.45-1.1,2.45-2.45v-3.58c0-1.35-1.1-2.45-2.45-2.45Zm.45,6.03c0,.25-.2,.45-.45,.45h-7.32c-.25,0-.45-.2-.45-.45v-3.58c0-.25,.2-.45,.45-.45h7.32c.25,0,.45,.2,.45,.45v3.58Z"/><path class="cls-1" d="M61.83,40.68h-7.32c-1.35,0-2.45,1.1-2.45,2.45v3.58c0,1.35,1.1,2.45,2.45,2.45h7.32c1.35,0,2.45-1.1,2.45-2.45v-3.58c0-1.35-1.1-2.45-2.45-2.45Zm.45,6.03c0,.25-.2,.45-.45,.45h-7.32c-.25,0-.45-.2-.45-.45v-3.58c0-.25,.2-.45,.45-.45h7.32c.25,0,.45,.2,.45,.45v3.58Z"/><path class="cls-1" d="M53.99,65.19c-.52,0-.95,.42-.95,.95v1.94c0,.52,.42,.95,.95,.95s.95-.42,.95-.95v-1.94c0-.52-.42-.95-.95-.95Z"/><path class="cls-1" d="M46.41,69.02c.52,0,.95-.42,.95-.95v-1.94c0-.52-.42-.95-.95-.95s-.95,.42-.95,.95v1.94c0,.52,.42,.95,.95,.95Z"/></g></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/hotel.svg b/assets/themes/onwheels/hotel.svg
new file mode 100644
index 000000000..3f76a6ad8
--- /dev/null
+++ b/assets/themes/onwheels/hotel.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#7d4e24;}</style></defs><path class="cls-2" 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-1" d="M26.03,51.32V31.67c0-1.48-1.2-2.68-2.68-2.68s-2.68,1.2-2.68,2.68v34.74h5.36v-9.56h50.93v9.56h5.36v-15.09H26.03Z"/><path class="cls-1" d="M82.29,41.95c-.03-2.25-2.65-2.61-2.65-2.61,0,0-36.31-3.62-37.69-3.62s-1.6,1.6-1.6,1.6v7.74h-9.55c-.98,0-1.78,.8-1.78,1.78h0c0,.98,.8,1.78,1.78,1.78h51.52v-1.78h0v-4.88h-.04Z"/><circle class="cls-1" cx="33.67" cy="37.52" r="4.65"/></g></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/license_info.json b/assets/themes/onwheels/license_info.json
index 9f2dcf81a..b383bff79 100644
--- a/assets/themes/onwheels/license_info.json
+++ b/assets/themes/onwheels/license_info.json
@@ -1,4 +1,34 @@
 [
+  {
+    "path": "bicycle_pump.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "cafe.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "cone.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
   {
     "path": "crest.svg",
     "license": "CC0",
@@ -6,5 +36,105 @@
       "Free Wheelies"
     ],
     "sources": []
+  },
+  {
+    "path": "doctor.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "hospital.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "hotel.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "parking.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "pharmacy.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "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",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "restaurant.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "shop.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
+  },
+  {
+    "path": "toilet.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 274ec5e8e..745f41d8a 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -16,20 +16,154 @@
   "widenFactor": 2,
   "hideFromOverview": true,
   "layers": [
-    "bike_repair_station",
+    {
+      "builtin": "bike_repair_station",
+      "override": {
+        "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"
+          }
+        ]
+      }
+    },
     "bike_shop",
-    "cafe_pub",
+    {
+      "builtin": "cafe_pub",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/cafe.svg",
+            "iconSize": "40,40,bottom",
+            "label": null
+          }
+        ]
+      }
+    },
     "entrance",
-    "food",
-    "kerbs",
-    "parking",
+    {
+      "builtin": "food",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/restaurant.svg",
+            "iconSize": "40,40,bottom",
+            "label": null
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "kerbs",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": {
+              "render": "./assets/themes/onwheels/cone.svg"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "parking",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/parking.svg",
+            "iconSize": "40,40,bottom"
+          },
+          {
+            "color": "#225f92"
+          }
+        ]
+      }
+    },
     "picnic_table",
     "school",
-    "shops",
-    "toilet",
+    {
+      "builtin": "shops",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/shop.svg",
+            "iconSize": "40,40,bottom",
+            "label": null
+          },
+          {
+            "color": "#ea4a94"
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "toilet",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/toilet.svg",
+            "iconSize": "40,40,bottom"
+          }
+        ]
+      }
+    },
     "viewpoint",
-    "doctors",
-    "reception_desk",
+    {
+      "builtin": "pharmacy",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/pharmacy.svg",
+            "iconSize": "40,40,bottom",
+            "label": null
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "doctors",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/doctor.svg",
+            "iconSize": "40,40,bottom"
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "hospital",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/hospital.svg",
+            "iconSize": "40,40,bottom"
+          },
+          {
+            "color": "#dd463b"
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "reception_desk",
+      "override": {
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/onwheels/reception.svg",
+            "iconSize": "40,40,bottom"
+          }
+        ]
+      }
+    },
     "walls_and_buildings",
     "elevator"
   ],
@@ -68,11 +202,6 @@
         ]
       }
     ],
-    "minzoom": "15",
-    "mapRendering": [
-      {
-        "label": null
-      }
-    ]
+    "minzoom": 15
   }
 }
\ No newline at end of file
diff --git a/assets/themes/onwheels/parking.svg b/assets/themes/onwheels/parking.svg
new file mode 100644
index 000000000..2b4df1489
--- /dev/null
+++ b/assets/themes/onwheels/parking.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#225f92;}</style></defs><path class="cls-2" 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.25c5.95,2.17,11.34,5.42,16.18,9.76,4.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"/><path class="cls-1" d="M48.39,47.63v9.48h-5.07V30.92h8.76c2.63,0,4.71,.77,6.24,2.31,1.54,1.54,2.3,3.56,2.3,6.05s-.77,4.52-2.3,6.05-3.62,2.29-6.24,2.29h-3.69Zm0-3.98h3.69c1.14,0,2.01-.41,2.6-1.22,.59-.81,.89-1.85,.89-3.11s-.3-2.34-.89-3.17c-.59-.83-1.46-1.25-2.6-1.25h-3.69v8.76Z"/><path class="cls-1" d="M66.11,74.12h-31.81c-3.87,0-7.01-3.15-7.01-7.01V26.56c0-3.87,3.15-7.01,7.01-7.01h31.81c3.87,0,7.01,3.15,7.01,7.01v40.55c0,3.87-3.15,7.01-7.01,7.01ZM34.29,22.55c-2.21,0-4.01,1.8-4.01,4.01v40.55c0,2.21,1.8,4.01,4.01,4.01h31.81c2.21,0,4.01-1.8,4.01-4.01V26.56c0-2.21-1.8-4.01-4.01-4.01h-31.81Z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/pharmacy.svg b/assets/themes/onwheels/pharmacy.svg
new file mode 100644
index 000000000..13b9b15c8
--- /dev/null
+++ b/assets/themes/onwheels/pharmacy.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#72b852;}</style></defs><path class="cls-2" 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.25c5.95,2.17,11.34,5.42,16.18,9.76,4.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-1" d="M47.82,48.72h-2.83v-3.05c0-.75-.61-1.36-1.36-1.36h-3.95c-.75,0-1.36,.61-1.36,1.36v3.05h-3.23c-.75,0-1.36,.61-1.36,1.36v3.7c0,.94,.76,1.71,1.71,1.71h2.89v2.98c0,.75,.61,1.36,1.36,1.36h3.95c.75,0,1.36-.61,1.36-1.36v-2.98h2.83c.94,0,1.71-.76,1.71-1.71v-3.36c0-.94-.76-1.71-1.71-1.71Z"/><path class="cls-1" d="M81.11,59.3l-12.73-2.82c-.42-.09-.83-.14-1.25-.14l-1.44-4.59c-.5-1.6-1.59-2.91-3.08-3.69-1.49-.78-3.18-.93-4.78-.43-.16,.05-.33,.11-.48,.17v-7.78c0-4.27-3.06-7.84-7.14-8.58v-4.84h2.21v-7.21H31.04v7.21h2.4v4.78c-4.24,.59-7.52,4.24-7.52,8.64v24.11c0,4.81,3.91,8.72,8.72,8.72h13.98c4.07,0,7.51-2.81,8.46-6.59l.53,1.68c.5,1.6,1.59,2.91,3.08,3.69,.91,.48,1.9,.72,2.9,.72,.63,0,1.26-.1,1.88-.29,1.42-.45,2.62-1.36,3.41-2.61l9.52,2.11c.45,.1,.91,.15,1.37,.15,1.18,0,2.34-.34,3.36-.99,1.41-.9,2.39-2.3,2.75-3.94,.75-3.38-1.39-6.73-4.77-7.48Zm-26.17,4.83c0,3.48-2.83,6.31-6.31,6.31h-13.98c-3.48,0-6.31-2.83-6.31-6.31v-24.11c0-3.48,2.83-6.31,6.31-6.31h1.2v-5.9h11.94v5.85l1.14,.06c3.36,.16,6,2.93,6,6.31v24.11Zm9.96,6.09c-1.11,.35-2.29,.24-3.32-.3-1.03-.54-1.79-1.45-2.13-2.55l-1.81-5.78,8.27-2.68,1.84,5.87c.35,1.11,.24,2.29-.3,3.32-.54,1.03-1.45,1.79-2.55,2.13Zm7.43-1.98l-2.66-.59c.3-1.13,.27-2.32-.08-3.46l-1.83-5.86c.07,.01,.14,.02,.21,.04l6.15,1.36-1.79,8.51Z"/></g></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/reception.svg b/assets/themes/onwheels/reception.svg
new file mode 100644
index 000000000..0e818387a
--- /dev/null
+++ b/assets/themes/onwheels/reception.svg
@@ -0,0 +1 @@
+<?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
diff --git a/assets/themes/onwheels/repair.svg b/assets/themes/onwheels/repair.svg
new file mode 100644
index 000000000..b0924247c
--- /dev/null
+++ b/assets/themes/onwheels/repair.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#ca9e67;}</style></defs><path class="cls-2" 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.76C38.49,1.08,44.38,0,50.2,0s11.71,1.08,17.66,3.25c5.95,2.17,11.34,5.42,16.18,9.76,4.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-1" d="M74.1,54.25c-2.79-2.79-6.67-3.98-11.64-2.64l-17.74-17.76,.23-.89c1.02-3.83-.08-7.95-2.88-10.75-2.85-2.85-6.9-3.9-10.73-2.84-.55,.15-.97,.58-1.12,1.13-.14,.55,.01,1.13,.41,1.53l4.27,4.27c1.25,1.25,1.24,3.26,0,4.49-1.22,1.23-3.28,1.23-4.5,0l-4.27-4.27c-.4-.4-.98-.56-1.53-.41-.55,.15-.98,.57-1.12,1.12-1.04,3.79-.02,7.86,2.85,10.73,2.79,2.79,6.66,3.98,11.64,2.64l17.74,17.76c-1.32,4.97-.18,8.81,2.65,11.64,2.85,2.85,6.9,3.89,10.73,2.84,.55-.15,.97-.58,1.12-1.13,.14-.55-.01-1.13-.41-1.53l-4.27-4.27c-1.25-1.25-1.24-3.26,0-4.49,1.24-1.23,3.29-1.21,4.5,0l4.27,4.27c.4,.4,.98,.56,1.53,.41,.55-.15,.98-.57,1.12-1.12,1.04-3.79,.02-7.86-2.84-10.73Z"/><path class="cls-1" d="M40.08,47.22l-15.16,15.16c-2.48,2.48-2.48,6.51,0,8.99,2.48,2.48,6.51,2.48,8.99,0l15.16-15.16-8.99-8.99Zm-7.66,19.22c-.62,.62-1.63,.62-2.25,0-.62-.62-.62-1.63,0-2.25l9.64-9.65c.62-.62,1.63-.62,2.25,0,.62,.62,.62,1.63,0,2.25l-9.64,9.65Z"/><path class="cls-1" d="M76.87,22.17l-2.74-2.74c-.52-.52-1.32-.61-1.94-.24l-8.43,5.06c-.89,.53-1.04,1.76-.31,2.49l.67,.67-10.7,10.66,4.5,4.5,10.7-10.66,.95,.95c.73,.73,1.96,.58,2.49-.31l5.06-8.43c.38-.63,.28-1.43-.24-1.94Z"/></g></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/restaurant.svg b/assets/themes/onwheels/restaurant.svg
new file mode 100644
index 000000000..86fe5c5b1
--- /dev/null
+++ b/assets/themes/onwheels/restaurant.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#ab418d;}</style></defs><path class="cls-2" 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.32,0,42.89,1.52,35.48,4.56,29.1c3.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-1" d="M77.83,23.76c-.18-1.17-1.65-1.62-2.48-.78L25.19,73.14c-1.31,1.31-1.31,3.45,0,4.77,1.41,1.41,3.74,1.3,5-.26,1.91-2.36,4.06-5.26,6.03-7.92l17.2-17.2s.04,0,.05-.02l2.7,2.7c.62,.62,1.62,.62,2.24,0l5.37-5.37c.09-.09,.17-.2,.23-.3,7.34-8.41,14.76-19.47,13.82-25.78Z"/><path class="cls-1" d="M47.24,48.69l-1.76-1.76c-1.43-2.03-2.49-4.29-2.96-6.73-.55-2.88-3.9-6.21-6.19-8.16l-10.62-9.02c-.26-.21-.63-.19-.86,.03l-.07,.07c-.25,.25-.25,.65,0,.9l11.16,11.16c.28,.28,.28,.74,0,1.02s-.74,.28-1.02,0l-11.16-11.16c-.25-.25-.65-.25-.89,0-.25,.25-.25,.65,0,.89l11.16,11.16c.28,.28,.28,.74,0,1.02-.29,.29-.74,.28-1.02,0l-11.16-11.16c-.25-.25-.65-.24-.9,0s-.25,.65,0,.89l11.16,11.16c.28,.28,.28,.74,0,1.02-.28,.28-.74,.28-1.02,0l-11.16-11.16c-.25-.25-.65-.25-.89,0l-.08,.08c-.23,.23-.25,.6-.03,.86l8.99,10.61c1.88,2.22,5.06,5.44,7.9,6.15,2.63,.66,5.13,1.71,7.32,3.25l1.5,1.5,2.61-2.61Z"/><path class="cls-1" d="M73.37,71.25c-2.76-2.76-7.99-5.48-14.1-10.53l-4.79-4.79h0l-1.08-1.08-2.61,2.61,5.96,5.96c5.35,6.35,7.64,11.28,10.4,14.04,2.15,2.15,5.97,4.7,8.44,2.23,2.31-2.31-.07-6.29-2.23-8.44Z"/></g></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/shop.svg b/assets/themes/onwheels/shop.svg
new file mode 100644
index 000000000..01ce20a09
--- /dev/null
+++ b/assets/themes/onwheels/shop.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#ea4a94;}</style></defs><path class="cls-2" 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.32,0,42.89,1.52,35.48,4.56,29.1c3.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"/><path class="cls-1" d="M84.18,74.51l-2.85-24.72c-.2-1.7-1.64-2.98-3.35-2.98h-5.86v-4.49c0-3.1-2.52-5.61-5.62-5.62h-2.25c-3.1,0-5.61,2.52-5.62,5.62v4.49h-.94l-1.17-17.08c-.13-1.77-1.6-3.14-3.37-3.14h-5.76v-6.74c0-4.96-4.02-8.99-8.99-8.99s-8.99,4.02-8.99,8.99v6.74h-5.76c-1.77,0-3.24,1.37-3.37,3.14l-3.06,44.94c-.13,1.86,1.27,3.47,3.13,3.59,.08,0,.15,0,.23,0h60.24c1.86,0,3.37-1.51,3.37-3.37,0-.13,0-.26-.02-.39Zm-12.06-25.45h5.86c.57,0,1.05,.43,1.12,.99l.14,1.25h-7.12v-2.25Zm-1.12,7.86c.62,0,1.12,.5,1.12,1.12s-.5,1.12-1.12,1.12-1.12-.5-1.12-1.12,.5-1.12,1.12-1.12Zm-10.11-14.6c0-1.86,1.51-3.37,3.37-3.37h2.25c1.86,0,3.37,1.51,3.37,3.37v4.49h-8.99v-4.49Zm0,6.74h8.99v2.25h-8.99v-2.25Zm-1.12,7.86c.62,0,1.12,.5,1.12,1.12s-.5,1.12-1.12,1.12-1.12-.5-1.12-1.12,.5-1.12,1.12-1.12Zm-1.12-7.86v2.25h-7.12l.14-1.25c.07-.57,.55-.99,1.12-.99h5.86Zm-11.23-20.22h5.76c.59,0,1.08,.45,1.12,1.04l.08,1.2h-6.97v-2.25h0Zm-1.12,7.86c.62,0,1.12,.5,1.12,1.12s-.5,1.12-1.12,1.12-1.12-.5-1.12-1.12,.5-1.12,1.12-1.12Zm-14.6-16.85c0-3.72,3.02-6.74,6.74-6.74s6.74,3.02,6.74,6.74v6.74h-13.48v-6.74Zm0,8.99h13.48v2.25h-13.48v-2.25Zm-1.12,7.86c.62,0,1.12,.5,1.12,1.12s-.5,1.12-1.12,1.12-1.12-.5-1.12-1.12,.5-1.12,1.12-1.12Zm-8.01-6.82c.04-.59,.53-1.04,1.12-1.04h5.76v2.25h-6.97l.08-1.21Zm-1.95,46.14c-.31,0-.61-.13-.82-.35-.21-.23-.32-.54-.3-.85l2.82-41.49h7.12v1.33c-1.75,.62-2.67,2.55-2.05,4.3,.62,1.75,2.55,2.67,4.3,2.05s2.67-2.55,2.05-4.3c-.34-.96-1.09-1.71-2.05-2.05v-1.33h13.48v1.33c-1.75,.62-2.67,2.55-2.05,4.3,.62,1.75,2.55,2.67,4.3,2.05s2.67-2.55,2.05-4.3c-.34-.96-1.09-1.71-2.05-2.05v-1.33h7.12l.92,13.48h-2.67c-1.71,0-3.15,1.28-3.35,2.98l-2.85,24.72c-.05,.51,0,1.03,.18,1.51H20.59Zm61.07-.38c-.21,.24-.52,.38-.84,.38h-30.91c-.62,0-1.12-.5-1.12-1.12,0-.04,0-.09,0-.13l2.45-21.22h7.38v1.33c-1.75,.62-2.67,2.55-2.05,4.3,.62,1.75,2.55,2.67,4.3,2.05s2.67-2.55,2.05-4.3c-.34-.96-1.09-1.71-2.05-2.05v-1.33h8.99v1.33c-1.75,.62-2.67,2.55-2.05,4.3,.62,1.75,2.55,2.67,4.3,2.05s2.67-2.55,2.05-4.3c-.34-.96-1.09-1.71-2.05-2.05v-1.33h7.38l2.45,21.22c.04,.32-.07,.64-.28,.88Z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/onwheels/toilet.svg b/assets/themes/onwheels/toilet.svg
new file mode 100644
index 000000000..81d9abdf4
--- /dev/null
+++ b/assets/themes/onwheels/toilet.svg
@@ -0,0 +1 @@
+<?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:#fff;}.cls-2{fill:#09967d;}</style></defs><path class="cls-2" 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-1" d="M35.48,37.9c-.65-1.29-1.6-2-2.68-2s-2.03,.71-2.68,2c-.52,1.03-.8,2.38-.8,3.8s.29,2.77,.8,3.8c.65,1.29,1.6,2,2.68,2s2.03-.71,2.68-2c.52-1.03,.8-2.38,.8-3.8s-.29-2.77-.8-3.8Zm-2.08,6.56c-.3,.59-.56,.72-.6,.72s-.31-.12-.6-.72c-.35-.71-.56-1.71-.56-2.76s.2-2.05,.56-2.76c.3-.59,.56-.72,.6-.72s.31,.12,.6,.72c.35,.71,.56,1.71,.56,2.76s-.2,2.05-.56,2.76Z"/><path class="cls-1" d="M57.66,40.54h-7.29c-.64,0-1.16,.52-1.16,1.16s.52,1.16,1.16,1.16h7.29c.64,0,1.16-.52,1.16-1.16s-.52-1.16-1.16-1.16Z"/><path class="cls-1" d="M68.6,40.54h-7.29c-.64,0-1.16,.52-1.16,1.16s.52,1.16,1.16,1.16h7.29c.64,0,1.16-.52,1.16-1.16s-.52-1.16-1.16-1.16Z"/><path class="cls-1" d="M75.2,28.05c-1.96-3.92-4.66-6.08-7.6-6.08l-35.97,.12c-2.49,.49-4.74,2.57-6.44,5.96-1.83,3.66-2.84,8.51-2.84,13.64s1.01,9.98,2.84,13.65c1.7,3.4,3.95,5.47,6.44,5.96l9.28,.12v11.28l4.73,1.58,2.23-1.11,2.32,1.16,2.32-1.16,2.32,1.16,2.32-1.16,2.32,1.16,2.32-1.16,2.32,1.16,2.32-1.16,2.32,1.16,2.32-1.16,2.23,1.11,4.73-1.58v-31c0-5.14-1.01-9.98-2.84-13.64Zm-34.28,31.05h-3.12c.96-.97,1.84-2.23,2.6-3.76,.18-.36,.36-.74,.52-1.13v4.88Zm-2.6-4.8c-1.52,3.05-3.54,4.8-5.53,4.8s-4-1.75-5.53-4.8c-1.67-3.35-2.6-7.83-2.6-12.61s.92-9.26,2.6-12.61c1.52-3.05,3.54-4.8,5.53-4.8s4,1.75,5.53,4.8c1.67,3.35,2.6,7.83,2.6,12.61s-.92,9.26-2.6,12.61Zm37.4,16.72l-2.23,.74-2.41-1.2-2.32,1.16-2.32-1.16-2.32,1.16-2.32-1.16-2.32,1.16-2.32-1.16-2.32,1.16-2.32-1.16-2.32,1.16-2.32-1.16-2.41,1.2-2.23-.74v-28.17h3.48c.64,0,1.16-.52,1.16-1.16s-.52-1.16-1.16-1.16h-3.5c-.14-4.7-1.13-9.1-2.82-12.48-.76-1.53-1.64-2.79-2.6-3.76h29.81c1.99,0,4,1.75,5.53,4.8,1.54,3.08,2.44,7.1,2.58,11.45h-3.46c-.64,0-1.16,.52-1.16,1.16s.52,1.16,1.16,1.16h3.48v28.17Z"/></g></svg>
\ No newline at end of file