diff --git a/data/styles/default/dark/symbols/buses-m.svg b/data/styles/default/dark/symbols/buses-m.svg
new file mode 100644
index 000000000..6e6e14a95
--- /dev/null
+++ b/data/styles/default/dark/symbols/buses-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m14.6401992 13.7660502.0003795.5578086c0 .3734224-.3027187.6761412-.6761412.6761412s-.6761412-.3027188-.6761412-.6761412l-.0009015-.4547481h.6770427c.2354293 0 .4624274-.0360977.6757617-.1030605zm-.6757617-10.26443757c.9957932 0 1.8030432.80724992 1.8030432 1.80304315v6.31065102c0 .9957932-.80725 1.8030431-1.8030432 1.8030431l-1.3859655.0015867c.3433337-.3964396.551067-.9135307.551067-1.4791406v-1.4527451l.834899.0003539c.4978966 0 .9015215-.4036249.9015215-.90152154v-3.3807059l-1.7364205-.00101205v-.45059212l1.7364205.00084338v-.45076079c0-.49789662-.4036249-.90152157-.9015215-.90152157l-.9167424.00057499c-.0942547-.34021382-.2660622-.648193-.4951939-.9037092zm.2253808 7.66293337c-.3734224 0-.6761411.3027187-.6761411.6761412s.3027187.6761412.6761411.6761412c.3734225 0 .6761412-.3027187.6761412-.6761412s-.3027187-.6761412-.6761412-.6761412zm-10.60343311 2.6012227c.21359468.0671431.44089896.103342.67665796.103342h.67523966l.00090152.4547481c0 .3734224-.30271872.6761412-.67614118.6761412-.37342247 0-.67614118-.3027188-.67614118-.6761412zm7.66307061.0002815.0003796.5578086c0 .3734224-.3027188.6761412-.6761412.6761412-.3734225 0-.6761412-.3027188-.6761412-.6761412l-.0009015-.4547481h.6770427c.1569528 0 .3101585-.0160434.4580666-.0465799zm-.6757616-10.26443757c.9957932 0 1.8030431.80724992 1.8030431 1.80304315v6.31065102c0 .9957932-.8072499 1.8030431-1.8030431 1.8030431h-6.31065105c-.99579324 0-1.80304315-.8072499-1.80304315-1.8030431v-6.31065102c0-.99579323.80724991-1.80304315 1.80304315-1.80304315zm-6.53603099 7.66293337c-.37342247 0-.67614119.3027187-.67614119.6761412s.30271872.6761412.67614119.6761412c.37342246 0 .67614118-.3027187.67614118-.6761412s-.30271872-.6761412-.67614118-.6761412zm6.76141179 0c-.3734224 0-.6761412.3027187-.6761412.6761412s.3027188.6761412.6761412.6761412c.3734225 0 .6761412-.3027187.6761412-.6761412s-.3027187-.6761412-.6761412-.6761412zm.6761412-4.95836864h-8.11369418v3.3807059c0 .49789664.40362497.90152154.90152158.90152154h6.310651c.4978967 0 .9015216-.4036249.9015216-.90152154zm-.9015216-1.80304315h-6.310651c-.49789661 0-.90152158.40362495-.90152158.90152157v.45076079h8.11369418v-.45076079c0-.49789662-.4036249-.90152157-.9015216-.90152157z" fill="#000" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/buses-s.svg b/data/styles/default/dark/symbols/buses-s.svg
new file mode 100644
index 000000000..a0d66c7f5
--- /dev/null
+++ b/data/styles/default/dark/symbols/buses-s.svg
@@ -0,0 +1 @@
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m9.75243074 9.06118634.00025184.37014574c0 .24779244-.20087545.44866792-.44866789.44866792-.24779243 0-.44866789-.20087548-.44866789-.44866792l-.00059822-.30175775h.44926611c.1562241 0 .30685358-.02395345.44841605-.06838799zm-.44841605-6.81118634c.66077981 0 1.19644771.53566789 1.19644771 1.19644771v4.18756699c0 .66077982-.5356679 1.1964477-1.19644771 1.1964477l-.91968692.00105286c.22782639-.26306594.36567223-.60619279.36567223-.98151526v-.964l.554015.00023487c.33038991 0 .59822384-.26783393.59822384-.59822385v-2.24333945l-1.15223884-.00067157v-.299l1.15223884.00055964v-.29911193c0-.33038991-.26783393-.59822385-.59822384-.59822385l-.60832391.00038155c-.06254476-.22575613-.17655125-.43012228-.32859651-.5996755zm.14955626 5.08490277c-.24779243 0-.44866788.20087546-.44866788.44866789 0 .24779244.20087545.44866789.44866788.44866789.24779244 0 .44866789-.20087545.44866789-.44866789 0-.24779243-.20087545-.44866789-.44866789-.44866789zm-7.03613405 1.72609675c.1417353.04455422.2925679.06857481.44901081.06857481h.44806967l.00059822.30175775c0 .24779244-.20087546.44866792-.44866789.44866792-.24779244 0-.44866789-.20087548-.44866789-.44866792zm5.08499384.00018682.00025184.37014574c0 .24779244-.20087545.44866792-.44866789.44866792-.24779243 0-.44866789-.20087548-.44866789-.44866792l-.00059822-.30175775h.44926611c.1041494 0 .2058123-.01064598.30395985-.03090909zm-.44841605-6.81118634c.66077983 0 1.19644771.53566789 1.19644771 1.19644771v4.18756699c0 .66077982-.53566788 1.1964477-1.19644771 1.1964477h-4.18756698c-.66077983 0-1.19644771-.53566788-1.19644771-1.1964477v-4.18756699c0-.66077982.53566788-1.19644771 1.19644771-1.19644771zm-4.33712265 5.08490277c-.24779243 0-.44866789.20087546-.44866789.44866789 0 .24779244.20087546.44866789.44866789.44866789.24779244 0 .4486679-.20087545.4486679-.44866789 0-.24779243-.20087546-.44866789-.4486679-.44866789zm4.48667891 0c-.24779243 0-.44866788.20087546-.44866788.44866789 0 .24779244.20087545.44866789.44866788.44866789.24779244 0 .44866789-.20087545.44866789-.44866789 0-.24779243-.20087545-.44866789-.44866789-.44866789zm.44866789-3.2902312h-5.38401469v2.24333945c0 .33038992.26783395.59822385.59822386.59822385h4.18756699c.33038991 0 .59822384-.26783393.59822384-.59822385zm-.59822384-1.19644771h-4.18756699c-.33038991 0-.59822386.26783394-.59822386.59822385v.29911193h5.38401469v-.29911193c0-.33038991-.26783393-.59822385-.59822384-.59822385z" fill="#000" 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 63fbf06bb..6bd328fe8 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -293,23 +293,23 @@ node|z18-[railway=tram_stop],
 /* 3.4 Bus Station */
 
 node|z13[amenity=bus_station],
