diff --git a/media/attribution.js b/media/attribution.js
index 2e7e2760..0f57439a 100644
--- a/media/attribution.js
+++ b/media/attribution.js
@@ -6936,7 +6936,6 @@ const attributionData = {
         {
             prefix: "./media/vehicles/",
             files: [
-                { name: "bus.svg", source: null },
                 { name: "vertical-bus.svg", source: null },
                 { name: "leopard-2-revolution-1.svg", source: "http://leopardclub.ca/reviews/Tiger_Model/Revolution/" },
             ],
@@ -6964,6 +6963,26 @@ const attributionData = {
                 "h-padleckas"
             ]
         },
+        {
+            prefix: "./media/vehicles/buses/",
+            files: [
+                { name: "bus_city-bus-front.svg", source: "https://www.dimensions.guide/element/city-transit-buses" },
+                { name: "bus_city-bus-side.svg", source: "https://www.dimensions.guide/element/city-transit-buses" },
+                { name: "bus_city-bus-top.svg", source: "https://www.dimensions.guide/element/city-transit-buses" },
+                { name: "bus_articulated-bus-front.svg", source: "https://www.dimensions.guide/element/articulated-buses" },
+                { name: "bus_articulated-bus-side.svg", source: "https://www.dimensions.guide/element/articulated-buses" },
+                { name: "bus_articulated-bus-top.svg", source: "https://www.dimensions.guide/element/articulated-buses" },
+                { name: "bus_coach-bus-front.svg", source: "https://www.dimensions.guide/element/coach-buses" },
+                { name: "bus_coach-bus-side.svg", source: "https://www.dimensions.guide/element/coach-buses" },
+                { name: "bus_coach-bus-top.svg", source: "https://www.dimensions.guide/element/coach-buses" },
+                { name: "bus_shuttle-bus-front.svg", source: "https://www.dimensions.guide/element/minibuses-shuttle-buses" },
+                { name: "bus_shuttle-bus-side.svg", source: "https://www.dimensions.guide/element/minibuses-shuttle-buses" },
+                { name: "bus_shuttle-bus-top.svg", source: "https://www.dimensions.guide/element/minibuses-shuttle-buses" },
+            ],
+            authors: [
+                "dimensions-guide"
+            ],
+        },
         {
             prefix: "./media/vehicles/cars/",
             files: [
diff --git a/media/vehicles/bus.svg b/media/vehicles/bus.svg
deleted file mode 100644
index 839ecdef..00000000
--- a/media/vehicles/bus.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 459.14 125" style="enable-background:new 0 0 459.14 125;" xml:space="preserve">
-<path d="M10.14,12v17h-6c-2,2-2,17-2,17h4c0,0-3,27-3,38s-1,20-1,20h-2c0,0-2,11,9,11s79,0,79,0v-2h4c0,0,4,12,17,12s16-11,16-11
-	h191c0,0,2,11,15,11c14,0,17-11,17-11h5c0,0,94-1,106-9V46l-2-31c0,0-3-5-9-5s-184,0-184,0s-3-4-7-4c-4,0-23,0-23,0l0,0l-4,3h-23
-	l-1-9c0,0-118,0-123,0s-8,8-8,8l-53,1L10.14,12z"/>
-</svg>
diff --git a/media/vehicles/buses/bus_articulated-bus-front.svg b/media/vehicles/buses/bus_articulated-bus-front.svg
new file mode 100644
index 00000000..e3e16b20
--- /dev/null
+++ b/media/vehicles/buses/bus_articulated-bus-front.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 181.01 185.65" style="enable-background:new 0 0 181.01 185.65;" xml:space="preserve">
+<g id="POLYLINE_1216_">
+	<path d="M146.59,167.85c-2.2,0-4.4,0-6.6,0c-5.62,0-11.24,0-16.87,0c-7.54,0-15.07,0-22.61,0c-8.04,0-16.08,0-24.12,0
+		c-7.02,0-14.04,0-21.06,0c-4.58,0-9.17,0-13.76,0c-0.59,0-1.18,0-1.76,0c-0.22,0-0.75-0.1-0.96,0c-0.23,0.12-0.16,0.09-0.16,0.51
+		c0,1.44,0,2.89,0,4.33c0,3.33,0.02,6.65,0,9.98c-0.01,1.23-0.52,2.36-1.77,2.77c-0.63,0.21-1.35,0.13-2,0.13c-1.84,0-3.68,0-5.52,0
+		c-1.36,0-2.73,0.05-4.08,0c-0.59-0.02-1.13-0.15-1.61-0.51c-1.22-0.91-1.03-2.37-1.03-3.72c0-3.63,0-7.26,0-10.89
+		c0-0.87,0-1.73,0-2.6c-0.81,0-1.69,0.08-2.41,0.49c-0.73,0.42-1.42,1.91-2.41,1.5c-0.84-0.35-0.81-1.36-0.82-2.11
+		c-0.01-1.42,0-2.85,0-4.27c0-6.21,0-12.43,0.01-18.65c0-6.47,0.01-12.95,0.01-19.42c0-2.1-0.01-4.2,0.01-6.3
+		c0.02-3.43,0.04-6.85,0.05-10.28c0.03-6.24,0.07-12.48,0.1-18.71c0.04-7.15,0.07-14.29,0.11-21.44c0.03-6.14,0.06-12.27,0.1-18.41
+		c0.02-3.28,0.2-6.6,0.05-9.88c-0.01-0.15,0-0.3,0-0.46c-3.11,0.02-6.22,0.04-9.34,0.06c0.67,0.86,1.82,1.84,1.98,2.98
+		c0.2,1.44-0.06,3.05-0.09,4.5c-0.1,3.83-0.19,7.66-0.35,11.49c-0.05,1.16-0.11,2.31-0.17,3.47c-0.02,0.37-0.02,0.71-0.17,1.05
+		c-0.29,0.66-0.87,1.01-1.55,1.12c-1.79,0.3-3.67,0.39-5.48,0.52c-0.78,0.06-1.5-0.14-1.95-0.83c-0.41-0.63-0.31-1.41-0.31-2.13
+		c0-2.28,0-4.56,0-6.85c0-2.65,0-5.29,0-7.93c0-1.23-0.14-2.55,0.01-3.77c0.05-0.38,0.2-0.68,0.39-1c0.59-1,1.23-1.97,1.85-2.95
+		c0.72-1.14,1.37-2.13,2.3-3.1c1.19-1.25,2.64-2.32,4.34-2.75c0.89-0.22,1.79-0.2,2.69-0.21c1.36-0.01,2.71-0.03,4.07-0.04
+		c0.29,0,1.65,0.16,1.84-0.06c0.23-0.27,0.02-1.72,0.02-2.06c0.01-1.33,0.03-2.66,0.04-3.99c0.02-1.95-0.03-3.92,0.06-5.87
+		c0.19-3.87,0.88-8.75,4.6-10.85c1.93-1.09,4.24-1.36,6.41-1.44c1.96-0.07,3.93-0.02,5.89-0.02c0.55,0,1.11,0,1.66,0
+		c0.18,0,0.73,0.1,0.88,0c0.3-0.2,0.57-1.36,0.75-1.71c2.3-4.56,6.61-6.32,11.46-6.88c6.46-0.74,13.12-0.65,19.62-0.65
+		c8.66,0,17.33,0,25.99,0c7.33,0,14.66-0.05,21.98,0c3.75,0.03,7.51,0.07,11.25,0.19c3.36,0.11,6.8,0.15,10.11,0.81
+		c2.18,0.43,4.32,1.2,6.07,2.62c0.84,0.69,1.58,1.5,2.19,2.4c0.34,0.51,0.65,1.04,0.92,1.59c0.17,0.35,0.44,1.46,0.73,1.64
+		c0.17,0.1,0.66,0,0.85,0c0.62,0,1.23,0,1.85,0c1.27,0,2.54,0,3.8,0c1.45,0,2.91,0.02,4.34,0.23c1.77,0.26,3.56,0.78,4.96,1.91
+		c3.24,2.62,3.57,7.7,3.61,11.53c0.08,8.25,0.17,16.49,0.24,24.74c0.01,1.16,0.02,2.33,0.03,3.49c0.01,0.9,0.2,0.65,1.14,0.66
+		c1.08,0.01,2.15-0.03,3.2,0.25c1.71,0.47,3.16,1.6,4.35,2.89c0.97,1.06,1.67,2.18,2.44,3.41c0.67,1.06,1.86,2.32,1.94,3.65
+		c0.09,1.34,0,2.72,0,4.07c0,2.74,0,5.49,0,8.23c0,2.11,0,4.23,0,6.34c0,0.72,0.06,1.43-0.44,2.02c-0.5,0.6-1.17,0.72-1.9,0.65
+		c-1.81-0.16-3.75-0.17-5.53-0.53c-0.66-0.14-1.23-0.57-1.47-1.22c-0.17-0.47-0.13-1.01-0.15-1.5c-0.05-1-0.1-2-0.14-3
+		c-0.17-3.99-0.26-7.98-0.36-11.97c-0.03-1.27-0.29-2.74-0.07-4c0.19-1.11,1.32-2.07,1.97-2.9c-1.64-0.01-3.28-0.02-4.92-0.03
+		c0.01,4.97,0.03,9.94,0.04,14.91c0.03,11.26,0.06,22.53,0.09,33.79c0.03,12.1,0.06,24.2,0.1,36.3c0.02,7.47,0.04,14.94,0.06,22.41
+		c0,1.11,0.36,3.02-0.36,3.89c-0.77,0.93-1.51,0.1-2.1-0.52c-0.59-0.62-1.27-0.93-2.11-1.05c-0.35-0.05-0.71-0.07-1.06-0.07
+		c0,4.29,0,8.57,0,12.86c0,1.84,0.29,4.43-2.16,4.82c-1.56,0.25-3.29,0.03-4.86,0.03c-2.12,0-4.26,0.09-6.37,0
+		c-2.14-0.09-2.62-1.77-2.62-3.58C146.59,177.27,146.59,172.56,146.59,167.85z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_articulated-bus-side.svg b/media/vehicles/buses/bus_articulated-bus-side.svg
new file mode 100644
index 00000000..6dc7a902
--- /dev/null
+++ b/media/vehicles/buses/bus_articulated-bus-side.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1088.81 185.61" style="enable-background:new 0 0 1088.81 185.61;" xml:space="preserve">
+<g id="POLYLINE_1218_">
+	<path d="M646.49,170c-0.69,0-1.77,0.23-2.29-0.18c-0.71-0.56-1.25-1.72-1.78-2.45c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.38,0.52-0.75,1.04-1.13,1.55
+		c-0.28,0.39-0.53,0.95-0.96,1.08c-0.33,0.1-1.67,0.16-1.98,0c-0.49-0.25-0.6-1.26-1.09-1.51c-0.41-0.2-1.43,0-1.88,0
+		c-1.54,0-3.08,0-4.62,0c-3.44,0-6.87,0-10.31,0c-1.09,0-2.62,0.25-3.66-0.22c-1.32-0.59-1.27-2.1-1.27-3.32
+		c-0.93,0-1.86,0.01-2.79,0.01c-0.19,0-0.88-0.11-1.04,0c-0.12,0.08-0.19,0.6-0.24,0.75c-0.34,1.08-0.74,2.14-1.21,3.17
+		c-0.97,2.16-2.22,4.19-3.69,6.04c-2.97,3.72-6.88,6.67-11.27,8.5c-5.19,2.16-11,2.74-16.52,1.63c-4.64-0.94-9.03-3.05-12.65-6.1
+		c-3.61-3.04-6.45-6.98-8.17-11.38c-0.2-0.51-0.39-1.03-0.55-1.55c-0.26-0.8-0.18-0.85-1.05-0.84c-0.96,0-2.27-0.24-3.19,0.01
+		c-0.42,0.11-0.17-0.13-0.32,0.24c-0.17,0.42,0,1.23,0,1.68c0,0.99-0.35,1.69-1.41,1.75c-1.78,0.1-3.6,0-5.39,0
+		c-4.13,0-8.26,0-12.39,0c-6.04,0-12.08,0-18.13,0c-7.58,0-15.15,0-22.73,0c-8.75,0-17.51,0-26.26,0c-9.48,0-18.96,0-28.44,0
+		c-9.85,0-19.69,0-29.54,0c-9.85,0-19.71,0-29.56,0c-9.44,0-18.87,0-28.31,0c-8.57,0-17.14,0-25.72,0c-7.43,0-14.87,0-22.3,0
+		c-5.84,0-11.68,0-17.52,0c-3.84,0-7.68,0-11.53,0c-1.46,0-2.98,0.13-4.44,0c-1.82-0.17-1.32-2.4-1.32-3.67
+		c-0.58,0.01-1.17,0.02-1.75,0.03c-0.52,0.01-0.99-0.13-1.25,0.24c-0.38,0.54-0.51,1.53-0.75,2.16c-0.59,1.49-1.31,2.94-2.14,4.31
+		c-1.7,2.79-3.88,5.29-6.42,7.35c-2.49,2.01-5.32,3.6-8.33,4.67c-3.74,1.33-7.76,1.86-11.72,1.55c-3.84-0.3-7.6-1.39-11.01-3.18
+		c-2.8-1.47-5.35-3.42-7.51-5.73c-2.16-2.3-3.92-4.97-5.2-7.85c-0.33-0.73-0.55-1.52-0.89-2.24c-0.11-0.23-0.06-0.29-0.25-0.38
+		c-0.21-0.09-0.68,0.01-0.91,0.01c-0.52,0.01-1.73-0.21-2.2,0.04c-0.32,0.16-0.35,1.82-0.62,2.37c-0.73,1.47-2.16,1.55-3.58,1.55
+		c-2.85,0-5.7,0-8.55,0c-5.18,0-10.35,0-15.53,0c-6.48,0-12.96,0-19.44,0c-6.76,0-13.52,0-20.28,0c-6.01,0-12.03,0-18.04,0
+		c-4.25,0-8.5,0-12.75,0c-1.76,0-3.52-0.02-5.28,0.01c-1.78,0.02-3.51,0.07-5.29-0.15c-2.74-0.34-5.48-0.69-8.22-1.03
+		c-2.14-0.27-4.28-0.57-6.43-0.87c-1.62-0.22-3.33-0.34-4.91-0.79c-1.9-0.55-2.47-2.6-2.68-4.38c-0.19-1.59-0.15-3.29-0.01-4.88
+		c0.09-1,0.49-1.96,0.63-2.97c0.13-0.95,0.37-1.47,1.4-1.45c-0.42-7.7-0.68-15.39-0.85-23.09c-0.16-7.16-0.2-14.34-0.06-21.5
+		c0.15-7.41,0.61-14.81,1.24-22.2c0.63-7.39,1.41-14.77,2.38-22.12c0.97-7.38,2.13-14.73,3.69-22c0.18-0.85,0.37-1.7,0.56-2.55
+		c0-0.06-15.34-0.35-16.9-0.38c1.07,0.31,2.12,0.75,3.08,1.32c0.38,0.22,0.74,0.46,1.09,0.72c0.47,0.35,0.46,0.46,0.2,0.97
+		c-0.62,1.21-1.43,2.34-2.16,3.49c-0.4,0.62-0.89,1.6-1.58,1.97c-0.68,0.36-0.99-0.13-1.59-0.31c-0.29-0.09-0.2-0.23-0.45,0.1
+		c-0.05,0.06-0.05,0.19-0.07,0.26c-0.21,0.56-0.33,1.17-0.5,1.75c-1.21,4.27-2.42,8.54-3.63,12.81c-0.38,1.33-0.54,4.04-2.52,3.72
+		c-0.97-0.16-1.92-0.62-2.8-1.02c-0.85-0.39-1.95-0.78-2.61-1.47c-1.13-1.19-0.12-3.28,0.24-4.56c1.18-4.15,2.35-8.3,3.53-12.45
+		c0.11-0.38,0.35-0.86,0.36-1.26c0.01-0.24-0.12-0.52-0.14-0.78c-0.05-0.68,0.08-1.22,0.54-1.71c0.56-0.59,0.52-0.93,0.28-1.71
+		c-0.2-0.65-0.46-1.29,0.14-1.8c0.22-0.19,0.52-0.32,0.79-0.43c-0.38-0.41-0.3-1.36-0.21-1.84c0.06-0.35,0.19-0.59,0.55-0.72
+		c0.88-0.31,2.24-0.07,3.15-0.09c5.19-0.12,10.39-0.23,15.58-0.35c1.47-0.03,2.93-0.07,4.4-0.1c-0.15-6.2-0.31-12.4-0.46-18.61
+		c-0.03-1.01-0.19-2.21,0.55-3.02c0.42-0.46,1.01-0.63,1.61-0.7c1.3-0.14,2.62-0.14,3.92-0.2c1.2-0.06,2.45-0.24,3.65-0.16
+		c0.59,0.04,1.19,0.22,1.54,0.72c1.3-1.01,2.93-1.33,4.55-1.35c1.44-0.01,2.89,0,4.33-0.01c3.19,0,6.37-0.01,9.56-0.02
+		c4.57-0.01,9.14-0.01,13.7-0.02c5.63-0.01,11.27-0.02,16.91-0.03c6.38-0.01,12.75-0.02,19.12-0.03c6.79-0.01,13.57-0.02,20.36-0.03
+		c6.87-0.01,13.74-0.02,20.62-0.04c6.63-0.01,13.26-0.02,19.89-0.03c6.09-0.01,12.18-0.02,18.27-0.03
+		c5.16-0.01,10.32-0.02,15.48-0.03c3.94-0.01,7.87-0.01,11.81-0.02c2.38,0,4.77-0.01,7.15-0.01c0.46,0,1.08,0.11,1.53,0
+		c0.05-0.01,0.14,0.02,0.19,0c0.39-0.17,0.79-0.87,1.08-1.19c0.37-0.4,0.74-0.8,1.12-1.19c2.71-2.83,5.6-5.9,8.99-7.91
+		c2.57-1.53,5.45-2.3,8.43-2.32c1.32-0.01,2.64,0,3.96,0c3.34,0,6.68,0,10.02,0c4.91,0,9.82,0,14.72,0c6.02,0,12.04,0,18.06,0
+		c6.68,0,13.35,0,20.03,0c6.88,0,13.76,0,20.64,0c6.66,0,13.31,0,19.97,0c5.91,0,11.83,0,17.74,0c4.75,0,9.5,0,14.25,0
+		c3.13,0,6.26,0,9.39,0c1.23,0,2.45-0.03,3.68,0.01c2.36,0.07,4.78,0.61,6.62,2.17c1.52,1.29,3.02,2.69,4.44,4.1
+		c0.63,0.63,1.15,1.36,1.53,2.17c0.4,0.85,0.63,1.78,0.74,2.71c0.02,0.22-0.03,1.04,0.1,1.15c0.08,0.07,0.59,0,0.7,0
+		c3.47-0.01,6.95-0.01,10.42-0.02c6.1-0.01,12.19-0.02,18.29-0.03c6.79-0.01,13.59-0.02,20.38-0.03c5.57-0.01,11.13-0.02,16.7-0.03
+		c1.73,0,3.46-0.01,5.18-0.01c0.3,0,1.83,0.22,2.06,0c0.11-0.11,0.01-0.82,0.01-0.98c0-0.73-0.02-1.47,0-2.2
+		c0.01-0.36,0.03-0.71,0.14-1.06c0.31-0.98,1.1-1.76,2.08-2.05c0.57-0.17,1.17-0.13,1.76-0.13c1.75,0,3.49,0,5.24,0
+		c6.17,0,12.35,0,18.52,0c6.17,0,12.34,0,18.52,0c1.74,0,3.48,0,5.23,0c0.6,0,1.2-0.04,1.78,0.13c2.79,0.83,2.22,3.99,2.22,6.2
+		c3.95-0.01,7.9-0.01,11.85-0.02c2.86,0,5.73-0.01,8.59-0.01c0.99,0,1.97,0,2.96,0c0.31,0,1.33,0.17,1.6,0
+		c0.32-0.21,0.1-1.92,0.1-2.36c0-0.48-0.03-0.97,0.06-1.44c0.18-0.9,0.77-1.69,1.59-2.13c0.49-0.26,1-0.35,1.55-0.37
+		c1.45-0.04,2.9,0,4.34,0c8.36,0,16.72,0,25.07,0c9.73,0,19.46,0,29.2,0c1.86,0,3.73,0,5.59,0c0.62,0,1.28-0.06,1.89,0.07
+		c2.15,0.45,2.47,2.33,2.47,4.16c0,0.45-0.14,1.1,0,1.52c0.12,0.37,0.57,0.78,0.8,1.1c0.47-0.64,0.93-1.29,1.4-1.93
+		c0.58-0.79,0.59-0.71,1.59-0.71c0.94,0,1.01-0.1,1.54,0.64c0.48,0.67,0.97,1.33,1.45,2c0.47-0.64,0.93-1.29,1.4-1.93
+		c0.58-0.79,0.59-0.71,1.59-0.71c0.94,0,1.01-0.1,1.54,0.64c0.48,0.67,0.97,1.33,1.45,2c0.47-0.64,0.93-1.29,1.4-1.93
+		c0.58-0.79,0.59-0.71,1.59-0.71c0.94,0,1.01-0.1,1.54,0.64c0.48,0.67,0.97,1.33,1.45,2c0.47-0.64,0.93-1.29,1.4-1.93
+		c0.58-0.79,0.59-0.71,1.59-0.71c0.94,0,1.01-0.1,1.54,0.64c0.48,0.67,0.97,1.33,1.45,2c0.47-0.64,0.93-1.29,1.4-1.93
+		c0.58-0.79,0.59-0.71,1.59-0.71c0.94,0,1.01-0.1,1.54,0.64c0.48,0.67,0.97,1.33,1.45,2c0.26-0.36,0.52-0.72,0.79-1.08
+		c0.3-0.42,0.63-1.15,1.05-1.45c0.35-0.25,1.89-0.26,2.27-0.05c0.79,0.43,0.97,2,1.76,2.43c0.16,0.09,0.6,0,0.77,0
+		c0.66,0,1.33,0,1.99,0c1.1,0,2.41,0.19,3.49-0.01c0.44-0.08,0.63-0.3,1-0.62c1.93-1.64,3.86-3.29,5.79-4.93
+		c2.29-1.95,4.51-4.06,7.26-5.36c2.18-1.03,4.55-1.52,6.96-1.54c3.35-0.02,6.7,0,10.05,0c8.15,0,16.3,0,24.46,0
+		c10.83,0,21.66,0,32.49,0c11.35,0,22.7,0,34.05,0c9.79,0,19.59,0,29.38,0c6.14,0,12.28,0,18.42,0c2.88,0,5.92-0.22,8.58,1.09
+		c0.76,0.37,1.42,0.86,2.04,1.43c1.41,1.29,2.86,2.56,4.21,3.91c0.91,0.91,1.69,2,2.02,3.27c0.21,0.8,0.17,1.61,0.17,2.43
+		c4.73-0.01,9.46-0.02,14.19-0.02c9.32-0.02,18.64-0.03,27.97-0.05c6.6-0.01,13.2-0.02,19.81-0.03c5.71-0.01,11.42-0.02,17.13-0.03
+		c3.61-0.01,7.22-0.01,10.83-0.02c8.3-0.01,16.6-0.03,24.9-0.04c9.04-0.01,18.09-0.03,27.13-0.04c3.03,0,6.07-0.01,9.1-0.01
+		c0.56,0,3.04,0.3,3.3-0.14c0.16-0.27,0-1.1,0-1.41c0-0.47-0.01-0.94,0-1.41c0.01-0.27,0.01-0.53,0.07-0.79
+		c0.15-0.67,0.52-1.29,1.05-1.73c1.28-1.07,3.17-0.72,4.7-0.72c2.29,0,4.58,0,6.86,0c0.87,0,1.81-0.1,2.67,0.04
+		c1.28,0.22,2.31,1.26,2.54,2.54c0.2,1.16,0.05,2.42,0.05,3.6c6.93-0.01,13.86-0.02,20.8-0.03c4.5-0.01,9-0.01,13.5-0.02
+		c2.03,0,4.09-0.1,6.12,0.03c3.02,0.18,5.44,1.65,5.99,4.78c0.52,2.91,0.57,5.96,0.72,8.9c0.15,2.94,0.29,5.87,0.4,8.81
+		c0.23,6.23,0.49,12.46,0.66,18.69c0.23,8.78,0.46,17.57,0.7,26.35c0.12,4.61,0.28,9.22,0.34,13.84c0.11,8.65,0.22,17.31,0.34,25.96
+		c0.06,4.25,0.11,8.49,0.17,12.74c0.02,1.23,0.03,2.46,0.05,3.7c0,0.18-0.08,0.7,0.01,0.86c0.12,0.2,0.27,0.08,0.54,0.15
+		c0.61,0.17,0.76,0.63,0.79,1.2c0.07,1.6,0,3.23,0,4.84c0,4.1,0,8.21,0,12.31c0,2.55-1.23,4.29-3.58,5.24
+		c-1,0.41-2.06,0.54-3.13,0.67c-2.73,0.36-5.46,0.71-8.19,1.07c-9.43,1.23-18.86,2.46-28.29,3.69c-6.45,0.84-12.89,1.7-19.34,2.52
+		c-3.14,0.4-6.29,0.33-9.44,0.33c-7.21,0-14.42,0-21.63,0c-9.93,0-19.85,0-29.78,0c-8.74,0-17.48,0-26.22,0c-3.59,0-7.18,0-10.77,0
+		c-3.82,0-7.63,0-11.45,0c-2.08,0-4.16,0-6.24,0c-0.67,0-1.39,0.07-2.07-0.04c-1.83-0.29-1.92-2-1.92-3.5
+		c-0.58,0-1.15,0.01-1.73,0.01c-0.43,0-1.7-0.23-2.07,0.01c-0.35,0.22-0.6,1.74-0.77,2.18c-0.59,1.6-1.34,3.14-2.21,4.6
+		c-1.79,3.01-4.15,5.69-6.92,7.85c-2.7,2.11-5.79,3.72-9.07,4.74c-3.89,1.2-8.04,1.57-12.07,1.04c-3.57-0.47-7.04-1.62-10.19-3.38
+		c-2.99-1.67-5.67-3.89-7.87-6.52c-2.17-2.59-3.87-5.56-5-8.74c-0.14-0.38-0.23-0.79-0.39-1.16c-0.21-0.49-0.24-0.39-0.83-0.39
+		c-0.63,0-3.33-0.31-3.59,0.14c-0.26,0.45,0.03,1.63-0.01,2.16c-0.02,0.21-0.02,0.4-0.11,0.6c-0.18,0.42-0.56,0.69-1.01,0.77
+		c-1.05,0.19-2.28,0.01-3.34,0.01c-3.07,0-6.14,0-9.21,0c-4.68,0-9.36,0-14.03,0c-5.89,0-11.77,0-17.66,0c-6.69,0-13.38,0-20.08,0
+		c-7.1,0-14.2,0-21.29,0c-7.1,0-14.21,0-21.31,0c-6.71,0-13.41,0-20.12,0c-5.91,0-11.82,0-17.74,0c-4.73,0-9.47,0-14.2,0
+		c-3.11,0-6.22,0-9.33,0c-0.83,0-1.66,0-2.48,0c-0.23,0-0.66-0.08-0.87,0.03c-0.44,0.22-0.49,0.95-0.98,1.1
+		c-0.37,0.11-1.58,0.15-1.93,0c-0.34-0.15-0.67-0.85-0.9-1.16c-0.36-0.49-0.72-0.98-1.07-1.48c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2c-0.47,0.64-0.93,1.29-1.4,1.93
+		c-0.58,0.79-0.59,0.71-1.59,0.71c-0.94,0-1.01,0.1-1.54-0.64c-0.48-0.67-0.97-1.33-1.45-2C647.77,168.24,647.13,169.12,646.49,170z
+		"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_articulated-bus-top.svg b/media/vehicles/buses/bus_articulated-bus-top.svg
new file mode 100644
index 00000000..731a7aea
--- /dev/null
+++ b/media/vehicles/buses/bus_articulated-bus-top.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 177.62 1067.3" style="enable-background:new 0 0 177.62 1067.3;" xml:space="preserve">
+<g id="POLYLINE_1219_">
+	<path d="M13.21,9.48c0-1.73,0.07-3.32,0.85-4.9c0.65-1.31,1.64-2.43,2.86-3.23c1.21-0.79,2.62-1.25,4.07-1.32
+		c1.24-0.06,2.5-0.01,3.75-0.01c3.5,0,7,0,10.5,0c5.28,0,10.57,0,15.85,0c6.42,0,12.83,0,19.24,0c6.99,0,13.98,0,20.97,0
+		c6.89,0,13.77,0,20.66,0c6.23,0,12.46,0,18.69,0c4.9,0,9.8,0,14.7,0c3,0,6,0,9,0c1.08,0,2.19-0.07,3.26,0.12
+		c1.43,0.25,2.79,0.88,3.9,1.82c1.11,0.94,1.96,2.17,2.44,3.55c0.22,0.63,0.36,1.29,0.42,1.96c0.05,0.51-0.18,1.5,0.03,1.88
+		c0.19,0.34,1.74,0.13,2.19,0.13c3.02,0,6.04,0,9.06,0c0.95,0,1.8,0.23,1.92,1.33c0.11,0.96,0,2,0,2.96c0,1.61,0,3.23,0,4.85
+		c0,1.01,0.22,2.42-1.07,2.74c-1,0.25-2.26,0.04-3.28,0.04c-0.97,0-0.89-0.1-1.17,0.76c-0.91,2.79-1.81,5.58-2.72,8.37
+		c-0.5,1.53-0.99,3.06-1.49,4.59c-0.26,0.79-0.82,1.83-0.86,2.67c-0.02,0.36,0.24,0.64,0.34,1.02c0.13,0.5,0.11,1.03-0.06,1.51
+		c-0.41,1.17-1.64,1.88-2.86,1.68c0,1.34,0,2.69,0,4.03c0,3.81,0,7.63,0,11.44c0,6.03,0,12.07,0,18.1c0,7.9,0,15.81,0,23.71
+		c0,9.51,0,19.02,0,28.53c0,10.89,0,21.78,0,32.67c0,11.87,0,23.74,0,35.61c0,12.62,0,25.23,0,37.85c0,13.14,0,26.29,0,39.43
+		c0,13.25,0,26.5,0,39.75c0,13.2,0,26.4,0,39.6c0,12.73,0,25.46,0,38.19c0,12.04,0,24.08,0,36.12c0,11.11,0,22.23,0,33.35
+		c0,9.79,0,19.58,0,29.38c0,8.24,0,16.48,0,24.72c0,6.43,0,12.86,0,19.28c0,4.27,0,8.53,0,12.79c0,1.85,0.01,3.7,0,5.55
+		c-0.02,2.73-1.23,5.29-3.49,6.87c-1.27,0.89-2.78,1.41-4.33,1.48c0.82,0.01,1.29,0.54,1.95,1.02c0.32,0.23,0.91,0.5,1.13,0.82
+		c0.14,0.21,0.11,0.4,0.11,0.69c0,0.41,0.13,1.03,0,1.41c-0.08,0.23-0.22,0.29-0.44,0.45c-0.73,0.53-1.46,1.06-2.19,1.59
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.64,0.47,1.29,0.93,1.93,1.4c0.79,0.58,0.71,0.59,0.71,1.59c0,0.94,0.1,1.01-0.64,1.54c-0.67,0.48-1.33,0.97-2,1.45
+		c0.71,0.52,1.42,1.03,2.13,1.55c0.72,0.53,0.5,1.01,0.5,1.91c0,0.86-0.45,0.94-1.16,1.46c-0.68,0.49-1.18,1.07-2.03,1.08
+		c3.31,0.15,6.28,2.36,7.37,5.49c0.57,1.65,0.45,3.39,0.45,5.11c0,3.78,0,7.55,0,11.33c0,6.41,0,12.83,0,19.24
+		c0,8.67,0,17.34,0,26.01c0,10.39,0,20.78,0,31.17c0,11.7,0,23.41,0,35.11c0,12.64,0,25.28,0,37.92c0,13,0,26,0,39
+		c0,13.04,0,26.09,0,39.13c0,12.51,0,25.02,0,37.53c0,11.6,0,23.19,0,34.79c0,10.29,0,20.57,0,30.86c0,8.43,0,16.85,0,25.28
+		c0,6.2,0,12.4,0,18.6c0,3.47,0,6.94,0,10.4c0,1.9,0.02,3.71-0.87,5.47c-1.42,2.84-4.33,4.49-7.46,4.52c-5.18,0.04-10.35,0-15.53,0
+		c-11.06,0-22.11,0-33.17,0c-12.89,0-25.78,0-38.68,0c-10.9,0-21.79,0-32.69,0c-4.85,0-9.71,0.06-14.57,0
+		c-3.22-0.04-6.19-1.87-7.52-4.84c-0.78-1.75-0.71-3.54-0.71-5.4c0-3.59,0-7.17,0-10.76c0-6.3,0-12.6,0-18.91
+		c0-8.51,0-17.02,0-25.52c0-10.3,0-20.59,0-30.88c0-11.7,0-23.4,0-35.09c0-12.54,0-25.07,0-37.61c0-13.05,0-26.11,0-39.16
+		c0-12.99,0-25.98,0-38.97c0-12.55,0-25.1,0-37.65c0-11.72,0-23.44,0-35.16c0-10.33,0-20.65,0-30.98c0-8.59,0-17.17,0-25.76
+		c0-6.31,0-12.63,0-18.94c0-3.66,0-7.31,0-10.97c0-1.78-0.09-3.52,0.59-5.21c1.19-2.95,4.06-4.98,7.23-5.13
+		c-0.82-0.01-1.29-0.54-1.95-1.02c-0.32-0.23-0.91-0.5-1.13-0.82c-0.15-0.21-0.1-0.4-0.1-0.69c0-0.41-0.13-1.03,0-1.41
+		c0.08-0.23,0.22-0.29,0.44-0.45c0.73-0.53,1.46-1.06,2.19-1.59c-0.17,0-0.58-0.42-0.71-0.52c-0.41-0.3-0.81-0.59-1.22-0.89
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.64-0.47-1.28-0.93-1.93-1.4
+		c-0.79-0.58-0.71-0.59-0.71-1.59c0-0.94-0.1-1.01,0.64-1.54c0.67-0.48,1.33-0.97,2-1.45c-0.71-0.52-1.42-1.03-2.13-1.55
+		c-0.72-0.53-0.5-1.01-0.5-1.91c0-0.86,0.45-0.94,1.16-1.46c0.68-0.49,1.18-1.07,2.03-1.08c-3.36-0.15-6.36-2.43-7.41-5.63
+		c-0.49-1.51-0.41-3.07-0.41-4.63c0-3.16,0-6.32,0-9.47c0-5.41,0-10.82,0-16.24c0-7.39,0-14.78,0-22.17c0-9.13,0-18.26,0-27.39
+		c0-10.49,0-20.98,0-31.47c0-11.6,0-23.21,0-34.81c0-12.5,0-24.99,0-37.49c0-12.98,0-25.95,0-38.93c0-13.3,0-26.59,0-39.89
+		c0-13.2,0-26.39,0-39.59c0-12.88,0-25.75,0-38.63c0-12.33,0-24.65,0-36.98c0-11.37,0-22.73,0-34.1c0-10.18,0-20.37,0-30.55
+		c0-8.75,0-17.51,0-26.26c0-6.95,0-13.9,0-20.84c0-4.9,0-9.81,0-14.71c0-2.58,0-5.16,0-7.74c0-0.32,0-0.63,0-0.95
+		c-1.16,0.19-2.33-0.43-2.79-1.51c-0.2-0.46-0.26-0.97-0.17-1.46c0.06-0.36,0.41-0.75,0.44-1.07c0.05-0.46-0.41-1.26-0.55-1.69
+		c-0.4-1.23-0.8-2.47-1.2-3.7c-0.94-2.9-1.88-5.79-2.82-8.69c-0.2-0.61-0.34-1.8-0.75-2.31C5,21.1,3.59,21.38,2.98,21.38
+		c-1.01,0-2.53,0.27-2.89-1.02c-0.16-0.58-0.05-1.3-0.05-1.89c0-1.5,0-3.01,0-4.51c0-1.01-0.08-2.05,0-3.06
+		c0.03-0.41,0.12-0.76,0.43-1.05C0.8,9.53,1.17,9.48,1.6,9.47c1.21-0.05,2.44,0,3.66,0C7.91,9.48,10.56,9.48,13.21,9.48z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_city-bus-front.svg b/media/vehicles/buses/bus_city-bus-front.svg
new file mode 100644
index 00000000..1148ae64
--- /dev/null
+++ b/media/vehicles/buses/bus_city-bus-front.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 231.28 245.37" style="enable-background:new 0 0 231.28 245.37;" xml:space="preserve">
+<g id="POLYLINE_566_">
+	<path d="M190.26,218.42c-3.02,0-6.04,0-9.07,0c-7.72,0-15.45,0-23.17,0c-10.34,0-20.69,0-31.03,0c-11.08,0-22.17,0-33.25,0
+		c-9.75,0-19.51,0-29.26,0c-6.39,0-12.79,0-19.18,0c-0.84,0-1.68,0-2.52,0c-0.45,0-1.02-0.09-1.45,0c-0.41,0.09-0.21-0.12-0.32,0.31
+		c-0.13,0.54,0,1.29,0,1.85c0,1.03,0,2.06,0,3.09c0,5.11,0,10.21,0,15.32c0,2.14,0.38,4.69-1.85,5.91c-0.97,0.53-2,0.42-3.06,0.42
+		c-2.52,0-5.04,0-7.55,0c-2.04,0-4.09,0.05-6.14,0c-1-0.03-1.92-0.39-2.6-1.13c-0.68-0.73-0.93-1.63-0.94-2.6
+		c-0.02-1.52,0-3.04,0-4.55c0-5.14,0-10.27,0-15.4c0-1.07,0-2.14,0-3.21c-1.17,0-2.44,0.12-3.45,0.75
+		c-0.88,0.55-1.84,2.47-3.09,2.06c-1.2-0.39-1.24-1.77-1.25-2.8c-0.01-1.28,0-2.56,0-3.84c0-6.35,0-12.7,0.01-19.06
+		c0-7.65,0.01-15.3,0.01-22.95c0-4.56,0-9.12,0-13.68c0-2.91,0.03-5.82,0.05-8.72c0.04-7.43,0.08-14.87,0.12-22.3
+		c0.03-5.92,0.06-11.84,0.1-17.76c0.02-3.95,0.09-7.89,0.18-11.84c0.11-5.23,0.25-10.45,0.49-15.67c0.06-1.43,0.13-2.87,0.19-4.3
+		c-1.07,0.74-2.76,0.76-3.98,0.99c-1.76,0.33-3.63,0.91-5.43,1c-1.01,0.05-1.97-0.49-2.45-1.38c-0.42-0.78-0.32-1.68-0.32-2.53
+		c0-4.79,0-9.59,0-14.38c0-1.33-0.06-2.68,0-4.01c0.07-1.42,1.2-2.67,1.92-3.82c0.35-0.56,1.03-1.3,1.2-1.94
+		c0.17-0.63-0.03-1.56-0.04-2.21c-0.04-2.38-0.09-4.75-0.13-7.13C2.96,42.04,3,41.28,3.64,40.66c0.73-0.7,1.67-0.62,2.61-0.64
+		c1.26-0.02,2.51-0.05,3.77-0.07c0.95-0.02,2.3,0.21,3.21-0.06c0.42-0.12,0.29-0.15,0.31-0.69c0.03-1.06,0.06-2.12,0.09-3.18
+		c0.11-3.73,0.16-7.46,0.4-11.19c0.24-3.69,0.32-8.98,3.61-11.48c1.31-0.99,2.96-1.42,4.55-1.71c3.48-0.62,7.07-0.75,10.59-0.98
+		c7.01-0.45,14.03-0.72,21.05-0.89c6.92-0.17,13.85-0.28,20.77-0.31c4.68-0.02,9.36-0.04,14.03-0.06c0.86,0,1.71-0.01,2.57-0.01
+		c0.54,0,0.55,0.08,0.86-0.3c0.57-0.69,0.95-1.63,1.42-2.41c0.49-0.81,0.97-1.63,1.47-2.43c0.61-0.98,1.23-2.05,2.08-2.85
+		c0.81-0.76,1.81-0.91,2.87-1.02c3.4-0.37,6.86-0.33,10.28-0.36c3.66-0.03,7.31-0.04,10.97,0c3.48,0.03,7.04-0.04,10.5,0.39
+		c1.11,0.14,2.01,0.36,2.8,1.2c0.83,0.87,1.45,1.96,2.08,2.98c0.5,0.8,0.98,1.62,1.47,2.43c0.17,0.29,0.35,0.59,0.52,0.88
+		c0.2,0.34,0.52,1.27,0.86,1.47c0.2,0.12,0.73,0.02,0.96,0.02c0.93,0,1.86,0.01,2.79,0.01c8.04,0.03,16.07,0.08,24.11,0.18
+		c6.84,0.09,13.68,0.22,20.52,0.52c3.78,0.17,7.55,0.34,11.32,0.58c3.43,0.22,6.93,0.35,10.31,1c2.96,0.57,5.32,1.82,6.45,4.72
+		c1.06,2.69,1.24,5.72,1.42,8.57c0.24,3.86,0.29,7.72,0.4,11.58c0.03,0.95-0.04,1.95,0.08,2.9c0.07,0.54,0.02,0.42,0.63,0.43
+		c2.36,0.04,4.72,0.09,7.09,0.13c0.89,0.02,1.7,0.06,2.33,0.79c0.59,0.7,0.52,1.51,0.51,2.37c-0.05,2.43-0.09,4.87-0.13,7.3
+		c-0.01,0.51-0.16,1.25-0.03,1.75c0.22,0.8,1.07,1.71,1.51,2.41c0.66,1.05,1.56,2.08,1.6,3.37c0.06,1.49,0,2.98,0,4.47
+		c0,4.73,0,9.45,0,14.18c0,0.85,0.06,1.68-0.43,2.42c-0.57,0.87-1.57,1.28-2.59,1.17c-1.82-0.2-3.66-0.69-5.46-1.03
+		c-1.14-0.21-2.71-0.24-3.7-0.93c0.23,5.22,0.44,10.44,0.57,15.67c0.13,4.88,0.24,9.77,0.28,14.65c0.02,2.43,0.01,4.86,0.02,7.29
+		c0.02,5.61,0.03,11.23,0.05,16.84c0.02,7.4,0.04,14.8,0.06,22.2c0.02,7.86,0.04,15.72,0.06,23.58c0.02,7,0.04,13.99,0.06,20.99
+		c0.01,4.72,0.03,9.45,0.04,14.17c0.01,1.89,0.27,4.13-0.07,6c-0.27,1.51-1.62,2.01-2.72,0.96c-1.03-0.98-1.77-1.81-3.22-2.08
+		c-0.59-0.11-1.19-0.14-1.79-0.14c0,5.75,0,11.5,0,17.25c0,2.03,0.07,4.08,0,6.11c-0.06,1.63-1.11,3.07-2.73,3.46
+		c-0.64,0.15-1.34,0.08-1.99,0.08c-1.65,0-3.31,0-4.96,0c-3,0-6.03,0.12-9.03,0c-1.51-0.06-2.84-1.05-3.28-2.51
+		c-0.45-1.47-0.15-3.33-0.15-4.83c0-6.37,0-12.74,0-19.12C190.26,218.72,190.26,218.57,190.26,218.42z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_city-bus-side.svg b/media/vehicles/buses/bus_city-bus-side.svg
new file mode 100644
index 00000000..87d73ad1
--- /dev/null
+++ b/media/vehicles/buses/bus_city-bus-side.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1011.72 250.24" style="enable-background:new 0 0 1011.72 250.24;" xml:space="preserve">
+<g id="POLYLINE_569_">
+	<path d="M690.08,222.01c0,1.63,0.68,4.89-1.77,5.07c-0.3,0.02-0.61,0-0.92,0c-2.03,0-4.07,0-6.1,0c-3.74,0-7.48,0-11.22,0
+		c-5.24,0-10.48,0-15.73,0c-6.56,0-13.12,0-19.68,0c-7.63,0-15.26,0-22.89,0c-8.51,0-17.02,0-25.52,0c-9.21,0-18.42,0-27.63,0
+		c-9.68,0-19.36,0-29.03,0c-9.9,0-19.8,0-29.71,0c-9.95,0-19.9,0-29.85,0c-9.82,0-19.64,0-29.47,0c-9.42,0-18.84,0-28.26,0
+		c-8.85,0-17.69,0-26.54,0c-8.09,0-16.17,0-24.26,0c-7.09,0-14.18,0-21.27,0c-5.86,0-11.73,0-17.59,0c-4.46,0-8.92,0-13.37,0
+		c-2.85,0-5.7,0-8.55,0c-1.01,0-2.04,0.07-3.04,0c-2.49-0.17-1.8-3.41-1.8-5.07c-0.71,0.01-1.42,0.02-2.13,0.04
+		c-0.41,0.01-1.65-0.18-1.95,0.08c-0.3,0.26-0.46,1.44-0.59,1.83c-0.23,0.65-0.48,1.3-0.74,1.95c-1.03,2.52-2.33,4.93-3.86,7.18
+		c-3.1,4.56-7.17,8.45-11.87,11.34c-4.5,2.77-9.56,4.62-14.79,5.4c-4.91,0.73-9.97,0.52-14.8-0.62c-5.1-1.2-9.94-3.44-14.17-6.53
+		c-4.35-3.18-8.02-7.26-10.73-11.91c-0.67-1.15-1.29-2.34-1.84-3.56c-0.52-1.14-0.81-2.51-1.42-3.58c-0.23-0.4,0.01-0.2-0.35-0.3
+		c-0.33-0.09-0.81,0.01-1.15,0.02c-0.94,0.02-1.9-0.02-2.84,0.05c-0.6,0.04-0.45,0.11-0.48,0.7c-0.02,0.32-0.05,0.64-0.1,0.95
+		c-0.41,2.43-2.1,3.74-4.52,3.76c-2.43,0.02-4.87,0-7.3,0c-5.34,0-10.68,0-16.02,0c-7.3,0-14.6,0-21.9,0c-8.22,0-16.43,0-24.65,0
+		c-8.21,0-16.42,0-24.62,0c-7.15,0-14.3,0-21.45,0c-5.16,0-10.32,0-15.48,0c-2.14,0-4.29,0-6.43,0c-2.3,0-4.62,0.19-6.92-0.02
+		c-2.89-0.26-5.77-0.71-8.65-1.07c-5.45-0.68-10.9-1.4-16.34-2.16c-1.6-0.23-3.69-0.3-5.07-1.26c-1.13-0.79-1.68-2.33-2.01-3.61
+		c-0.56-2.17-0.5-4.42-0.43-6.63c0.03-0.92-0.03-1.92,0.2-2.82c0.18-0.7,0.49-1.31,0.6-2.03c0.12-0.8,0.07-1.74,0.42-2.5
+		c0.32-0.71,0.96-0.74,1.67-0.74c-0.27-4.99-0.56-9.99-0.74-14.99c-0.18-5.2-0.32-10.41-0.42-15.61
+		c-0.09-5.15-0.15-10.31-0.17-15.47c-0.02-5.2-0.03-10.4,0.08-15.59c0.1-5.18,0.32-10.36,0.61-15.53c0.27-4.94,0.66-9.88,1.08-14.81
+		c0.44-5.18,0.94-10.36,1.49-15.54c0.54-5.07,1.14-10.14,1.81-15.2c0.69-5.21,1.43-10.41,2.28-15.59
+		c0.83-5.05,1.78-10.08,2.85-15.09c0.25-1.18,0.52-2.36,0.78-3.53c-6.82-0.15-13.63-0.31-20.45-0.46c-0.98-0.02-1.96-0.04-2.94-0.07
+		c1.74,0.5,3.43,1.25,4.94,2.24c0.3,0.19,0.58,0.4,0.87,0.61c0.42,0.32,0.63,0.35,0.45,0.86c-0.16,0.47-0.47,0.91-0.72,1.33
+		c-0.99,1.65-2.03,3.3-3.1,4.9c-0.54,0.8-1.28,2.05-2.39,1.97c-0.38-0.03-0.74-0.22-1.07-0.42c-0.41-0.24-0.62-0.62-0.94-0.07
+		c-0.15,0.27-0.19,0.69-0.28,0.98c-0.23,0.82-0.46,1.63-0.69,2.45c-1.5,5.31-3.01,10.62-4.51,15.92c-0.45,1.59-0.83,3.22-1.36,4.79
+		c-0.31,0.92-1,1.6-2.02,1.56c-1.19-0.05-2.41-0.65-3.48-1.1c-1.33-0.57-2.74-1.16-3.93-1.99c-1.97-1.37-1.02-3.75-0.49-5.63
+		c1.46-5.16,2.93-10.32,4.39-15.49c0.28-0.99,0.56-1.98,0.84-2.98c0.13-0.47,0.43-1.08,0.45-1.58c0.03-0.92-0.36-1.66-0.03-2.62
+		c0.21-0.63,0.76-0.8,1.08-1.33c0.28-0.45,0.19-0.91,0.06-1.39c-0.29-1.04-0.96-2.2,0.09-3.02c0.31-0.24,0.69-0.4,1.04-0.55
+		c-0.54-0.58-0.43-2.01-0.28-2.69c0.11-0.55,0.49-0.82,1.03-0.89c1.71-0.22,3.54-0.08,5.26-0.12c6.95-0.16,13.9-0.31,20.85-0.47
+		c1.87-0.04,3.74-0.08,5.61-0.13c-0.19-7.86-0.39-15.72-0.58-23.58c-0.04-1.65-0.46-3.96,0.21-5.54c1-2.36,4.63-1.85,6.65-1.96
+		c2.01-0.1,4.03-0.27,6.04-0.3c0.97-0.01,2.03,0.16,2.64,1c2.13-1.66,4.76-1.86,7.36-1.87c4.72-0.01,9.44-0.02,14.17-0.02
+		c8.61-0.01,17.21-0.03,25.82-0.04c10.93-0.02,21.87-0.04,32.8-0.06c11.59-0.02,23.19-0.04,34.78-0.06
+		c10.68-0.02,21.37-0.04,32.06-0.05c8.18-0.01,16.36-0.03,24.53-0.04c4.07-0.01,8.14-0.01,12.21-0.02c0.13,0,0.45,0.06,0.57,0
+		c0.73-0.38,0.85-1.92,1.57-2.32c0.08-0.05,0.23,0,0.32-0.01c0.79-0.14,1.74,0,2.54,0c1.57,0,3.13-0.01,4.7-0.01
+		c10.35-0.02,20.7-0.04,31.04-0.06c9.72-0.02,19.43-0.03,29.15-0.05c1.21,0,2.42,0,3.63-0.01c0.33,0,0.96-0.12,1.25,0.03
+		c0.74,0.38,0.86,2,1.64,2.29c0.15,0.06,0.44,0,0.6,0c2.59,0,5.17-0.01,7.76-0.01c5.14-0.01,10.28-0.02,15.42-0.03
+		c7.27-0.01,14.54-0.03,21.82-0.04c8.98-0.01,17.96-0.03,26.95-0.05c10.27-0.02,20.54-0.04,30.81-0.05
+		c11.14-0.02,22.27-0.04,33.41-0.06c11.58-0.02,23.16-0.04,34.74-0.06c11.6-0.02,23.21-0.04,34.81-0.06
+		c11.24-0.02,22.47-0.04,33.71-0.06c10.38-0.02,20.76-0.04,31.14-0.05c9.16-0.02,18.32-0.03,27.48-0.05
+		c7.47-0.01,14.93-0.03,22.4-0.04c5.38-0.01,10.76-0.02,16.14-0.03c2.87,0,5.74-0.01,8.61-0.01c0.32,0,0.85,0.09,1.12-0.06
+		c0.71-0.4,0.83-1.9,1.54-2.28c0.09-0.05,0.3,0.01,0.41,0c0.88-0.09,1.82,0,2.7,0c9.1-0.02,18.21-0.03,27.32-0.05
+		c10.73-0.02,21.45-0.04,32.18-0.06c2.96,0,5.91-0.01,8.87-0.02c0.53,0,0.89-0.1,1.25,0.2c0.65,0.54,0.82,1.89,1.63,2.13
+		c0.32,0.1,0.82,0,1.16,0c0.71,0,1.41,0,2.12,0c2.31,0,4.62-0.01,6.93-0.01c7.55-0.01,15.09-0.03,22.64-0.04
+		c10.25-0.02,20.49-0.04,30.74-0.05c11.5-0.02,23-0.04,34.5-0.06c11.31-0.02,22.62-0.04,33.93-0.06c9.68-0.02,19.35-0.03,29.03-0.05
+		c6.6-0.01,13.19-0.02,19.79-0.03c1.7,0,3.4-0.01,5.09-0.01c0.28,0,0.82,0.11,1.09,0c0.5-0.2,0.77-1.55,1.02-2.1
+		c1.47-3.26,3.87-7.21,7.81-7.68c2.36-0.28,4.85-0.04,7.22-0.04c5.54,0,11.08,0,16.62,0c2.28,0,4.56,0,6.83,0c0.77,0,1.54,0,2.31,0
+		c0.3,0,0.99-0.13,1.27,0c0.25,0.12,0.17,0.1,0.17,0.53c0,1.09,0,2.17,0,3.26c0,1.98,0,3.97,0,5.95c8.65-0.01,17.31-0.07,25.96-0.04
+		c3.55,0.01,7.22,0.61,9.12,3.93c1.09,1.91,1.1,4.27,1.33,6.39c0.39,3.75,0.51,7.55,0.69,11.32c0.45,9.47,0.77,18.94,1.11,28.41
+		c0.23,6.31,0.38,12.63,0.54,18.94c0.31,11.59,0.61,23.18,0.92,34.77c0.12,4.67,0.2,9.34,0.26,14.01
+		c0.15,11.73,0.31,23.46,0.46,35.18c0.06,4.92,0.13,9.85,0.19,14.77c0.02,1.34,0.04,2.69,0.05,4.03c0,0.14-0.08,0.69,0.01,0.81
+		c0.11,0.15,0.76,0.07,1.04,0.2c0.94,0.44,0.81,1.44,0.81,2.3c0,2.38,0,4.75,0,7.13c0,5.22,0,10.43,0,15.65
+		c0,1.82-0.13,3.43-1.34,4.9c-1.08,1.31-2.61,2.23-4.2,2.77c-1.56,0.53-3.25,0.65-4.88,0.86c-3.7,0.48-7.41,0.97-11.11,1.45
+		c-11.88,1.55-23.76,3.1-35.64,4.65c-9.2,1.2-18.41,2.4-27.61,3.6c-3.75,0.49-7.47,0.68-11.25,0.68c-6.97,0-13.94,0-20.92,0
+		c-11.42,0-22.84,0-34.26,0c-12.52,0-25.04,0-37.55,0c-10.04,0-20.09,0-30.13,0c-4.2,0-8.42,0.09-12.62,0
+		c-1.14-0.02-2.25-0.35-2.87-1.38c-0.63-1.05-0.54-2.34-0.54-3.52c-1.09,0-2.17,0.01-3.26,0.01c-0.54,0-1.22-0.11-1.75,0.01
+		c-0.43,0.1-0.37,0.16-0.51,0.64c-0.56,1.86-1.27,3.69-2.1,5.45c-1.39,2.94-3.15,5.7-5.22,8.21c-4.13,5-9.5,8.94-15.51,11.38
+		c-6.85,2.78-14.47,3.58-21.75,2.26c-7.59-1.38-14.7-5.02-20.26-10.38c-2.85-2.75-5.28-5.93-7.18-9.4c-0.93-1.69-1.73-3.45-2.4-5.26
+		c-0.15-0.42-0.3-0.84-0.44-1.26c-0.09-0.26-0.23-1.22-0.42-1.34c-0.16-0.1-0.69,0-0.89,0c-0.73,0-1.45,0.01-2.18,0.01
+		C691.99,222,691.04,222,690.08,222.01z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_city-bus-top.svg b/media/vehicles/buses/bus_city-bus-top.svg
new file mode 100644
index 00000000..1a6fea4c
--- /dev/null
+++ b/media/vehicles/buses/bus_city-bus-top.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 245.77 980.21" style="enable-background:new 0 0 245.77 980.21;" xml:space="preserve">
+<g id="POLYLINE_570_">
+	<path d="M18.31,13.08c0-2.82,0.21-5.37,1.75-7.81c1.34-2.11,3.36-3.74,5.71-4.59C27.38,0.1,29,0,30.67,0c2.85,0,5.69,0,8.54,0
+		c5.22,0,10.44,0,15.66,0c6.98,0,13.96,0,20.94,0c8.13,0,16.26,0,24.39,0c8.66,0,17.33,0,25.99,0c8.59,0,17.17,0,25.76,0
+		c7.9,0,15.79,0,23.69,0c6.6,0,13.19,0,19.78,0c4.68,0,9.36,0,14.04,0c2.15,0,4.31-0.01,6.46,0c2.02,0.01,3.98,0.45,5.75,1.44
+		c2.18,1.22,3.92,3.17,4.9,5.47c0.45,1.07,0.74,2.2,0.84,3.36c0.03,0.28,0.04,0.55,0.05,0.83c0.01,0.39-0.23,1.75,0,1.98
+		c0.08,0.08,0.69,0,0.8,0c0.7,0,1.39,0,2.09,0c3.89,0,7.78,0,11.67,0c1.48,0,3.46-0.2,3.65,1.8c0.11,1.09,0,2.25,0,3.35
+		c0,2.08,0,4.17,0,6.25c0,1.5,0.61,4.46-1.41,5.01c-1.26,0.34-2.87,0.07-4.16,0.07c-0.32,0-1.47-0.19-1.73,0
+		c-0.09,0.07-0.15,0.46-0.18,0.57c-1.02,3.13-2.03,6.25-3.04,9.38c-1.19,3.66-2.37,7.31-3.56,10.97c-0.16,0.48-0.72,1.49-0.65,2.01
+		c0.04,0.29,0.4,0.69,0.5,0.99c0.12,0.36,0.17,0.74,0.17,1.13c-0.03,2.15-2.03,3.81-4.15,3.45c0,0.7,0,1.4,0,2.1
+		c0,2.03,0,4.06,0,6.09c0,3.28,0,6.56,0,9.84c0,4.46,0,8.91,0,13.37c0,5.55,0,11.1,0,16.65c0,6.57,0,13.13,0,19.7
+		c0,7.5,0,15.01,0,22.52c0,8.37,0,16.73,0,25.1c0,9.15,0,18.29,0,27.44c0,9.85,0,19.7,0,29.55c0,10.48,0,20.95,0,31.43
+		c0,11.05,0,22.1,0,33.15c0,11.52,0,23.04,0,34.57c0,11.88,0,23.76,0,35.64c0,12.19,0,24.39,0,36.58c0,12.42,0,24.85,0,37.27
+		c0,12.58,0,25.16,0,37.74c0,12.66,0,25.31,0,37.96c0,12.65,0,25.3,0,37.96c0,12.57,0,25.14,0,37.71c0,12.41,0,24.82,0,37.23
+		c0,12.17,0,24.35,0,36.52c0,11.89,0,23.78,0,35.66c0,11.49,0,22.98,0,34.47c0,10.99,0,21.97,0,32.96c0,10.43,0,20.87,0,31.3
+		c0,9.8,0,19.61,0,29.41c0,9.1,0,18.19,0,27.29c0,8.31,0,16.62,0,24.93c0,7.44,0,14.89,0,22.33c0,6.5,0,13,0,19.5
+		c0,5.48,0,10.95,0,16.43c0,4.38,0,8.75,0,13.13c0,3.2,0,6.4,0,9.59c0,1.95,0,3.9,0,5.84c0,0.87,0.03,1.76-0.03,2.63
+		c-0.33,4.56-3.49,8.57-7.85,9.96c-2.66,0.85-5.71,0.54-8.46,0.54c-6.93,0-13.86,0-20.79,0c-10.59,0-21.19,0-31.78,0
+		c-12.39,0-24.78,0-37.17,0c-12.32,0-24.63,0-36.95,0c-10.37,0-20.74,0-31.12,0c-6.56,0-13.12,0-19.68,0c-2.85,0-5.75,0.24-8.44-0.9
+		c-4.17-1.77-6.85-5.92-6.9-10.42c-0.01-0.71,0-1.43,0-2.14c0-2.04,0-4.08,0-6.13c0-3.29,0-6.59,0-9.88c0-4.47,0-8.93,0-13.4
+		c0-5.56,0-11.12,0-16.68c0-6.58,0-13.15,0-19.73c0-7.52,0-15.03,0-22.54c0-8.37,0-16.75,0-25.12c0-9.16,0-18.31,0-27.47
+		c0-9.86,0-19.72,0-29.57c0-10.51,0-21.02,0-31.53c0-11.06,0-22.12,0-33.17c0-11.5,0-22.99,0-34.49c0-11.89,0-23.77,0-35.65
+		c0-12.2,0-24.39,0-36.59c0-12.43,0-24.85,0-37.28c0-12.58,0-25.16,0-37.74c0-12.66,0-25.31,0-37.97c0-12.65,0-25.3,0-37.95
+		c0-12.57,0-25.14,0-37.71c0-12.41,0-24.82,0-37.23c0-12.17,0-24.34,0-36.51c0-11.92,0-23.83,0-35.74c0-11.46,0-22.91,0-34.37
+		c0-10.98,0-21.96,0-32.94c0-10.43,0-20.86,0-31.29c0-9.8,0-19.6,0-29.39c0-9.09,0-18.18,0-27.26c0-8.3,0-16.6,0-24.9
+		c0-7.43,0-14.87,0-22.3c0-6.49,0-12.98,0-19.47c0-5.47,0-10.93,0-16.4c0-4.37,0-8.73,0-13.1c0-3.2,0-6.4,0-9.6
+		c0-1.92,0-3.84,0-5.76c0-0.59,0-1.18,0-1.76c-2.01,0.33-3.95-1.13-4.14-3.17c-0.07-0.79,0.17-1.4,0.46-2.11
+		c0.23-0.54,0-0.88-0.2-1.48c-2.11-6.5-4.22-12.99-6.33-19.49c-0.16-0.49-0.32-0.97-0.47-1.46c-0.05-0.15-0.11-0.62-0.24-0.73
+		c-0.17-0.14-0.66-0.05-0.9-0.05c-0.92,0-1.85,0-2.78,0c-1.55,0-3.5,0.15-3.64-1.91c-0.2-3.11,0-6.29,0-9.4
+		c0-1.41-0.57-4.1,1.01-4.94c0.53-0.29,1.14-0.22,1.72-0.22c1.53,0,3.06,0,4.59,0c3.41,0,6.82,0,10.23,0
+		C17.87,13.08,18.09,13.08,18.31,13.08z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_coach-bus-front.svg b/media/vehicles/buses/bus_coach-bus-front.svg
new file mode 100644
index 00000000..6480421a
--- /dev/null
+++ b/media/vehicles/buses/bus_coach-bus-front.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 242.96 302.46" style="enable-background:new 0 0 242.96 302.46;" xml:space="preserve">
+<g id="POLYLINE_797_">
+	<path d="M189.12,268.29c-6.06,0-12.13,0-18.19,0c-11.01,0-22.02,0-33.03,0c-5.5,0-11,0-16.5,0c-6.58,0-13.17,0-19.75,0
+		c-11.04,0-22.07,0-33.11,0c-3.83,0-7.66,0-11.49,0c-0.92,0-1.86-0.04-2.78,0c-0.56,0.03-0.44,0.01-0.44,0.64
+		c0,9.18,0,18.36,0,27.54c0,2.27-0.15,4.52-2.56,5.59c-0.98,0.44-2,0.35-3.05,0.35c-2.57,0-5.13,0-7.7,0c-2.26,0-4.51,0-6.77,0
+		c-1.06,0-2.02-0.21-2.88-0.88c-1.99-1.54-1.68-3.93-1.68-6.15c0-5.09,0-10.18,0-15.27c0-2.51,0-5.02,0-7.54c0-0.9,0-1.8,0-2.7
+		c0-0.36,0.15-1.12,0-1.45c-0.14-0.29-0.3-0.2-0.7-0.25c-0.46-0.06-0.94-0.14-1.35-0.39c-0.63-0.38-0.98-1.08-1.24-1.74
+		c-1.18-2.97-1.39-6.45-1.75-9.6c-0.75-6.42-1.11-12.9-1.39-19.36c-0.42-9.86-0.85-19.73-1.27-29.59
+		c-0.28-6.61-0.45-13.22-0.55-19.84c-0.11-7.62-0.07-15.25,0.03-22.87c0.1-7.48,0.3-14.97,0.53-22.45
+		c0.23-7.62,0.49-15.24,0.84-22.85c0.36-8.01,0.84-16.02,1.32-24.02c0.19-3.07,0.43-6.14,0.66-9.21c0.21-2.78,0.41-5.55,0.62-8.33
+		c0.08-1.13,0.17-2.26,0.25-3.39c0.04-0.57,0.23-1.33,0.14-1.9c-0.01-0.07,0.05-0.22,0.02-0.28c-0.11-0.21-1-0.5-1.24-0.62
+		c-0.61-0.29-1.23-0.57-1.87-0.79c-0.77-0.27-1.72-0.57-2.48-0.16c-0.97,0.52-1.37,1.85-1.73,2.81c-0.39,1.07-0.72,2.18-1.5,3.04
+		c-1.01,1.11-2.49,1.46-3.93,1.46c3.84,0.02,2.93,5.17,2.93,7.59c0,6.61,0,13.23,0,19.84c0,1.23,0.03,2.41-0.97,3.31
+		c-1.31,1.18-3.55,0.75-5.14,0.75c-1.77,0-3.54,0-5.3,0c-0.7,0-1.45,0.07-2.12-0.15c-1.3-0.44-1.99-1.64-1.99-2.97
+		c0.03-5.98,0.39-11.98,0.58-17.96c0.08-2.44,0.14-4.88,0.24-7.32c0.05-1.23,0.59-2.34,1.78-2.85c0.81-0.35,1.74-0.24,2.59-0.24
+		c0.33,0,1.44,0.16,1.64-0.06c0.12-0.13,0.07-0.72,0.08-0.89c0.05-0.51,0.1-1.02,0.14-1.53c0.23-2.44,0.51-4.87,0.86-7.3
+		c0.53-3.65,0.98-7.96,2.97-11.16c0.99-1.59,2.85-2.74,4.71-2.99c2.78-0.37,5.68,1.14,8.04,2.39c1.01,0.54,2,1.11,2.98,1.7
+		c0.9-8.18,1.75-16.62,4.54-24.42c1.21-3.37,2.85-6.58,5.1-9.37c2.38-2.96,5.35-5.39,8.52-7.46c6.99-4.56,14.96-7.58,22.94-9.87
+		C75.85,4.8,84.2,3.22,92.58,2.09c8.62-1.16,17.3-1.89,26-2.06c8.59-0.17,17.21,0.38,25.75,1.31c8.43,0.91,16.83,2.27,25.07,4.26
+		c8.14,1.97,16.21,4.58,23.66,8.45c6.74,3.5,12.99,8.16,16.62,14.99c3.68,6.92,4.92,15.06,5.88,22.74c0.27,2.16,0.52,4.31,0.75,6.47
+		c2.93-1.76,6.32-3.9,9.83-4.12c1.89-0.12,3.94,0.72,5.22,2.12c2.03,2.2,2.55,5.76,3.08,8.57c0.44,2.33,0.77,4.69,1.03,7.04
+		c0.15,1.31,0.29,2.62,0.41,3.93c0.04,0.42-0.07,1.96,0.21,2.26c0.2,0.21,1.42,0.04,1.73,0.04c1.61,0,3.24,0.02,4.01,1.71
+		c0.54,1.2,0.32,2.9,0.36,4.16c0.22,6.77,0.44,13.54,0.66,20.31c0.04,1.24,0.33,2.77-0.35,3.9c-0.87,1.43-2.35,1.41-3.83,1.41
+		c-2.8,0-5.67,0.19-8.47,0c-1.45-0.1-2.64-1.2-2.78-2.66c-0.17-1.69-0.01-3.46-0.01-5.16c0-3.69,0-7.39,0-11.08c0-2.9,0-5.8,0-8.7
+		c0-1.21,0.03-2.36,1.05-3.21c0.52-0.44,1.19-0.68,1.87-0.68c-0.85,0-1.73-0.11-2.52-0.45c-1.52-0.66-2.19-2.04-2.72-3.51
+		c-0.48-1.33-1.04-3.55-2.8-3.54c-0.58,0-1.17,0.2-1.71,0.39c-0.48,0.17-0.96,0.38-1.42,0.59c-0.33,0.15-1.42,0.48-1.58,0.78
+		c-0.21,0.38,0.13,1.7,0.16,2.12c0.12,1.67,0.25,3.34,0.37,5.01c0.28,3.8,0.56,7.59,0.84,11.39c0.37,5.01,0.66,10.02,0.95,15.03
+		c0.28,4.74,0.52,9.48,0.71,14.22c0.21,5.33,0.46,10.65,0.63,15.98c0.17,5.46,0.36,10.93,0.47,16.39c0.11,5.65,0.24,11.3,0.28,16.96
+		c0.04,5.39,0.1,10.77,0.02,16.16c-0.08,5.72-0.17,11.43-0.38,17.14c-0.18,5.14-0.44,10.28-0.66,15.42
+		c-0.29,6.64-0.57,13.27-0.85,19.91c-0.2,4.59-0.48,9.17-0.88,13.75c-0.22,2.55-0.49,5.1-0.85,7.64c-0.31,2.17-0.55,4.48-1.36,6.54
+		c-0.44,1.13-1.09,1.92-2.35,2.13c-0.16,0.03-0.86-0.01-0.95,0.09c-0.05,0.05,0.01,0.32,0,0.38c-0.11,0.92,0,1.93,0,2.86
+		c0,7.34,0,14.67,0,22.01c0,3.17,0.79,7.99-3.45,8.85c-0.72,0.15-1.5,0.07-2.23,0.07c-1.72,0-3.44,0-5.16,0c-3.2,0-6.42,0.1-9.62,0
+		c-1.76-0.05-3.34-1.18-3.94-2.85c-0.45-1.27-0.25-2.82-0.25-4.13c0-7.31,0-14.63,0-21.94
+		C189.12,271.75,189.12,270.02,189.12,268.29z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_coach-bus-side.svg b/media/vehicles/buses/bus_coach-bus-side.svg
new file mode 100644
index 00000000..081cf965
--- /dev/null
+++ b/media/vehicles/buses/bus_coach-bus-side.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 964.98 302.43" style="enable-background:new 0 0 964.98 302.43;" xml:space="preserve">
+<g id="POLYLINE_798_">
+	<path d="M658.56,270.1c0,1.86,0,3.71,0,5.56c-1.3-0.01-2.6,0-3.9-0.17c-1.14-0.15-2.22-0.51-3.33-0.79
+		c-2.71-0.69-5.55-0.82-8.33-0.9c-2.45-0.07-4.91-0.05-7.36-0.05c-4.7,0-9.39,0-14.09,0c-7.22,0-14.43,0-21.65,0
+		c-8.79,0-17.58,0-26.36,0c-9.41,0-18.82,0-28.23,0c-9.08,0-18.16,0-27.24,0c-7.8,0-15.61,0-23.41,0c-5.58,0-11.16,0-16.74,0
+		c-2.4,0-4.81,0-7.21,0c-1.53,0-3.05,0-4.58,0c-4.8,0-9.6,0-14.4,0c-7.24,0-14.47,0-21.71,0c-8.77,0-17.54,0-26.31,0
+		c-9.4,0-18.81,0-28.21,0c-9.14,0-18.27,0-27.41,0c-7.97,0-15.94,0-23.91,0c-5.9,0-11.81,0-17.71,0c-2.94,0-5.88,0-8.81,0
+		c-4.14,0-8.46-0.07-12.49,1c-2.39,0.63-4.54,0.89-7.01,0.9c0-1.18,0-2.36,0-3.54c0-0.31,0.22-1.8,0-2.02
+		c-0.15-0.15-1.16-0.01-1.36-0.01c-0.88,0-1.76,0-2.64,0c-0.29,0-1.15-0.14-1.37,0.03c-0.24,0.19-0.38,1.26-0.48,1.56
+		c-0.15,0.46-0.31,0.92-0.47,1.37c-1.45,4-3.46,7.79-5.98,11.22c-2.56,3.48-5.63,6.59-9.08,9.19c-3.39,2.56-7.15,4.62-11.13,6.11
+		c-3.72,1.4-7.64,2.29-11.6,2.65c-4.11,0.37-8.28,0.17-12.33-0.61c-4.05-0.77-7.99-2.11-11.67-3.97c-3.83-1.93-7.38-4.42-10.49-7.36
+		c-3.12-2.95-5.82-6.35-7.97-10.06c-1.05-1.82-1.98-3.71-2.77-5.67c-0.38-0.95-0.73-1.92-1.05-2.89c-0.1-0.31-0.24-1.38-0.48-1.56
+		c-0.22-0.17-1.09-0.03-1.37-0.03c-1.34,0-2.67,0-4.01,0c0,0,0,5.04,0,5.56c-2.52-0.01-4.69-0.3-7.13-0.93
+		c-2.59-0.67-5.29-0.82-7.95-0.91c-3.3-0.11-6.61-0.06-9.92-0.06c-6.57,0-13.15,0-19.72,0c-8.99,0-17.97,0-26.96,0
+		c-8.63,0-17.25,0-25.88,0c-5.6,0-11.19,0-16.79,0c-3.92,0-7.84-0.02-11.75-0.21c-5.76-0.27-11.53-0.8-17.18-1.95
+		c-5.25-1.07-10.61-2.65-15.07-5.7c-4.34-2.98-7.09-7.48-8.83-12.38c-1.65-4.66-1.43-9.61-1.43-14.48c0-8.22,0-16.43,0-24.65
+		c0-1.91-0.05-3.83,0.06-5.73c0.04-0.72,0.05-1.57,0.71-2.01c0.84-0.55,2.11-0.56,3.06-0.81c0.48-0.13,1.55-0.26,1.91-0.6
+		c0.24-0.23,0.15-0.8,0.16-1.17c0.07-2.09,0.15-4.18,0.22-6.28c0.1-2.86,0.23-5.72,0.37-8.57c0.31-6.39,0.71-12.77,1.18-19.15
+		c0.43-5.91,1.03-11.81,1.71-17.7c0.7-6.05,1.55-12.08,2.59-18.08c1.02-5.87,2.21-11.72,3.64-17.5c1.51-6.14,3.2-12.23,4.92-18.31
+		c1.7-6.03,3.51-12.02,5.37-18c0.79-2.54,1.65-5.06,2.5-7.57c-6.43,0-12.81,0.14-19.04,1.91c-4.87,1.38-10.27,3.78-13.23,8.09
+		c-0.46,0.67-0.86,1.4-1.07,2.18c-0.11,0.4-0.21,0.79,0.03,1.08c0.27,0.34,0.62,0.5,0.84,0.93c0.92,1.79,0.87,4.16,0.98,6.11
+		c0.17,3.22,0.19,6.44,0.14,9.66c-0.05,3.1-0.1,6.24-0.52,9.32c-0.2,1.45-0.44,4.04-2.32,4.18c-1.43,0.11-2.86-0.15-4.16-0.76
+		c-1.39-0.65-2.73-1.56-3.06-3.15c-0.44-2.11-0.16-4.55-0.16-6.68c0-4.23,0-8.47-0.01-12.7c0-2.82-0.04-5.65,0.24-8.46
+		C0.89,78.84,3.45,74,7.41,69.77c4.07-4.35,8.82-7.34,14.61-8.83c5.88-1.51,11.95-1.68,17.99-1.68c2.11,0,4.39,0.26,6.48,0
+		c0.09-0.01,0.35,0.05,0.43,0c0.23-0.15,0.38-0.87,0.49-1.12c0.33-0.74,0.66-1.47,1.01-2.2c1.36-2.9,2.85-5.73,4.52-8.46
+		c3.16-5.17,7-9.93,11.63-13.86C69,29.84,74,26.87,79.48,24.89c6.01-2.17,12.34-3.41,18.63-4.42c3.11-0.5,6.2-1.17,9.32-1.57
+		c3.2-0.41,6.39-0.47,9.62-0.47c0.8,0,0.63-0.08,0.82-0.77c0.11-0.4,0.28-0.79,0.49-1.15c0.22-0.38,0.49-0.73,0.78-1.06
+		c1.31-1.43,3.13-2.35,4.9-3.08c5.99-2.51,12.62-3.56,18.97-4.72c6.53-1.2,13.1-2.21,19.67-3.1c6.67-0.91,13.37-1.64,20.07-2.25
+		c6.29-0.58,12.61-1.04,18.92-1.36c6.8-0.34,13.6-0.62,20.41-0.77C227.49,0.05,232.92,0,238.35,0c4.11,0,8.21,0,12.32,0
+		c8.02,0,16.04,0,24.07,0c9.91,0,19.82,0,29.73,0c9.66,0,19.32,0,28.99,0c7.38,0,14.76,0,22.14,0c3.03,0,6.06-0.01,9.1,0
+		c6.06,0.02,12.13,0.68,17.94,2.43c5.64,1.7,10.94,4.47,15.43,8.29c2.18,1.86,4.16,3.96,5.93,6.22c0.33,0.42,0.77,1.31,1.23,1.48
+		c0.31,0.12,0.91,0,1.24,0c0.6,0,1.2,0,1.8,0c0.35,0,1.07,0.14,1.4,0c0.34-0.15,0.16,0.12,0.24-0.39c0.12-0.72-0.1-1.48,0.03-2.2
+		c0.27-1.42,1.5-1.68,2.71-1.68c2.24,0,4.49,0,6.73,0c8.81,0,17.62,0,26.43,0c9.29,0,18.57,0,27.86,0c2.84,0,5.68,0,8.52,0
+		c1.01,0,2.12-0.11,3.11,0.12c1.7,0.41,3.03,1.83,3.33,3.55c0.09,0.51-0.05,0.47,0.3,0.59c0.32,0.11,0.86,0,1.19,0
+		c4.46,0,8.93,0,13.39,0c7.85,0,15.7,0,23.56,0c9.73,0,19.46,0,29.19,0c9.98,0,19.97,0,29.96,0c8.72,0,17.44,0,26.16,0
+		c5.9,0,11.8,0,17.7,0c1.41,0,2.81,0,4.22,0c0.11,0,0.61,0.08,0.7,0c0.18-0.16,0.02-1.48,0.02-1.75c0-0.41-0.01-0.81,0.14-1.19
+		c0.51-1.35,1.77-1.32,2.95-1.32c2.46,0,4.91,0,7.37,0c8.98,0,17.97,0,26.95,0c9.17,0,18.34,0,27.51,0c2.64,0,5.28,0,7.92,0
+		c0.99,0,2.02-0.09,2.97,0.24c0.99,0.34,1.85,1.04,2.38,1.94c0.17,0.29,0.31,0.61,0.41,0.93c0.08,0.26,0.06,0.72,0.18,0.95
+		c0.2,0.36,0.9,0.19,1.4,0.19c3.68,0,7.36,0,11.04,0c6.62,0,13.23,0,19.85,0c8.66,0,17.32,0,25.98,0c9.85,0,19.69,0,29.54,0
+		c10.1,0,20.21,0,30.31,0c9.43,0,18.86,0,28.29,0c7.9,0,15.79,0,23.69,0c5.47,0,10.94,0,16.41,0c2.15,0,4.3,0,6.46,0
+		c6.34,0.01,12.7-0.06,19.02,0.46c6.04,0.49,12.21,1.69,16.93,5.76c4.55,3.92,7.49,9.55,9.79,15c2.54,5.99,4.35,12.28,5.8,18.61
+		c1.4,6.15,2.44,12.4,3.15,18.66c0.75,6.57,1.29,13.15,1.6,19.76c0.33,7,0.51,14.01,0.6,21.01c0.09,6.86,0.05,13.73,0.04,20.59
+		c-0.01,6.37-0.31,12.63-1.01,18.96c-0.66,5.99-1.13,11.97-1.13,18c0,6.33,0,12.67,0,19.01c0,8.4,0,16.8,0,25.2c0,3.4,0,6.8,0,10.19
+		c0,0.13-0.09,0.68,0,0.79c0.2,0.24,1.37,0.02,1.75,0.05c0.79,0.06,1.43,0.52,1.57,1.33c0.27,1.54,0.02,3.32,0.02,4.88
+		c0,1.61,0.04,3.22-0.02,4.83c-0.1,2.73-0.64,5.48-1.9,7.92c-2.61,5.07-7.86,7.68-13.23,8.81c-5.15,1.09-10.44,1.68-15.64,2.5
+		c-5.99,0.94-11.98,1.88-17.97,2.82c-9.72,1.53-19.45,3.05-29.17,4.58c-7.86,1.23-15.72,2.47-23.59,3.7
+		c-4.24,0.67-8.46,1.28-12.75,1.55c-5.3,0.33-10.61,0.38-15.92,0.38c-7.17,0-14.34,0-21.51,0c-9.58,0-19.16,0-28.73,0
+		c-4.75,0-9.52-0.1-14.27,0.05c-2.73,0.09-5.51,0.22-8.17,0.91c-1.11,0.29-2.18,0.64-3.33,0.78c-1.28,0.16-2.57,0.15-3.85,0.16
+		c0-1.18,0-2.36,0-3.54c0-0.31,0.22-1.8,0-2.02c-0.15-0.15-1.16-0.01-1.36-0.01c-0.88,0-1.76,0-2.64,0c-0.29,0-1.15-0.14-1.37,0.03
+		c-0.24,0.19-0.38,1.26-0.48,1.56c-0.15,0.46-0.31,0.92-0.47,1.37c-1.45,4-3.47,7.79-5.98,11.22c-2.56,3.48-5.63,6.59-9.08,9.19
+		c-3.39,2.56-7.15,4.62-11.13,6.11c-3.72,1.4-7.64,2.29-11.6,2.65c-4.11,0.37-8.28,0.17-12.33-0.61c-4.05-0.77-7.99-2.11-11.67-3.97
+		c-3.83-1.93-7.38-4.42-10.49-7.36c-3.12-2.95-5.82-6.35-7.97-10.06c-1.05-1.82-1.98-3.71-2.77-5.67c-0.38-0.95-0.73-1.92-1.05-2.89
+		c-0.1-0.31-0.24-1.38-0.48-1.56c-0.22-0.17-1.09-0.03-1.37-0.03C661.23,270.1,659.9,270.1,658.56,270.1z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_coach-bus-top.svg b/media/vehicles/buses/bus_coach-bus-top.svg
new file mode 100644
index 00000000..003102a5
--- /dev/null
+++ b/media/vehicles/buses/bus_coach-bus-top.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 220.8 951.62" style="enable-background:new 0 0 220.8 951.62;" xml:space="preserve">
+<g id="POLYLINE_801_">
+	<path d="M7,153.42c-0.01-2.18-0.01-4.36-0.02-6.54c-0.01-5.42-0.03-10.84-0.04-16.26c-0.02-6.98-0.04-13.95-0.05-20.93
+		C6.86,102.85,6.85,96,6.83,89.15C6.81,84.12,6.8,79.09,6.79,74.06c-0.01-2.33-0.02-4.66,0.03-7c0.09-4.61,0.33-9.21,0.97-13.78
+		c0.65-4.65,1.74-9.25,3.35-13.66c1.53-4.21,3.51-8.27,6.03-11.98c2.32-3.41,5.1-6.49,8.33-9.07c3.44-2.75,7.32-4.91,11.36-6.67
+		c4.2-1.83,8.56-3.26,12.97-4.48c4.58-1.27,9.21-2.33,13.88-3.26c4.54-0.9,9.13-1.61,13.72-2.19c4.79-0.61,9.6-1.03,14.41-1.37
+		c4.64-0.32,9.3-0.49,13.95-0.56c4.59-0.07,9.19-0.04,13.78,0.11c4.81,0.15,9.62,0.43,14.41,0.84c4.64,0.4,9.27,0.91,13.87,1.6
+		c4.8,0.73,9.57,1.6,14.31,2.64c4.5,0.98,8.98,2.16,13.37,3.56c4.3,1.37,8.54,2.99,12.53,5.1c3.77,1.99,7.29,4.44,10.33,7.44
+		c2.94,2.9,5.4,6.26,7.41,9.85c2.29,4.08,4.03,8.47,5.29,12.97c1.26,4.47,2.02,9.07,2.42,13.69c0.34,3.85,0.49,7.74,0.5,11.6
+		c0.01,2.91-0.02,5.81-0.02,8.72c-0.02,5.83-0.03,11.67-0.05,17.5c-0.02,7.08-0.04,14.16-0.06,21.24
+		c-0.02,6.64-0.03,13.29-0.05,19.93c-0.01,4.53-0.02,9.05-0.04,13.58c0,0.79-0.25,2.06-0.01,2.83c0.15,0.46,0.7,0.49,1.18,0.7
+		c0.74,0.32,1.5,0.64,2.2,1.05c1.95,1.14,2.67,3.49,2.76,5.63c0.07,1.66,0.03,3.32,0.04,4.98c0.03,4.38,0.07,8.75,0.1,13.13
+		c0.05,6.23,0.1,12.46,0.14,18.69c0.05,7.09,0.11,14.17,0.16,21.26c0.05,6.95,0.11,13.9,0.16,20.85c0.04,5.82,0.09,11.63,0.13,17.44
+		c0.03,3.67,0.06,7.35,0.08,11.02c0.01,1.36,0.13,2.79-0.14,4.12c-0.42,2.08-1.65,3.51-3.1,4.98c-1.15,1.18-2.31,2.36-3.47,3.54
+		c-0.23,0.24-0.77,0.61-0.89,0.93c-0.06,0.16,0,0.46,0,0.64c-0.01,1.26-0.01,2.52-0.02,3.78c-0.01,2.3-0.03,4.59-0.04,6.88
+		c-0.02,3.23-0.04,6.46-0.05,9.69c-0.02,4.07-0.05,8.13-0.07,12.2c-0.03,4.78-0.05,9.56-0.08,14.34
+		c-0.03,5.44-0.06,10.88-0.09,16.32c-0.03,5.98-0.07,11.96-0.1,17.94c-0.04,6.42-0.07,12.84-0.11,19.26
+		c-0.04,6.76-0.08,13.52-0.11,20.29c-0.04,7.01-0.08,14.01-0.12,21.02c-0.04,7.12-0.08,14.23-0.12,21.35
+		c-0.04,7.2-0.08,14.39-0.12,21.58c-0.04,7.14-0.08,14.28-0.12,21.42c-0.04,6.99-0.08,13.98-0.12,20.97
+		c-0.04,6.74-0.08,13.48-0.11,20.22c-0.04,6.39-0.07,12.78-0.11,19.17c-0.03,5.94-0.07,11.88-0.1,17.82
+		c-0.03,5.39-0.06,10.78-0.09,16.18c-0.03,4.72-0.05,9.45-0.08,14.18c-0.02,4-0.04,8.01-0.07,12.01c-0.02,3.16-0.04,6.32-0.05,9.48
+		c-0.01,2.22-0.03,4.43-0.04,6.65c-0.01,1.17-0.01,2.35-0.02,3.53c0,0.13-0.05,0.38,0,0.5c0.06,0.15,0.31,0.32,0.42,0.43
+		c0.5,0.51,1,1.02,1.5,1.53c1.06,1.08,2.12,2.16,3.18,3.24c1.26,1.29,2.15,2.82,2.42,4.63c0.2,1.38,0.07,2.86,0.06,4.25
+		c-0.03,3.89-0.06,7.78-0.09,11.67c-0.05,5.94-0.09,11.88-0.14,17.82c-0.05,7-0.11,13.99-0.16,20.99
+		c-0.05,7.06-0.11,14.11-0.16,21.17c-0.05,6.12-0.09,12.24-0.14,18.36c-0.03,4.19-0.06,8.38-0.1,12.57
+		c-0.01,1.58,0.07,3.19-0.07,4.76c-0.2,2.3-1.15,4.36-3.29,5.43c-0.89,0.44-1.81,0.83-2.72,1.21c-0.42,0.17-1.49,0.39-1.67,0.78
+		c-0.2,0.41-0.01,1.39-0.02,1.83c-0.03,3.26-0.06,6.52-0.09,9.78c-0.05,5.34-0.09,10.67-0.14,16.01c-0.06,6.63-0.11,13.27-0.17,19.9
+		c-0.06,7.15-0.12,14.31-0.18,21.46c-0.06,6.87-0.12,13.74-0.18,20.61c-0.05,5.87-0.1,11.75-0.15,17.62
+		c-0.03,4.07-0.07,8.14-0.1,12.21c-0.01,1.49-0.02,2.99-0.04,4.48c-0.07,4.9-0.17,9.8-0.31,14.7c-0.14,4.63-0.33,9.26-0.68,13.87
+		c-0.35,4.6-0.84,9.2-1.73,13.73c-0.82,4.15-1.96,8.31-3.85,12.11c-1.65,3.3-3.97,6.21-6.94,8.42c-3.33,2.47-7.26,4-11.26,5
+		c-4.39,1.1-8.92,1.63-13.43,1.89c-3.25,0.19-6.5,0.22-9.76,0.22c-5.17,0-10.34,0-15.5,0c-7,0-14,0-21,0c-4.53,0-9.06,0-13.59,0
+		c-2.11,0-4.22,0-6.33,0c-6.27,0-12.54,0-18.8,0c-6.65,0-13.29,0-19.94,0c-3.17,0-6.34,0.02-9.51-0.01
+		c-4.47-0.04-8.95-0.25-13.39-0.84c-4.23-0.56-8.47-1.46-12.41-3.12c-3.66-1.54-6.99-3.79-9.53-6.86
+		c-2.53-3.06-4.15-6.75-5.31-10.52c-1.31-4.24-2.07-8.62-2.63-13.01c-0.59-4.7-0.88-9.44-1.11-14.17
+		c-0.21-4.34-0.33-8.68-0.41-13.02c-0.06-3.16-0.14-6.32-0.17-9.48c-0.03-2.84-0.05-5.68-0.07-8.52
+		c-0.04-5.04-0.09-10.09-0.13-15.13c-0.06-6.47-0.11-12.94-0.17-19.41c-0.06-7.09-0.12-14.18-0.18-21.26c-0.06-7-0.12-14-0.18-20.99
+		c-0.05-6.1-0.1-12.2-0.16-18.3c-0.04-4.42-0.08-8.85-0.11-13.27c-0.01-1.34-0.02-2.68-0.03-4.02c0-0.46,0.19-1.47-0.02-1.89
+		c-0.18-0.38-1.06-0.54-1.47-0.71c-0.95-0.39-1.89-0.78-2.81-1.24c-1.18-0.58-2.08-1.37-2.66-2.57c-0.67-1.41-0.78-2.93-0.79-4.47
+		c-0.02-2.8-0.04-5.6-0.06-8.41c-0.04-5.25-0.08-10.5-0.12-15.76c-0.05-6.7-0.1-13.4-0.15-20.1c-0.05-7.15-0.11-14.3-0.16-21.46
+		c-0.05-6.61-0.1-13.22-0.15-19.82c-0.04-5.07-0.08-10.14-0.12-15.2c-0.02-2.53-0.04-5.06-0.06-7.59c-0.01-1.46,0.2-2.85,0.88-4.17
+		c0.4-0.77,0.93-1.44,1.53-2.06c1.02-1.05,2.04-2.08,3.06-3.13c0.53-0.54,1.05-1.07,1.58-1.61c0.14-0.14,0.47-0.37,0.55-0.56
+		c0.18-0.45-0.01-1.34-0.01-1.8c-0.01-1.69-0.02-3.39-0.03-5.08c-0.02-2.69-0.03-5.38-0.05-8.06c-0.02-3.58-0.04-7.16-0.06-10.75
+		c-0.03-4.38-0.05-8.76-0.07-13.14c-0.03-5.08-0.06-10.15-0.09-15.23c-0.03-5.65-0.06-11.29-0.1-16.94
+		c-0.03-6.17-0.07-12.34-0.1-18.51c-0.04-6.57-0.07-13.14-0.11-19.71c-0.04-6.87-0.08-13.75-0.12-20.62
+		c-0.04-7.08-0.08-14.15-0.12-21.23c-0.04-7.18-0.08-14.36-0.12-21.54c-0.04-7.18-0.08-14.37-0.12-21.55
+		c-0.04-7.06-0.08-14.12-0.12-21.18c-0.04-6.9-0.08-13.8-0.12-20.7c-0.04-6.61-0.08-13.22-0.11-19.82
+		c-0.03-6.22-0.07-12.44-0.1-18.65c-0.03-5.73-0.07-11.46-0.1-17.19c-0.03-5.14-0.06-10.28-0.09-15.42
+		c-0.03-4.45-0.05-8.91-0.08-13.36c-0.02-3.67-0.04-7.34-0.06-11c-0.02-2.77-0.03-5.55-0.05-8.32c-0.01-1.8-0.02-3.61-0.03-5.41
+		c0-0.58,0.2-1.61-0.01-2.17c-0.1-0.28-0.53-0.57-0.74-0.78c-1.15-1.17-2.3-2.35-3.45-3.52c-0.81-0.82-1.66-1.61-2.26-2.6
+		c-0.83-1.35-1.17-2.86-1.16-4.44c0.01-2.22,0.03-4.43,0.05-6.65c0.04-4.83,0.07-9.65,0.11-14.48c0.05-6.49,0.1-12.98,0.15-19.47
+		c0.05-7.14,0.11-14.28,0.16-21.42c0.05-6.8,0.1-13.59,0.16-20.39c0.04-5.45,0.08-10.91,0.13-16.36c0.02-3.12,0.05-6.23,0.07-9.35
+		c0.01-1.49,0.03-2.96,0.57-4.38C2.37,155.18,4.67,154.41,7,153.42z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_shuttle-bus-front.svg b/media/vehicles/buses/bus_shuttle-bus-front.svg
new file mode 100644
index 00000000..5a43c67a
--- /dev/null
+++ b/media/vehicles/buses/bus_shuttle-bus-front.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 302.64 328.1" style="enable-background:new 0 0 302.64 328.1;" xml:space="preserve">
+<g id="POLYLINE_4_">
+	<path d="M236.43,288.61c-6.03,0-12.07,0.02-18.1-0.01c-4.88-0.02-9.93,0.1-14.69-1.13c-2.52-0.65-4.91-1.72-7.49-2.13
+		c-2.61-0.41-5.29-0.47-7.93-0.53c-5.48-0.12-10.97-0.05-16.45-0.07c-6.68-0.02-13.35-0.04-20.02-0.05
+		c-4.7-0.01-9.41,0.02-14.11,0.03c-7,0.02-14,0.03-21,0.05c-4.47,0.01-9.16-0.02-13.46,1.38c-2.38,0.77-4.71,1.56-7.2,1.92
+		c-2.52,0.36-5.08,0.45-7.62,0.48c-6.45,0.07-12.89,0.05-19.34,0.05c-0.64,0-1.29,0-1.93,0c-0.13,0-0.75-0.09-0.84,0
+		c-0.15,0.14-0.01,1.19-0.01,1.4c0,3.17,0,6.34,0,9.51c0,7.23,0,14.45,0,21.67c0,1.5-0.11,2.93-0.96,4.23
+		c-0.88,1.34-2.3,2.28-3.88,2.57c-1.28,0.23-2.68,0.07-3.97,0.07c-3.15,0-6.3,0-9.45,0c-8.32,0-16.64,0-24.95,0
+		c-3.17,0-6.35,0-9.52,0c-1.29,0-2.67,0.14-3.95-0.05c-3.11-0.46-4.96-3.22-4.97-6.22c-0.01-4.01,0-8.03,0-12.04
+		c0-7.63,0-15.26,0-22.89c0-8.51,0-17.01,0-25.52c0-6.64,0-13.28,0-19.92c0-1.77,0-3.53,0-5.3c0-1.31-0.36-2.36-0.79-3.62
+		c-0.84-2.46-1.88-4.88-2.42-7.44c-0.45-2.13-0.43-4.29-0.07-6.44c0.83-5,3.03-10.04,6.01-14.13c1.17-1.6,2.56-3.11,4.27-4.13
+		c0.51-0.3,2.09-0.71,2.26-1.15c0.2-0.54,0-1.56,0-2.13c0-1.35,0-2.69,0-4.04c0-3.87,0-7.73,0-11.6c0-7.28,0-14.57,0-21.85
+		c0-0.43,0.22-1.57,0-1.96c-0.23-0.42-2.2-0.32-2.71-0.37c-2.49-0.23-5.13-0.27-7.57-0.91c-1.84-0.48-3-1.62-3.34-3.51
+		c-0.37-2.03-0.15-4.18,0.02-6.22c0.23-2.87,0.55-5.74,0.94-8.6c0.34-2.51,0.65-5.11,1.44-7.52c0.45-1.37,1.12-2.67,2.35-3.49
+		c0.96-0.65,2.12-0.95,3.25-1.13c1.24-0.2,2.51-0.25,3.76-0.27c0.59-0.01,1.18-0.01,1.77,0c0.22,0,0.97,0.15,1.12,0.02
+		c0.06-0.05,0.02-0.36,0.03-0.43c0.46-2.88,0.41-5.93,0.65-8.85c0.47-5.68,0.98-11.35,1.6-17.02c0.63-5.81,1.33-11.62,2.06-17.42
+		c0.78-6.16,1.61-12.31,2.44-18.46c0.77-5.67,1.6-11.32,2.43-16.98c0.8-5.48,1.7-10.95,2.61-16.42c0.83-4.99,1.49-10.25,3.36-14.98
+		c1.15-2.89,2.99-5.22,5.73-6.72c4.49-2.46,9.93-3.26,14.9-4.2c1.26-0.24,2.52-0.48,3.79-0.7c1.02-0.18,2.04-0.36,3.06-0.54
+		c0.45-0.08,1.19-0.08,1.38-0.4c0.26-0.43,0.17-0.78,0.67-1.13c0.36-0.25,0.78-0.39,1.2-0.49c0.92-0.22,1.88-0.29,2.83-0.36
+		c4.18-0.32,8.4-0.38,12.59-0.38c3.42,0,6.84-0.01,10.26-0.01c6.54-0.01,13.08-0.02,19.63-0.03c8.25-0.01,16.49-0.02,24.74-0.03
+		c8.54-0.01,17.07-0.02,25.61-0.03c7.41-0.01,14.82-0.02,22.22-0.03c4.86-0.01,9.73-0.01,14.59-0.02c1.92,0,3.83,0,5.75,0.01
+		c7.65,0.04,15.3,0.08,22.95,0.12c4.77,0.03,9.55,0.05,14.31,0.25c2,0.08,4.42-0.06,6.31,0.71c0.41,0.17,0.85,0.42,1.07,0.83
+		c0.29,0.53-0.03,0.61,0.54,0.8c1.58,0.55,3.47,0.62,5.11,0.92c5.16,0.94,10.54,1.77,15.44,3.7c2.76,1.09,5.16,2.73,6.72,5.29
+		c2.73,4.49,3.31,10.29,4.21,15.36c1.02,5.77,1.9,11.57,2.79,17.35c0.77,4.99,1.5,10,2.18,15.01c0.78,5.79,1.6,11.58,2.33,17.38
+		c0.81,6.39,1.58,12.77,2.31,19.17c0.59,5.17,1.12,10.35,1.56,15.54c0.24,2.9,0.48,5.8,0.69,8.71c0.07,1.03,0.15,2.07,0.22,3.1
+		c0.02,0.27-0.05,1.21,0.14,1.38c0.23,0.2,1.7-0.03,2.08-0.03c0.62,0,1.24,0.01,1.86,0.04c3.07,0.13,6.33,0.55,7.8,3.63
+		c0.84,1.78,1.16,3.81,1.47,5.73c0.46,2.82,0.81,5.65,1.1,8.49c0.26,2.54,0.57,5.14,0.47,7.7c-0.07,1.74-0.37,3.65-2.04,4.59
+		c-1.48,0.84-3.4,0.95-5.05,1.1c-1.83,0.17-3.67,0.33-5.5,0.5c-0.17,0.02-1.09-0.03-1.21,0.12c-0.05,0.06,0.01,0.34,0,0.41
+		c-0.16,2.26,0,4.59,0,6.85c0,3.96,0,7.92,0,11.88c0,7.05,0,14.09,0,21.14c0,0.3-0.18,1.32,0,1.58c0.11,0.16,0.84,0.29,1.06,0.37
+		c1.51,0.62,2.81,1.67,3.92,2.85c3.35,3.57,5.61,8.46,6.91,13.13c0.65,2.32,1.07,4.76,0.89,7.18c-0.17,2.2-0.85,4.31-1.59,6.38
+		c-0.5,1.38-1.01,2.76-1.45,4.16c-0.19,0.58-0.42,1.16-0.47,1.77c-0.1,1.22,0,2.5,0,3.73c0,5.98,0,11.97,0,17.95
+		c0,8.36,0,16.73,0,25.09c0,8.01,0,16.01,0,24.02c0,4.91,0,9.82,0,14.73c0,2.67-0.49,5.21-3.06,6.61c-1.17,0.64-2.33,0.7-3.62,0.7
+		c-2.53,0-5.06,0-7.58,0c-8.18,0-16.35,0-24.53,0c-5.69,0-11.39,0.04-17.08,0c-3.22-0.02-5.72-2.69-5.79-5.87
+		c-0.12-5.99,0-11.99,0-17.98C236.43,299,236.43,293.81,236.43,288.61z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_shuttle-bus-side.svg b/media/vehicles/buses/bus_shuttle-bus-side.svg
new file mode 100644
index 00000000..388d4b7c
--- /dev/null
+++ b/media/vehicles/buses/bus_shuttle-bus-side.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 865.57 328.13" style="enable-background:new 0 0 865.57 328.13;" xml:space="preserve">
+<g id="POLYLINE_5_">
+	<path d="M299.54,286.93c-3.63,0-7.26,0-10.89,0c-8.71,0-17.41,0-26.12,0c-10.52,0-21.03,0-31.55,0c-9.03,0-18.06,0-27.1,0
+		c-4.34,0-8.69,0.1-13.02,0c-0.87-0.02-1.68-0.27-2.3-0.92c-0.51-0.54-0.77-1.23-0.81-1.96c-0.05-0.89,0.26-1.07-0.62-1.07
+		c-2.3,0-4.61,0-6.91,0c-1.33,0-3.08,0.31-4.37-0.12c-1.62-0.54-1.73-2.46-2.08-3.87c-0.05-0.2-0.1-0.96-0.27-1.08
+		c-0.05-0.04-0.2,0.01-0.27-0.01c-0.55-0.14-1.34,0-1.91,0c-4.73,0-9.45,0-14.18,0c-0.61,0-1.39-0.14-1.99,0
+		c-0.06,0.01-0.27-0.04-0.31,0c-0.1,0.09-0.02,0.9-0.02,1.06c-0.04,1.52-0.14,3.04-0.31,4.55c-0.36,3.14-1.01,6.25-1.96,9.26
+		c-2.02,6.45-5.33,12.47-9.71,17.62c-4.47,5.25-10.01,9.56-16.2,12.59c-5.8,2.84-12.13,4.55-18.57,5.01
+		c-6.18,0.44-12.44-0.27-18.37-2.1c-6.42-1.97-12.42-5.24-17.56-9.55c-5.28-4.43-9.63-9.95-12.7-16.12
+		c-2.88-5.79-4.63-12.12-5.13-18.57c-0.06-0.75-0.1-1.51-0.12-2.27c-0.01-0.35,0.01-0.7-0.02-1.05c-0.05-0.57,0.07-0.33-0.35-0.43
+		c-0.98-0.24-2.32,0-3.33,0c-0.58,0-1.17,0-1.75,0c-0.24,0-0.99-0.13-1.21,0c-0.35,0.21-0.22,1.71-0.25,2.21
+		c-0.04,0.76-0.08,1.52-0.11,2.28c-0.04,0.9-0.07,1.79-0.09,2.69c-0.02,0.7,0.06,1.49-0.22,2.16c-0.44,1.02-1.39,1.41-2.42,1.42
+		c-1.65,0.02-3.3,0-4.96,0c-4.61,0-9.23,0-13.84,0c-3.49,0-6.48-0.91-8.68-3.8c-1.51-1.98-2.39-4.39-3-6.78
+		c-0.1-0.4-0.2-0.81-0.28-1.22c-0.04-0.18-0.08-0.97-0.21-1.08c-0.1-0.08-0.68,0-0.79,0c-0.59,0-1.19,0-1.78,0
+		c-1.32,0-2.68,0.1-3.99-0.06c-4.13-0.51-5.67-4.5-6.37-8.12c-0.17-0.87-0.33-1.8-0.22-2.69c0.17-1.51,1.17-1.89,2.56-1.9
+		C0.53,262.9,0,261.33,0,259.29c0-1.74,0.01-3.49,0.83-5.07c2.28-4.37,7.87-3.13,11.85-3.76c0.93-0.15,2.11-0.37,2.73-1.14
+		c0.6-0.74,0.36-1.73,0.07-2.55c-0.86-2.37-1.54-4.74-1.99-7.23c-1.04-5.76-1.24-11.65-1.27-17.49c-0.03-5.8,0.16-11.64,0.78-17.41
+		c0.59-5.53,2.46-11,4.56-16.13c0.97-2.38,2.05-4.73,3.38-6.93c0.83-1.38,1.77-2.7,3.11-3.63c1.88-1.3,4.17-2,6.32-2.69
+		c2.73-0.88,5.48-1.69,8.24-2.45c5.76-1.6,11.56-3.01,17.37-4.39c5.15-1.22,10.31-2.4,15.49-3.5c6.24-1.32,12.48-2.61,18.71-3.91
+		c7.31-1.53,14.63-3.06,21.94-4.59c4.45-0.93,8.96-1.85,13.18-3.58c4.74-1.95,8.71-5.01,12.25-8.68c4.61-4.77,9.04-9.72,13.54-14.59
+		c3.39-3.65,6.82-7.27,10.31-10.83c4.65-4.76,9.33-9.48,14.05-14.18c3.36-3.34,6.79-6.61,10.23-9.87
+		c5.78-5.48,11.56-10.96,17.34-16.44c2.89-2.74,5.76-5.93,9.48-7.52c1.53-0.65,3.17-0.94,4.84-0.95c-4.21,0-8.41,0-12.62,0
+		c-2.31,0-4.61,0-6.92,0c-0.89,0-1.92,0.1-2.76-0.23c-2.68-1.07,3.08-5.85,3.95-6.63c2.97-2.69,5.99-5.32,9.04-7.91
+		c5.79-4.94,11.86-9.57,18.17-13.82c6.37-4.3,13-8.21,19.83-11.74c6.85-3.54,13.89-6.72,21.06-9.56c7.21-2.85,14.53-5.43,21.95-7.69
+		c7.4-2.25,14.89-4.17,22.48-5.69c7.74-1.55,15.55-2.71,23.39-3.62c7.79-0.9,15.61-1.5,23.44-1.95c7.84-0.46,15.68-0.69,23.53-0.83
+		C386.37,0.02,390.9,0,395.42,0c2.23,0,4.46,0,6.69,0c4.39,0,8.77,0,13.16,0c6.27,0,12.54,0,18.81,0c7.85,0,15.71,0,23.57,0
+		c9.18,0,18.37,0,27.56,0c10.28,0,20.55,0,30.82,0c11.07,0,22.13,0,33.2,0c11.59,0,23.17,0,34.76,0c11.83,0,23.66,0,35.5,0
+		c11.74,0,23.48,0,35.22,0c11.51,0,23.02,0,34.52,0c10.94,0,21.87,0,32.81,0c10.09,0,20.18,0,30.28,0c8.97,0,17.95,0,26.92,0
+		c7.57,0,15.13,0,22.7,0c5.91,0,11.82,0,17.74,0c4,0,7.99,0,11.99,0c1.79,0,3.58,0,5.36,0c4.16,0.01,9.31-0.13,12.99,2.15
+		c1.15,0.71,2.05,1.74,2.55,3c0.53,1.32,0.67,3.36-0.99,3.91c-0.61,0.2-0.75-0.09-0.7,0.55c0.06,0.79,0.23,1.59,0.34,2.37
+		c0.4,2.71,0.8,5.41,1.21,8.12c1.21,8.06,2.35,16.12,3.49,24.19c1.02,7.25,1.9,14.52,2.75,21.8c0.9,7.69,1.75,15.38,2.46,23.09
+		c0.76,8.34,1.42,16.68,2.01,25.04c0.55,7.79,0.95,15.59,1.31,23.38c0.35,7.71,0.48,15.42,0.48,23.13
+		c-0.01,7.6-0.3,15.22-0.83,22.81c-0.54,7.68-1.38,15.31-2.24,22.96c-0.89,7.91-1.88,15.82-2.49,23.76c-0.57,7.5-0.85,15-0.91,22.53
+		c2.13,0.01,6.32-0.56,6.86,2.34c0.38,2.04,0.13,4.45-0.71,6.36c-0.52,1.18-1.29,2.24-2.11,3.23c2.36,0.03,3.87,2.67,2.62,4.69
+		c-0.29,0.47-0.71,0.86-1.2,1.12c-0.31,0.16-1.28,0.26-1.38,0.44c-0.16,0.3,0.25,1.49,0.31,1.84c0.09,0.61,0.18,1.21,0.25,1.82
+		c0.43,3.88,0.33,7.98-1.22,11.62c-0.55,1.31-1.29,2.53-2.21,3.61c2.05,0.03,2.63,2.95,0.68,3.7c-1.09,0.42-2.63,0.14-3.76,0.15
+		c-1.08,0.01-2.16,0.02-3.25,0.04c-5.36,0.09-10.71,0.21-16.07,0.39c-4.23,0.14-8.46,0.35-12.69,0.53c-7.23,0.3-14.47,0.6-21.71,0.9
+		c-2.36,0.1-4.72,0.18-7.09,0.3c-3.71,0.19-7.43,0.39-11.14,0.58c-6.54,0.34-13.09,0.68-19.63,1.02c-7.66,0.4-15.31,0.8-22.97,1.19
+		c-7.05,0.37-14.1,0.73-21.15,1.1c-4.73,0.25-9.46,0.49-14.19,0.74c-2.94,0.15-5.88,0.25-8.82,0.35c-4.8,0.16-9.61,0.26-14.41,0.3
+		c-3.64,0.02-7.28,0.04-10.92,0.04c-6.55,0-13.11,0-19.67,0c-7.2,0-14.4,0-21.6,0c-2.27,0-4.54,0-6.81,0
+		c-0.89,0-2.02,0.16-2.86-0.21c-0.99-0.45-1.31-1.33-1.47-2.33c-0.05-0.35-0.08-1.62-0.3-1.82c-0.11-0.09-0.71,0-0.84,0
+		c-3.38,0-6.76,0-10.14,0c-0.4,0-1.07-0.13-1.45,0c-0.34,0.12-0.36,0.4-0.52,0.78c-0.42,0.98-0.87,1.95-1.36,2.91
+		c-0.98,1.95-2.09,3.83-3.32,5.63c-2.57,3.77-5.65,7.17-9.13,10.11c-3.93,3.32-8.38,6.04-13.14,8.01c-4.72,1.96-9.73,3.2-14.81,3.66
+		c-4.96,0.45-9.98,0.15-14.86-0.87c-5.05-1.06-9.94-2.91-14.43-5.45c-4.43-2.5-8.47-5.68-11.95-9.39c-2.92-3.12-5.44-6.6-7.48-10.36
+		c-0.53-0.96-1.02-1.95-1.48-2.94c-0.23-0.5-0.45-1-0.67-1.51c-0.2-0.47-0.13-0.48-0.52-0.57c-0.47-0.11-1.09,0-1.58,0
+		c-0.83,0-1.66,0-2.49,0c-1.88,0-3.76,0-5.64,0c-0.47,0-2.31-0.28-2.65,0.04c-0.24,0.22-0.28,1.68-0.33,2.03
+		c-0.07,0.42-0.16,0.8-0.39,1.17c-0.98,1.54-3.17,1.11-4.71,1.11c-4.93,0-9.87,0-14.8,0c-1.71,0-3.43,0-5.14,0
+		c-3.98,0-7.96,0-11.93,0c-5.66,0-11.32,0-16.98,0c-6.91,0-13.83,0-20.74,0c-7.54,0-15.07,0-22.61,0c-7.77,0-15.53,0-23.3,0
+		c-7.35,0-14.69,0-22.04,0c-6.53,0-13.06,0-19.59,0c-5.09,0-10.17,0-15.26,0c-3.2,0-6.4,0-9.6,0c-1.47,0-3.51,0.36-4.48-1.03
+		c-0.6-0.86-0.52-2.11-0.61-3.1c-0.12-1.21-0.24-2.43-0.34-3.64c-0.21-2.52-0.42-5.03-0.56-7.55c-0.04-0.8,0.02-1.71-0.14-2.5
+		c-0.1-0.47,0.05-0.33-0.43-0.37c-1.54-0.14-3.16,0-4.7,0c-0.77,0-1.54,0-2.31,0c-0.17,0-0.75-0.08-0.85,0.03
+		c-0.22,0.24,0,1.73,0,2.04C299.54,285.68,299.54,286.31,299.54,286.93z"/>
+</g>
+</svg>
diff --git a/media/vehicles/buses/bus_shuttle-bus-top.svg b/media/vehicles/buses/bus_shuttle-bus-top.svg
new file mode 100644
index 00000000..83ca096e
--- /dev/null
+++ b/media/vehicles/buses/bus_shuttle-bus-top.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 297.07 865.29" style="enable-background:new 0 0 297.07 865.29;" xml:space="preserve">
+<g id="POLYLINE_6_">
+	<path d="M26.01,52.83c0.03-7.91-0.09-16.01,1.29-23.83c1.17-6.65,4.56-13.33,10.02-17.47c5.92-4.49,13.96-5.37,21.1-6.4
+		c7.82-1.13,15.7-1.92,23.57-2.57c8.63-0.72,17.26-1.23,25.9-1.68c8.25-0.43,16.52-0.57,24.78-0.75c7.85-0.17,15.7-0.14,23.55-0.08
+		c7.86,0.06,15.73,0.18,23.59,0.47c8.56,0.32,17.1,0.72,25.65,1.3c8.05,0.54,16.09,1.26,24.11,2.18c7.68,0.88,15.66,1.61,23.05,3.96
+		c6.78,2.16,11.63,6.98,14.65,13.33c3.2,6.72,3.4,14.5,3.59,21.81c0.1,4.04-0.09,8.11,0.52,12.11c0.61,3.99,1.12,7.99,1.49,12
+		c0.72,7.79,1.04,15.62,1.3,23.44c0.29,8.69,0.53,17.39,0.7,26.08c0.15,7.89,0.21,15.78,0.31,23.67c0.07,5.72,0.15,11.45,0.22,17.17
+		c0.03,1.9,0.05,3.8,0.07,5.7c0.01,0.59-0.21,1.74,0.03,2.29c0.08,0.19,0.44,0.4,0.59,0.54c0.63,0.57,1.27,1.14,1.9,1.72
+		c1.97,1.78,3.94,3.56,5.91,5.34c3.72,3.36,7.45,6.73,11.17,10.09c0.72,0.65,1.49,1.3,1.83,2.23c0.46,1.28-0.23,2.66-1.19,3.52
+		c-1.1,0.98-2.39,0.8-3.61,0.17c-1.72-0.9-3.41-1.86-5.12-2.79c-3.79-2.07-7.59-4.13-11.38-6.2c0.01,3.56,0.02,7.13,0.03,10.69
+		c0.02,8.52,0.05,17.05,0.07,25.58c0.03,10.12,0.06,20.24,0.08,30.36c0.02,8.46,0.05,16.92,0.07,25.38c0.01,2.55,0.01,5.1,0.02,7.64
+		c0,0.86-0.13,1.85,0.02,2.69c0.22,1.26,0.87,2.58,1.28,3.79c0.8,2.37,1.59,4.74,2.39,7.11c1,2.96,2.04,5.92,2.94,8.92
+		c1.82,6.02,3.1,12.23,3.41,18.52c0.13,2.62,0.07,5.25,0.07,7.86c0,5.64,0,11.29,0,16.93c0,8.39,0,16.79,0,25.19
+		c0,9.9,0,19.8,0,29.7c0,10.16,0,20.32,0,30.48c0,9.2,0,18.4,0,27.6c0,6.93,0,13.86,0,20.79c0,3.45,0,6.9,0,10.35
+		c0,0.11-0.05,0.39,0,0.5c0.12,0.23,0.71,0.51,0.92,0.68c0.37,0.29,0.72,0.6,1.06,0.93c2.21,2.1,3.9,4.75,5.14,7.52
+		c1.72,3.82,2.25,7.69,2.25,11.81c0,6.08,0,12.16,0,18.24c0,9.58,0,19.17,0,28.75c0,9.84,0,19.67,0,29.51c0,6.84,0,13.68,0,20.52
+		c0,3.68-0.01,7.17-1.16,10.74c-0.98,3.04-2.49,5.95-4.49,8.45c-0.77,0.96-1.62,1.85-2.56,2.64c-0.31,0.26-1.02,0.6-1.16,0.94
+		c-0.21,0.48,0,1.53,0,2.04c0,1.56,0,3.12,0,4.67c0,5.36,0,10.72,0,16.09c0,7.74,0,15.49,0,23.23c0,9.3,0,18.61,0,27.91
+		c0,10.11,0,20.23,0,30.35c0,10.16,0,20.32,0,30.47c0,9.43,0,18.86,0,28.29c0,7.93,0,15.87,0,23.8c0,5.67,0,11.34,0,17.01
+		c0,2.63,0,5.27,0,7.9c-0.01,4.35-1.05,8.65-3.28,12.41c-2.75,4.64-7.21,8.23-12.49,9.54c-3.22,0.8-6.68,0.54-9.97,0.54
+		c-6.94,0-13.88,0-20.82,0c-9.7,0-19.4,0-29.1,0c-9.96,0-19.92,0-29.89,0c-7.71,0-15.42,0-23.13,0c-2.95,0-5.9,0-8.85,0
+		c-3.4,0-6.8,0-10.21,0c-7.97,0-15.95,0-23.92,0c-10.03,0-20.06,0-30.09,0c-9.6,0-19.2,0-28.81,0c-6.59,0-13.18,0-19.77,0
+		c-3.5,0-6.96,0.17-10.34-0.95c-5.05-1.68-9.17-5.46-11.63-10.13c-1.9-3.6-2.72-7.59-2.72-11.64c0-2.9,0-5.79,0-8.69
+		c0-5.87,0-11.74,0-17.62c0-8.08,0-16.16,0-24.24c0-9.52,0-19.03,0-28.54c0-10.18,0-20.36,0-30.55c0-10.08,0-20.16,0-30.24
+		c0-9.23,0-18.47,0-27.71c0-7.56,0-15.12,0-22.68c0-5.16,0-10.32,0-15.47c0-1.42,0-2.84,0-4.27c0-0.37,0.17-1.25,0-1.59
+		c-0.1-0.2-0.61-0.43-0.79-0.58c-0.35-0.28-0.7-0.57-1.03-0.88c-1.03-0.96-1.94-2.04-2.75-3.19c-1.86-2.63-3.24-5.62-4.06-8.73
+		c-0.9-3.43-0.75-6.88-0.75-10.38c0-7.19,0-14.38,0-21.57c0-9.93,0-19.87,0-29.8c0-9.43,0-18.86,0-28.28c0-5.67,0-11.34,0-17.01
+		c0-4.4,0.88-8.55,2.92-12.5c1.3-2.51,2.99-4.91,5.16-6.75c0.33-0.28,1.14-0.68,1.3-1.05c0.08-0.19,0-0.59,0-0.79
+		c0-3.76,0-7.52,0-11.28c0-7.18,0-14.35,0-21.53c0-9.29,0-18.59,0-27.88c0-10.18,0-20.37,0-30.55c0-9.83,0-19.66,0-29.48
+		c0-8.23,0-16.45,0-24.68c0-5.38,0-10.75,0-16.13c0-2.81-0.05-5.63,0.16-8.43c0.46-6.35,1.88-12.6,3.81-18.65
+		c1.03-3.21,2.13-6.39,3.21-9.58c0.74-2.21,1.49-4.42,2.23-6.64c0.22-0.67,0.59-1.4,0.69-2.1c0.17-1.13,0.01-2.42,0.01-3.56
+		c0.01-2.78,0.02-5.56,0.02-8.34c0.02-8.69,0.05-17.38,0.07-26.07c0.03-10.15,0.06-20.29,0.08-30.44
+		c0.02-8.23,0.05-16.46,0.07-24.68c0.01-3.07,0.02-6.13,0.03-9.2c-5.38,2.93-10.76,5.86-16.13,8.79c-1.64,0.89-3.25,1.09-4.51-0.56
+		c-1.24-1.62-0.84-3.27,0.57-4.62c4.64-4.4,9.51-8.59,14.25-12.88c1.26-1.14,2.52-2.28,3.78-3.41c0.59-0.53,1.61-1.15,2.03-1.84
+		c0.43-0.69,0.14-2.27,0.15-3.07c0.09-7.13,0.18-14.26,0.28-21.39s0.18-14.26,0.28-21.39c0.06-4.41,0.17-8.83,0.28-13.24
+		c0.14-5.89,0.33-11.79,0.52-17.68c0.17-5.21,0.41-10.42,0.77-15.62c0.38-5.61,0.96-11.19,1.77-16.75
+		C25.61,55.3,25.81,54.06,26.01,52.83z"/>
+</g>
+</svg>
diff --git a/presets/vehicles.js b/presets/vehicles.js
index 75abe4c8..37c1c863 100644
--- a/presets/vehicles.js
+++ b/presets/vehicles.js
@@ -195,30 +195,74 @@ function makeCars() {
     return entity;
 }
 
-function makeVehicles() {
-    const results = [];
+function makeBuses() {
+    const options = [
+        ["City Bus", 11.95, 2.99, 14000, 1, 1, 1],
+        ["Articulated Bus", 18, 3.13, 25000, 1, 1, 1],
+        ["Coach Bus", 12, 3.81, 18000, 1, 1, 1],
+        ["Shuttle Bus", 7.01, 2.67, 6000, 1, 1, 1],
+    ]
+    sides = {}
 
-    results.push({
-        name: "Bus",
-        constructor: () => makeVehicle(
-            "Bus",
-            {
-                side: {
-                    name: "Side",
-                    height: math.unit(10.5, "feet"),
-                    image: { source: "./media/vehicles/bus.svg" }
-                },
-                vertical: {
-                    name: "Side (Vertical)",
-                    height: math.unit(38.5, "feet"),
-                    image: { source: "./media/vehicles/vertical-bus.svg" }
-                },
+    options.forEach(bus => {
+        sides[bus[0] + " (Front)"] = {
+            name: bus[0] + " (Front)",
+            rename: true,
+            height: math.unit(bus[2], "meters"),
+            mass: math.unit(bus[3], "kg"),
+            image: { source: "./media/vehicles/buses/bus_" + bus[0].replace(/ /g, "-").toLowerCase() + "-front.svg", extra: bus[4] }
+        };
+        
+        sides[bus[0] + " (Side)"] = {
+            name: bus[0] + " (Side)",
+            rename: true,
+            height: math.unit(bus[2], "meters"),
+            mass: math.unit(bus[3], "kg"),
+            image: { source: "./media/vehicles/buses/bus_" + bus[0].replace(/ /g, "-").toLowerCase() + "-side.svg", extra: bus[5] }
+        };
 
-            },
-            math.unit(30000, "lb"),
-        )
+        sides[bus[0] + " (Top)"] = {
+            name: bus[0] + " (Top)",
+            rename: true,
+            height: math.unit(bus[1], "meters"),
+            mass: math.unit(bus[3], "kg"),
+            image: { source: "./media/vehicles/buses/bus_" + bus[0].replace(/ /g, "-").toLowerCase() + "-top.svg", extra: bus[6] }
+        };
+    });
+
+    const entity = makeMultiVehicle("Buses", sides);
+
+    entity.sizes.push({
+        name: "1:72",
+        height: math.unit(options[0][2]/72, "meters")
+    });
+    entity.sizes.push({
+        name: "1:24",
+        height: math.unit(options[0][2]/24, "meters")
+    });
+    entity.sizes.push({
+        name: "1:16",
+        height: math.unit(options[0][2]/16, "meters")
+    });
+    entity.sizes.push({
+        name: "1:8",
+        height: math.unit(options[0][2]/8, "meters")
+    });
+    entity.sizes.push({
+        name: "1:4",
+        height: math.unit(options[0][2]/4, "meters")
+    });
+    entity.sizes.push({
+        name: "1",
+        height: math.unit(options[0][2], "meters")
     });
 
+    return entity;
+}
+
+function makeVehicles() {
+    const results = [];
+
     results.push({
         name: "Leopard 2 Rev. 1",
         constructor: () => makeVehicle(
@@ -318,6 +362,11 @@ function makeVehicles() {
         name: "Cars",
         constructor: () => makeCars()
     });
+    
+    results.push({
+        name: "Buses",
+        constructor: () => makeBuses()
+    });
 
     return results;
 }