diff --git a/assets/themes/stations/bench.svg b/assets/themes/stations/bench.svg
new file mode 100644
index 0000000000..d1d8c8b141
--- /dev/null
+++ b/assets/themes/stations/bench.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m1,5 a.75,.75 0 0 0 0,1.5 h12 a.75,.75 0 0 0 0,-1.5 z m1,2 v3 h1.5 v-3 z m8.5,0 v3 h1.5 v-3 z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/themes/stations/bicycle_parking.svg b/assets/themes/stations/bicycle_parking.svg
new file mode 100644
index 0000000000..ebec627bd5
--- /dev/null
+++ b/assets/themes/stations/bicycle_parking.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 0,0 0,10 2.000077,0 0,-3.5 2.500097,0 c 1.976154,3e-7 3.500135,-1 3.500135,-3.25 C 8.000309,1 6.4871,2e-7 4.968942,0 z m 2.000077,2 2.500097,0 c 0.963608,0 1.500058,0.5254308 1.500058,1.25 0,0.7245692 -0.631804,1.25 -1.500058,1.25 l -2.500097,0 z M 9,7 9,7.5938559 9.500367,8 l 0,0.75 -3.000116,0 0,-0.25 0.50002,0 c 0.479412,0 0.455442,-0.5 0,-0.5 L 5.500213,8 c -0.50002,0 -0.50002,0.452061 0,0.5 l 0.500019,0 0,0.25 -0.562522,1.28125 C 5.296384,10.001436 5.147956,10 5.000193,10 c -1.02182,0 -2.000077,0.793929 -2.000077,2 0,1.206071 0.978257,2 2.000077,2 1.02182,0 1.937575,-0.856429 1.937575,-2.0625 0,-0.150759 -0.0039,-0.302075 -0.03125,-0.4375 l 0.843783,0 1.821945,-2 0.365639,0.78125 C 9.383285,10.615837 9.000348,11.229684 9.000348,12 c 0,1.206071 0.978257,2 2.000077,2 C 12.022246,14 12.938,13.143571 12.938,11.9375 12.938,10.731429 12.022246,10 11.000425,10 c -0.15008,0 -0.292278,0.02946 -0.437517,0.0625 L 10.000386,8.75 10,7.8 z m -2.593502,2.5 2.193834,0 -1.193796,1.25 -0.843782,0 C 6.422636,10.56342 6.258266,10.401358 6.062734,10.28125 z M 5.000193,11 c 0.635098,0 1.000039,0.549217 1.000039,1 0,0.450783 -0.364941,1 -1.000039,1 -0.635098,0 -1.000038,-0.549217 -1.000038,-1 0,-0.450783 0.36494,-1 1.000038,-1 z m 6.000232,0 c 0.635099,0 1.000039,0.549217 1.000039,1 0,0.450783 -0.36494,1 -1.000039,1 -0.635098,0 -1.000039,-0.549217 -1.000039,-1 0,-0.450783 0.364941,-1 1.000039,-1 z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json
index df149640c3..13b0032bbc 100644
--- a/assets/themes/stations/license_info.json
+++ b/assets/themes/stations/license_info.json
@@ -1,4 +1,24 @@
 [
+  {
+    "path": "bench.svg",
+    "license": "CC0",
+    "authors": [
+      "Matthijs Melissen"
+    ],
+    "sources": [
+      "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/bench.svg"
+    ]
+  },
+  {
+    "path": "bicycle_parking.svg",
+    "license": "CC0",
+    "authors": [
+      "Matthijs Melissen"
+    ],
+    "sources": [
+      "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/bicycle_parking.svg"
+    ]
+  },
   {
     "path": "departures_board.svg",
     "license": "CC0",
@@ -26,5 +46,16 @@
     "sources": [
       "https://labs.mapbox.com/maki-icons/"
     ]
+  },
+  {
+    "path": "rental_bicycle.svg",
+    "license": "CC0",
+    "authors": [
+      "Michael Glanznig",
+      "Andy Allan"
+    ],
+    "sources": [
+      "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/rental_bicycle.svg"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/stations/rental_bicycle.svg b/assets/themes/stations/rental_bicycle.svg
new file mode 100644
index 0000000000..cf4397e1a2
--- /dev/null
+++ b/assets/themes/stations/rental_bicycle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 3.5,0 C 2.119288,0 1,1.1192881 1,2.5 1,3.8807119 2.119288,5 3.5,5 4.425342,5 5.223985,4.4972377 5.65625,3.75 L 7,3.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 13,2.5 11.5,1.25 5.65625,1.25 C 5.223985,0.5027623 4.425342,0 3.5,0 z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 z m 5.5,3.4375 0.03125,1 L 9,7 9,8 5.25,8 5,8 5,7 5.5,7 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 4,7 4,8 3.4375,9.375 c -0.04165,-0.0023 -0.08284,0 -0.125,0 C 2.042004,9.375 1,10.417004 1,11.6875 1,12.957996 2.042004,14 3.3125,14 4.582996,14 5.625,12.957996 5.625,11.6875 5.625,11.447485 5.56957,11.218899 5.5,11 L 6,11 7,11 9.156,9 9.15625,9 9.4375,9.71875 C 8.797861,10.135655 8.375,10.877559 8.375,11.6875 8.375,12.957996 9.417004,14 10.6875,14 c 1.270496,0 2.34375,-1.042004 2.34375,-2.3125 0,-1.270496 -1.073254,-2.3125 -2.34375,-2.3125 -0.04216,0 -0.08335,-0.0023 -0.125,0 L 10,8 10,6.625 z M 4.84375,9 7.956,9 6.65,10.25 l -1.55625,0 C 4.939889,10.062277 4.766292,9.851578 4.5625,9.71875 z M 3.3125,10.5 C 3.975001,10.5 4.5,11.024999 4.5,11.6875 4.5,12.350001 3.975001,12.875 3.3125,12.875 2.649999,12.875 2.125,12.350001 2.125,11.6875 2.125,11.024999 2.649999,10.5 3.3125,10.5 z m 7.375,0 c 0.662501,0 1.1875,0.524999 1.1875,1.1875 0,0.662501 -0.524999,1.1875 -1.1875,1.1875 -0.662501,0 -1.15625,-0.524999 -1.15625,-1.1875 0,-0.662501 0.493749,-1.1875 1.15625,-1.1875 z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json
index abc4dd96a5..515d7711fc 100644
--- a/assets/themes/stations/stations.json
+++ b/assets/themes/stations/stations.json
@@ -86,9 +86,7 @@
     },
     {
       "builtin": [
-        "shops",
-        "bike_parking",
-        "bicycle_rental"
+        "shops"
       ],
       "override": {
         "isShown": {
@@ -101,6 +99,42 @@
         "minzoom": 19
       }
     },
+    {
+      "builtin": "bike_parking",
+      "override": {
+        "isShown": {
+          "or": [
+            "indoor=room",
+            "indoor=area"
+          ]
+        },
+        "presets": null,
+        "minzoom": 19,
+        "mapRendering": [
+          {
+            "icon": "circle:white;./assets/themes/stations/bicycle_parking.svg"
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "bicycle_rental",
+      "override": {
+        "isShown": {
+          "or": [
+            "indoor=room",
+            "indoor=area"
+          ]
+        },
+        "presets": null,
+        "minzoom": 19,
+        "mapRendering": [
+          {
+            "icon": "circle:white;./assets/themes/stations/rental_bicycle.svg"
+          }
+        ]
+      }
+    },
     {
       "builtin": [
         "food",
@@ -157,7 +191,6 @@
       "builtin": [
         "entrance",
         "elevator",
-        "bench",
         "waste_basket",
         "atm"
       ],
@@ -165,6 +198,17 @@
         "minzoom": 19
       }
     },
+    {
+      "builtin": "bench",
+      "override": {
+        "minzoom": 19,
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/stations/bench.svg"
+          }
+        ]
+      }
+    },
     {
       "id": "departures_board",
       "name": {