diff --git a/data/styles/default/dark/symbols/bus-sm.svg b/data/styles/default/dark/symbols/bus-sm.svg
new file mode 100644
index 000000000..682daed8d
--- /dev/null
+++ b/data/styles/default/dark/symbols/bus-sm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.5" rx="1.5" width="13.5" x=".75" y=".75"/><path d="m4.30833333 11.4713297c.21052121.0559605.43455474.0861305.66692134.0861305h.66552345l.00088855.3790098c0 .311229-.29836282.56353-.666412.56353-.3680492 0-.666412-.252301-.666412-.56353zm6.38295947.0002346.0003739.4649057c0 .311229-.298278.56353-.6662225.56353-.36794462 0-.66622253-.252301-.66622253-.56353l-.00088834-.3790098h.66711087c.2319755 0 .4556437-.0300857.6658486-.0858959zm-.561486-8.55489763c.829944 0 1.5027466.67280261 1.5027466 1.50274669v5.25961347c0 .82994407-.6728026 1.50274667-1.5027466 1.50274667h-5.25961352c-.82994407 0-1.50274669-.6728026-1.50274669-1.50274667v-5.25961347c0-.82994408.67280262-1.50274669 1.50274669-1.50274669zm-5.24127678 6.38667341c-.31122904 0-.56353002.252301-.56353002.56353 0 .31122912.25230098.56353012.56353002.56353012.31122902 0 .56353001-.252301.56353001-.56353012 0-.311229-.25230099-.56353-.56353001-.56353zm5.21666668 0c-.31122903 0-.56353003.252301-.56353003.56353 0 .31122912.252301.56353012.56353003.56353012.311229 0 .56353-.252301.56353-.56353012 0-.311229-.252301-.56353-.56353-.56353zm.56147-3.84500675h-6.3416667v2.42105266c0 .3565628.31547343.64561401.70462963.64561401h4.93240737c.3891563 0 .7046297-.28905121.7046297-.64561401zm-.7046297-1.58333333h-4.93240737c-.3891562 0-.70462963.3364013-.70462963.75137335v.37568667h6.3416667v-.37568667c0-.41497205-.3154734-.75137335-.7046297-.75137335z" fill="#000" fill-rule="evenodd"/></g></svg>
\ 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 @@
+<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m5 0c.55228475 0 1 .44771525 1 1v4c0 .55228475-.44771525 1-1 1h-4c-.55228475 0-1-.44771525-1-1v-4c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h4c.27614237 0 .5.22385763.5.5v4c0 .27614237-.22385763.5-.5.5h-4c-.27614237 0-.5-.22385763-.5-.5v-4c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-xxs.svg b/data/styles/default/dark/symbols/bus-xxs.svg
new file mode 100644
index 000000000..855417f4d
--- /dev/null
+++ b/data/styles/default/dark/symbols/bus-xxs.svg
@@ -0,0 +1 @@
+<svg height="5" viewBox="0 0 5 5" width="5" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m4 0c.55228475 0 1 .44771525 1 1v3c0 .55228475-.44771525 1-1 1h-3c-.55228475 0-1-.44771525-1-1v-3c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h3c.27614237 0 .5.22385763.5.5v3c0 .27614237-.22385763.5-.5.5h-3c-.27614237 0-.5-.22385763-.5-.5v-3c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-xxxs.svg b/data/styles/default/dark/symbols/bus-xxxs.svg
new file mode 100644
index 000000000..40f8a0299
--- /dev/null
+++ b/data/styles/default/dark/symbols/bus-xxxs.svg
@@ -0,0 +1 @@
+<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3 0c.55228475 0 1 .44771525 1 1v2c0 .55228475-.44771525 1-1 1h-2c-.55228475 0-1-.44771525-1-1v-2c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h2c.27614237 0 .5.22385763.5.5v2c0 .27614237-.22385763.5-.5.5h-2c-.27614237 0-.5-.22385763-.5-.5v-2c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index df40ec287..07af4f470 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-xxs.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-sm.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-sm.svg;text-offset: 1;font-size: 9;}
 
 /* 3.5 Ferry terminal */
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 9db2e8db0..5ee08a5af 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-)
@@ -1783,7 +1783,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-sm.svg b/data/styles/default/light/symbols/bus-sm.svg
new file mode 100644
index 000000000..87cf0c1df
--- /dev/null
+++ b/data/styles/default/light/symbols/bus-sm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.5" rx="1.5" width="13.5" x=".75" y=".75"/><path d="m4.30833333 11.4713297c.21052121.0559605.43455474.0861305.66692134.0861305h.66552345l.00088855.3790098c0 .311229-.29836282.56353-.666412.56353-.3680492 0-.666412-.252301-.666412-.56353zm6.38295947.0002346.0003739.4649057c0 .311229-.298278.56353-.6662225.56353-.36794462 0-.66622253-.252301-.66622253-.56353l-.00088834-.3790098h.66711087c.2319755 0 .4556437-.0300857.6658486-.0858959zm-.561486-8.55489763c.829944 0 1.5027466.67280261 1.5027466 1.50274669v5.25961347c0 .82994407-.6728026 1.50274667-1.5027466 1.50274667h-5.25961352c-.82994407 0-1.50274669-.6728026-1.50274669-1.50274667v-5.25961347c0-.82994408.67280262-1.50274669 1.50274669-1.50274669zm-5.24127678 6.38667341c-.31122904 0-.56353002.252301-.56353002.56353 0 .31122912.25230098.56353012.56353002.56353012.31122902 0 .56353001-.252301.56353001-.56353012 0-.311229-.25230099-.56353-.56353001-.56353zm5.21666668 0c-.31122903 0-.56353003.252301-.56353003.56353 0 .31122912.252301.56353012.56353003.56353012.311229 0 .56353-.252301.56353-.56353012 0-.311229-.252301-.56353-.56353-.56353zm.56147-3.84500675h-6.3416667v2.42105266c0 .3565628.31547343.64561401.70462963.64561401h4.93240737c.3891563 0 .7046297-.28905121.7046297-.64561401zm-.7046297-1.58333333h-4.93240737c-.3891562 0-.70462963.3364013-.70462963.75137335v.37568667h6.3416667v-.37568667c0-.41497205-.3154734-.75137335-.7046297-.75137335z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ 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 @@
+<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m5 0c.55228475 0 1 .44771525 1 1v4c0 .55228475-.44771525 1-1 1h-4c-.55228475 0-1-.44771525-1-1v-4c0-.55228475.44771525-1 1-1z" fill="#fff" fill-opacity=".6"/><path d="m1 .5h4c.27614237 0 .5.22385763.5.5v4c0 .27614237-.22385763.5-.5.5h-4c-.27614237 0-.5-.22385763-.5-.5v-4c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-xxs.svg b/data/styles/default/light/symbols/bus-xxs.svg
new file mode 100644
index 000000000..ec1b79e57
--- /dev/null
+++ b/data/styles/default/light/symbols/bus-xxs.svg
@@ -0,0 +1 @@
+<svg height="5" viewBox="0 0 5 5" width="5" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m4 0c.55228475 0 1 .44771525 1 1v3c0 .55228475-.44771525 1-1 1h-3c-.55228475 0-1-.44771525-1-1v-3c0-.55228475.44771525-1 1-1z" fill="#fff" fill-opacity=".6"/><path d="m1 .5h3c.27614237 0 .5.22385763.5.5v3c0 .27614237-.22385763.5-.5.5h-3c-.27614237 0-.5-.22385763-.5-.5v-3c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-xxxs.svg b/data/styles/default/light/symbols/bus-xxxs.svg
new file mode 100644
index 000000000..17835694f
--- /dev/null
+++ b/data/styles/default/light/symbols/bus-xxxs.svg
@@ -0,0 +1 @@
+<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3 0c.55228475 0 1 .44771525 1 1v2c0 .55228475-.44771525 1-1 1h-2c-.55228475 0-1-.44771525-1-1v-2c0-.55228475.44771525-1 1-1z" fill="#fff" fill-opacity=".6"/><path d="m1 .5h2c.27614237 0 .5.22385763.5.5v2c0 .27614237-.22385763.5-.5.5h-2c-.27614237 0-.5-.22385763-.5-.5v-2c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
\ 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 8764baf41..b2d1fd17d 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-)
@@ -1786,7 +1786,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-)