-{icon-image: bus-s.svg;icon-min-distance: 1;}
+{icon-image: buses-s.svg;icon-min-distance: 1;}
 node|z14[amenity=bus_station],
-{icon-image: bus-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.8;}
+{icon-image: buses-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.8;}
 node|z15-16[amenity=bus_station],
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
+{icon-image: buses-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
 node|z15-16[amenity=bus_station]::int_name,
 {text-offset: 1;font-size: 9;text-halo-opacity: 0.8;}
 node|z17[amenity=bus_station],
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;}
+{icon-image: buses-m.svg;text-offset: 1;font-size: 11;}
 node|z17[amenity=bus_station]::int_name,
 {text-offset: 1;font-size: 9;}
 node|z18[amenity=bus_station],
-{icon-image: bus-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: buses-m.svg;text-offset: 1;font-size: 12;}
 node|z18[amenity=bus_station]::int_name,
 {text-offset: 1;font-size: 10;}
 node|z19-[amenity=bus_station],
-{icon-image: bus-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: buses-m.svg;text-offset: 1;font-size: 12;}
 node|z19-[amenity=bus_station]::int_name,
 {text-offset: 1;font-size: 10;}
 
diff --git a/data/styles/default/light/symbols/buses-m.svg b/data/styles/default/light/symbols/buses-m.svg
new file mode 100644
index 000000000..34ebde38d
--- /dev/null
+++ b/data/styles/default/light/symbols/buses-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m14.6401992 13.7660502.0003795.5578086c0 .3734224-.3027187.6761412-.6761412.6761412s-.6761412-.3027188-.6761412-.6761412l-.0009015-.4547481h.6770427c.2354293 0 .4624274-.0360977.6757617-.1030605zm-.6757617-10.26443757c.9957932 0 1.8030432.80724992 1.8030432 1.80304315v6.31065102c0 .9957932-.80725 1.8030431-1.8030432 1.8030431l-1.3859655.0015867c.3433337-.3964396.551067-.9135307.551067-1.4791406v-1.4527451l.834899.0003539c.4978966 0 .9015215-.4036249.9015215-.90152154v-3.3807059l-1.7364205-.00101205v-.45059212l1.7364205.00084338v-.45076079c0-.49789662-.4036249-.90152157-.9015215-.90152157l-.9167424.00057499c-.0942547-.34021382-.2660622-.648193-.4951939-.9037092zm.2253808 7.66293337c-.3734224 0-.6761411.3027187-.6761411.6761412s.3027187.6761412.6761411.6761412c.3734225 0 .6761412-.3027187.6761412-.6761412s-.3027187-.6761412-.6761412-.6761412zm-10.60343311 2.6012227c.21359468.0671431.44089896.103342.67665796.103342h.67523966l.00090152.4547481c0 .3734224-.30271872.6761412-.67614118.6761412-.37342247 0-.67614118-.3027188-.67614118-.6761412zm7.66307061.0002815.0003796.5578086c0 .3734224-.3027188.6761412-.6761412.6761412-.3734225 0-.6761412-.3027188-.6761412-.6761412l-.0009015-.4547481h.6770427c.1569528 0 .3101585-.0160434.4580666-.0465799zm-.6757616-10.26443757c.9957932 0 1.8030431.80724992 1.8030431 1.80304315v6.31065102c0 .9957932-.8072499 1.8030431-1.8030431 1.8030431h-6.31065105c-.99579324 0-1.80304315-.8072499-1.80304315-1.8030431v-6.31065102c0-.99579323.80724991-1.80304315 1.80304315-1.80304315zm-6.53603099 7.66293337c-.37342247 0-.67614119.3027187-.67614119.6761412s.30271872.6761412.67614119.6761412c.37342246 0 .67614118-.3027187.67614118-.6761412s-.30271872-.6761412-.67614118-.6761412zm6.76141179 0c-.3734224 0-.6761412.3027187-.6761412.6761412s.3027188.6761412.6761412.6761412c.3734225 0 .6761412-.3027187.6761412-.6761412s-.3027187-.6761412-.6761412-.6761412zm.6761412-4.95836864h-8.11369418v3.3807059c0 .49789664.40362497.90152154.90152158.90152154h6.310651c.4978967 0 .9015216-.4036249.9015216-.90152154zm-.9015216-1.80304315h-6.310651c-.49789661 0-.90152158.40362495-.90152158.90152157v.45076079h8.11369418v-.45076079c0-.49789662-.4036249-.90152157-.9015216-.90152157z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/buses-s.svg b/data/styles/default/light/symbols/buses-s.svg
new file mode 100644
index 000000000..b97adc74f
--- /dev/null
+++ b/data/styles/default/light/symbols/buses-s.svg
@@ -0,0 +1 @@
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m9.75243074 9.06118634.00025184.37014574c0 .24779244-.20087545.44866792-.44866789.44866792-.24779243 0-.44866789-.20087548-.44866789-.44866792l-.00059822-.30175775h.44926611c.1562241 0 .30685358-.02395345.44841605-.06838799zm-.44841605-6.81118634c.66077981 0 1.19644771.53566789 1.19644771 1.19644771v4.18756699c0 .66077982-.5356679 1.1964477-1.19644771 1.1964477l-.91968692.00105286c.22782639-.26306594.36567223-.60619279.36567223-.98151526v-.964l.554015.00023487c.33038991 0 .59822384-.26783393.59822384-.59822385v-2.24333945l-1.15223884-.00067157v-.299l1.15223884.00055964v-.29911193c0-.33038991-.26783393-.59822385-.59822384-.59822385l-.60832391.00038155c-.06254476-.22575613-.17655125-.43012228-.32859651-.5996755zm.14955626 5.08490277c-.24779243 0-.44866788.20087546-.44866788.44866789 0 .24779244.20087545.44866789.44866788.44866789.24779244 0 .44866789-.20087545.44866789-.44866789 0-.24779243-.20087545-.44866789-.44866789-.44866789zm-7.03613405 1.72609675c.1417353.04455422.2925679.06857481.44901081.06857481h.44806967l.00059822.30175775c0 .24779244-.20087546.44866792-.44866789.44866792-.24779244 0-.44866789-.20087548-.44866789-.44866792zm5.08499384.00018682.00025184.37014574c0 .24779244-.20087545.44866792-.44866789.44866792-.24779243 0-.44866789-.20087548-.44866789-.44866792l-.00059822-.30175775h.44926611c.1041494 0 .2058123-.01064598.30395985-.03090909zm-.44841605-6.81118634c.66077983 0 1.19644771.53566789 1.19644771 1.19644771v4.18756699c0 .66077982-.53566788 1.1964477-1.19644771 1.1964477h-4.18756698c-.66077983 0-1.19644771-.53566788-1.19644771-1.1964477v-4.18756699c0-.66077982.53566788-1.19644771 1.19644771-1.19644771zm-4.33712265 5.08490277c-.24779243 0-.44866789.20087546-.44866789.44866789 0 .24779244.20087546.44866789.44866789.44866789.24779244 0 .4486679-.20087545.4486679-.44866789 0-.24779243-.20087546-.44866789-.4486679-.44866789zm4.48667891 0c-.24779243 0-.44866788.20087546-.44866788.44866789 0 .24779244.20087545.44866789.44866788.44866789.24779244 0 .44866789-.20087545.44866789-.44866789 0-.24779243-.20087545-.44866789-.44866789-.44866789zm.44866789-3.2902312h-5.38401469v2.24333945c0 .33038992.26783395.59822385.59822386.59822385h4.18756699c.33038991 0 .59822384-.26783393.59822384-.59822385zm-.59822384-1.19644771h-4.18756699c-.33038991 0-.59822386.26783394-.59822386.59822385v.29911193h5.38401469v-.29911193c0-.33038991-.26783393-.59822385-.59822384-.59822385z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file