diff --git a/data/styles/default/dark/symbols/bus-m.svg b/data/styles/default/dark/symbols/bus-m.svg
deleted file mode 100644
index 989d2b1bb..000000000
--- a/data/styles/default/dark/symbols/bus-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-s.svg b/data/styles/default/dark/symbols/bus-s.svg
deleted file mode 100644
index 65525513a..000000000
--- a/data/styles/default/dark/symbols/bus-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-xm.svg b/data/styles/default/dark/symbols/bus-xm.svg
new file mode 100644
index 000000000..8f02b371e
--- /dev/null
+++ b/data/styles/default/dark/symbols/bus-xm.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-xs.svg b/data/styles/default/dark/symbols/bus-xs.svg
new file mode 100644
index 000000000..2ccdf374c
--- /dev/null
+++ b/data/styles/default/dark/symbols/bus-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-xvs.svg b/data/styles/default/dark/symbols/bus-xvs.svg
new file mode 100644
index 000000000..855417f4d
--- /dev/null
+++ b/data/styles/default/dark/symbols/bus-xvs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 836d56f7b..1531269ca 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -326,12 +326,14 @@ node|z19-[amenity=bus_station],
node|z19-[amenity=bus_station]::int_name,
{text-offset: 1;font-size: 10;}
+node|z15[highway=bus_stop],
+{icon-image: bus-xvs.svg;icon-min-distance: 1;}
node|z16[highway=bus_stop],
-{icon-image: bus-m.svg;}
+{icon-image: bus-xs.svg;icon-min-distance: 1;}
node|z17-[highway=bus_stop],
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;}
+{icon-image: bus-xm.svg;text-offset: 1;font-size: 11;}
node|z18-19[highway=bus_stop]::int_name,
-{icon-image: bus-m.svg;text-offset: 1;font-size: 9;}
+{icon-image: bus-xm.svg;text-offset: 1;font-size: 9;}
/* 3.5 Ferry terminal & seamarks */
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 4a821a236..6b5dabd41 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -550,7 +550,7 @@ railway-subway_entrance-yokohama # icon z16- (also has captio
railway-tram_stop # icon z14- (also has caption(optional) z17-)
=== 3650
-highway-bus_stop # icon z16- (also has caption(optional) z17-)
+highway-bus_stop # icon z15- (also has caption(optional) z17-)
=== 3600
amenity-drinking_water # icon z17- (also has caption(optional) z18-)
@@ -1808,7 +1808,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-tram_stop # caption(optional) z17- (also has icon z14-)
# === -6350
-# highway-bus_stop # caption(optional) z17- (also has icon z16-)
+# highway-bus_stop # caption(optional) z17- (also has icon z15-)
# === -6400
# amenity-drinking_water # caption(optional) z18- (also has icon z17-)
diff --git a/data/styles/default/light/symbols/bus-m.svg b/data/styles/default/light/symbols/bus-m.svg
deleted file mode 100644
index 83a49048f..000000000
--- a/data/styles/default/light/symbols/bus-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-s.svg b/data/styles/default/light/symbols/bus-s.svg
deleted file mode 100644
index 64fbec9aa..000000000
--- a/data/styles/default/light/symbols/bus-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-xm.svg b/data/styles/default/light/symbols/bus-xm.svg
new file mode 100644
index 000000000..6c63f72a0
--- /dev/null
+++ b/data/styles/default/light/symbols/bus-xm.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-xs.svg b/data/styles/default/light/symbols/bus-xs.svg
new file mode 100644
index 000000000..17834be2d
--- /dev/null
+++ b/data/styles/default/light/symbols/bus-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-xvs.svg b/data/styles/default/light/symbols/bus-xvs.svg
new file mode 100644
index 000000000..ec1b79e57
--- /dev/null
+++ b/data/styles/default/light/symbols/bus-xvs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 5bd6fcd0b..40dbcdfcb 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -550,7 +550,7 @@ railway-subway_entrance-yokohama # icon z16- (also has captio
railway-tram_stop # icon z14- (also has caption(optional) z17-)
=== 3650
-highway-bus_stop # icon z16- (also has caption(optional) z17-)
+highway-bus_stop # icon z15- (also has caption(optional) z17-)
=== 3600
amenity-drinking_water # icon z12- (also has caption(optional) z14-)
@@ -1811,7 +1811,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-tram_stop # caption(optional) z17- (also has icon z14-)
# === -6350
-# highway-bus_stop # caption(optional) z17- (also has icon z16-)
+# highway-bus_stop # caption(optional) z17- (also has icon z15-)
# === -6400
# amenity-drinking_water # caption(optional) z14- (also has icon z12-)