diff --git a/data/styles/default/dark/symbols/bus-m.svg b/data/styles/default/dark/symbols/bus-m.svg
index 9a44d41ed..0763f0268 100644
--- a/data/styles/default/dark/symbols/bus-m.svg
+++ b/data/styles/default/dark/symbols/bus-m.svg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#000" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m5.999 6.584c-0.77352 0-1.416 0.64249-1.416 1.416v7.332c4.1e-5 0.4142 0.3358 0.74996 0.75 0.75h0.72461c0.3044 0.77641 1.0636 1.334 1.9414 1.334 0.87716 0 1.6366-0.5565 1.9414-1.332h4.1172c0.30484 0.77554 1.0642 1.332 1.9414 1.332s1.6366-0.5565 1.9414-1.332h0.72461c0.4142-4.1e-5 0.74996-0.3358 0.75-0.75v-3.3184c7.06e-4 -0.0052 0.0014-0.01041 2e-3 -0.01563-7.5e-5 -0.02479-0.0014-0.04956-0.0039-0.07422-0.01389-1.4044-0.41753-2.688-1.1133-3.6621-0.70808-0.99132-1.7626-1.6797-2.9668-1.6797zm0.08398 1.357h1.8633v2.8715h-1.8633zm3.2539 0h1.9121v2.8715h-1.9121zm3.2953 0h1.4274l0.58594 2.8715h-2.0133zm2.686 0c2.2166 0.34738 2.7966 2.607 2.8669 4.01l-1.9126-0.02337zm-7.3192 6.5121c0.49963 0 0.88086 0.37927 0.88086 0.87891s-0.38122 0.88086-0.88086 0.88086c-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38123-0.87891 0.88086-0.87891zm8 0c0.49964 0 0.88086 0.37927 0.88086 0.87891 0 0.49963-0.38122 0.88086-0.88086 0.88086-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38122-0.87891 0.88086-0.87891z" fill="#000"/>
- </g>
-</svg>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bus-m</title>
+    <g id="bus-m" stroke="none" fill="none">
+        <rect id="Rectangle" fill="#000000" fill-rule="nonzero" opacity="0.6" x="0" y="0" width="18" height="18" rx="1.875"></rect>
+        <rect id="Rectangle" fill="#2F6499" fill-rule="nonzero" x="0.75" y="0.75" width="16.5" height="16.5" rx="1.5"></rect>
+        <path d="M5.13584253,13.8503357 C5.35123059,13.9180426 5.58044335,13.9545455 5.81818182,13.9545455 L6.49909091,13.9545455 L6.5,14.4131116 C6.5,14.7896694 6.1947396,15.0949298 5.81818182,15.0949298 C5.44162403,15.0949298 5.13636364,14.7896694 5.13636364,14.4131116 L5.13584253,13.8503357 Z M12.8632537,13.8506196 L12.8636364,14.4131116 C12.8636364,14.7896694 12.558376,15.0949298 12.1818182,15.0949298 C11.8052604,15.0949298 11.5,14.7896694 11.5,14.4131116 L11.4990909,13.9545455 L12.1818182,13.9545455 C12.4192241,13.9545455 12.6481282,13.9181446 12.8632537,13.8506196 Z M12.1818182,3.5 C13.1859723,3.5 14,4.31402773 14,5.31818182 L14,11.6818182 C14,12.6859723 13.1859723,13.5 12.1818182,13.5 L5.81818182,13.5 C4.81402773,13.5 4,12.6859723 4,11.6818182 L4,5.31818182 C4,4.31402773 4.81402773,3.5 5.81818182,3.5 L12.1818182,3.5 Z M5.59090955,11.2272727 C5.21435176,11.2272727 4.90909136,11.5325331 4.90909136,11.9090909 C4.90909136,12.2856487 5.21435176,12.5909091 5.59090955,12.5909091 C5.96746733,12.5909091 6.27272773,12.2856487 6.27272773,11.9090909 C6.27272773,11.5325331 5.96746733,11.2272727 5.59090955,11.2272727 Z M12.4090914,11.2272727 C12.0325336,11.2272727 11.7272732,11.5325331 11.7272732,11.9090909 C11.7272732,12.2856487 12.0325336,12.5909091 12.4090914,12.5909091 C12.7856491,12.5909091 13.0909095,12.2856487 13.0909095,11.9090909 C13.0909095,11.5325331 12.7856491,11.2272727 12.4090914,11.2272727 Z M13.0909095,6.22727273 L4.90909136,6.22727273 L4.90909136,9.63636364 C4.90909136,10.1384407 5.31610523,10.5454545 5.81818227,10.5454545 L12.1818186,10.5454545 C12.6838957,10.5454545 13.0909095,10.1384407 13.0909095,9.63636364 L13.0909095,6.22727273 Z M12.1818186,4.40909091 L5.81818227,4.40909091 C5.31610523,4.40909091 4.90909136,4.81610477 4.90909136,5.31818182 L4.90909136,5.77272727 L13.0909095,5.77272727 L13.0909095,5.31818182 C13.0909095,4.81610477 12.6838957,4.40909091 12.1818186,4.40909091 Z" id="Shape" fill="#000000" fill-rule="evenodd"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bus-s.svg b/data/styles/default/dark/symbols/bus-s.svg
index c36d9aede..af8800afb 100644
--- a/data/styles/default/dark/symbols/bus-s.svg
+++ b/data/styles/default/dark/symbols/bus-s.svg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#000" opacity=".6" />
-  <rect x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" />
-  <path d="m3.9997 4.3897c-0.51566 0-0.94397 0.42831-0.94397 0.94397v4.8878c2.7e-5 0.27612 0.22386 0.49996 0.49998 0.49998h0.48306c0.20293 0.51759 0.70904 0.8893 1.2942 0.8893 0.58475 0 1.091-0.37099 1.2942-0.88797h2.7447c0.20322 0.51701 0.70944 0.88797 1.2942 0.88797s1.091-0.37099 1.2942-0.88797h0.48306c0.27612-2.8e-5 0.49996-0.22386 0.49998-0.49998v-2.2122c4.7e-4 -0.00347 9.33e-4 -0.00694 0.0013-0.01042-5e-5 -0.016526-9.33e-4 -0.033039-0.0026-0.049478-0.009226-0.93623-0.27831-1.7919-0.74214-2.4413-0.47204-0.66086-1.175-1.1198-1.9778-1.1198zm0.05598 0.90464h1.2422v1.9143h-1.2422zm2.1692 0h1.2747v1.9143h-1.2747zm2.1968 0h0.95157l0.39061 1.9143h-1.3422zm1.7906 0c1.4777 0.23158 1.8643 1.7379 1.9112 2.6732l-1.275-0.015579zm-4.8793 4.3412c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592zm5.3331 0c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592z" fill="#000" />
- </g>
-</svg>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bus-s</title>
+    <g id="bus-s" stroke="none" fill="none">
+        <rect id="Rectangle" fill="#000000" fill-rule="nonzero" opacity="0.6" x="0" y="0" width="12" height="12" rx="1.875"></rect>
+        <rect id="Rectangle" fill="#2F6499" fill-rule="nonzero" x="0.5000025" y="0.5000025" width="11.00025" height="11.00025" rx="1.5"></rect>
+        <path d="M3.29508977,9.34523502 C3.44586141,9.39262979 3.60631034,9.41818182 3.77272727,9.41818182 L4.24936364,9.41818182 L4.25,9.73917814 C4.25,10.0027686 4.03631772,10.2164509 3.77272727,10.2164509 C3.50913682,10.2164509 3.29545455,10.0027686 3.29545455,9.73917814 L3.29508977,9.34523502 Z M8.70427756,9.34543375 L8.70454545,9.73917814 C8.70454545,10.0027686 8.49086318,10.2164509 8.22727273,10.2164509 C7.96368228,10.2164509 7.75,10.0027686 7.75,9.73917814 L7.74936364,9.41818182 L8.22727273,9.41818182 C8.3934569,9.41818182 8.55368977,9.39270121 8.70427756,9.34543375 Z M8.22727273,2.1 C8.93018059,2.1 9.5,2.66981941 9.5,3.37272727 L9.5,7.82727273 C9.5,8.53018059 8.93018059,9.1 8.22727273,9.1 L3.77272727,9.1 C3.06981941,9.1 2.5,8.53018059 2.5,7.82727273 L2.5,3.37272727 C2.5,2.66981941 3.06981941,2.1 3.77272727,2.1 L8.22727273,2.1 Z M3.61363668,7.50909091 C3.35004623,7.50909091 3.13636395,7.72277319 3.13636395,7.98636364 C3.13636395,8.24995409 3.35004623,8.46363636 3.61363668,8.46363636 C3.87722713,8.46363636 4.09090941,8.24995409 4.09090941,7.98636364 C4.09090941,7.72277319 3.87722713,7.50909091 3.61363668,7.50909091 Z M8.38636395,7.50909091 C8.12277351,7.50909091 7.90909123,7.72277319 7.90909123,7.98636364 C7.90909123,8.24995409 8.12277351,8.46363636 8.38636395,8.46363636 C8.6499544,8.46363636 8.86363668,8.24995409 8.86363668,7.98636364 C8.86363668,7.72277319 8.6499544,7.50909091 8.38636395,7.50909091 Z M8.86363668,4.00909091 L3.13636395,4.00909091 L3.13636395,6.39545455 C3.13636395,6.74690848 3.42127366,7.03181818 3.77272759,7.03181818 L8.22727305,7.03181818 C8.57872698,7.03181818 8.86363668,6.74690848 8.86363668,6.39545455 L8.86363668,4.00909091 Z M8.22727305,2.73636364 L3.77272759,2.73636364 C3.42127366,2.73636364 3.13636395,3.02127334 3.13636395,3.37272727 L3.13636395,3.69090909 L8.86363668,3.69090909 L8.86363668,3.37272727 C8.86363668,3.02127334 8.57872698,2.73636364 8.22727305,2.73636364 Z" id="Shape" fill="#000000" fill-rule="evenodd"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-m.svg b/data/styles/default/light/symbols/bus-m.svg
index 599432164..dbed078c9 100644
--- a/data/styles/default/light/symbols/bus-m.svg
+++ b/data/styles/default/light/symbols/bus-m.svg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m5.999 6.584c-0.77352 0-1.416 0.64249-1.416 1.416v7.332c4.1e-5 0.4142 0.3358 0.74996 0.75 0.75h0.72461c0.3044 0.77641 1.0636 1.334 1.9414 1.334 0.87716 0 1.6366-0.5565 1.9414-1.332h4.1172c0.30484 0.77554 1.0642 1.332 1.9414 1.332s1.6366-0.5565 1.9414-1.332h0.72461c0.4142-4.1e-5 0.74996-0.3358 0.75-0.75v-3.3184c7.06e-4 -0.0052 0.0014-0.01041 2e-3 -0.01563-7.5e-5 -0.02479-0.0014-0.04956-0.0039-0.07422-0.01389-1.4044-0.41753-2.688-1.1133-3.6621-0.70808-0.99132-1.7626-1.6797-2.9668-1.6797zm0.08398 1.357h1.8633v2.8715h-1.8633zm3.2539 0h1.9121v2.8715h-1.9121zm3.2953 0h1.4274l0.58594 2.8715h-2.0133zm2.686 0c2.2166 0.34738 2.7966 2.607 2.8669 4.01l-1.9126-0.02337zm-7.3192 6.5121c0.49963 0 0.88086 0.37927 0.88086 0.87891s-0.38122 0.88086-0.88086 0.88086c-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38123-0.87891 0.88086-0.87891zm8 0c0.49964 0 0.88086 0.37927 0.88086 0.87891 0 0.49963-0.38122 0.88086-0.88086 0.88086-0.49963 0-0.88086-0.38123-0.88086-0.88086s0.38122-0.87891 0.88086-0.87891z" fill="#fff"/>
- </g>
-</svg>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bus-m</title>
+    <g id="bus-m" stroke="none" fill="none">
+        <rect id="Rectangle" fill="#FFFFFF" fill-rule="nonzero" opacity="0.6" x="0" y="0" width="18" height="18" rx="1.875"></rect>
+        <rect id="Rectangle" fill="#2F6499" fill-rule="nonzero" x="0.75" y="0.75" width="16.5" height="16.5" rx="1.5"></rect>
+        <path d="M5.13584253,13.8503357 C5.35123059,13.9180426 5.58044335,13.9545455 5.81818182,13.9545455 L6.49909091,13.9545455 L6.5,14.4131116 C6.5,14.7896694 6.1947396,15.0949298 5.81818182,15.0949298 C5.44162403,15.0949298 5.13636364,14.7896694 5.13636364,14.4131116 L5.13584253,13.8503357 Z M12.8632537,13.8506196 L12.8636364,14.4131116 C12.8636364,14.7896694 12.558376,15.0949298 12.1818182,15.0949298 C11.8052604,15.0949298 11.5,14.7896694 11.5,14.4131116 L11.4990909,13.9545455 L12.1818182,13.9545455 C12.4192241,13.9545455 12.6481282,13.9181446 12.8632537,13.8506196 Z M12.1818182,3.5 C13.1859723,3.5 14,4.31402773 14,5.31818182 L14,11.6818182 C14,12.6859723 13.1859723,13.5 12.1818182,13.5 L5.81818182,13.5 C4.81402773,13.5 4,12.6859723 4,11.6818182 L4,5.31818182 C4,4.31402773 4.81402773,3.5 5.81818182,3.5 L12.1818182,3.5 Z M5.59090955,11.2272727 C5.21435176,11.2272727 4.90909136,11.5325331 4.90909136,11.9090909 C4.90909136,12.2856487 5.21435176,12.5909091 5.59090955,12.5909091 C5.96746733,12.5909091 6.27272773,12.2856487 6.27272773,11.9090909 C6.27272773,11.5325331 5.96746733,11.2272727 5.59090955,11.2272727 Z M12.4090914,11.2272727 C12.0325336,11.2272727 11.7272732,11.5325331 11.7272732,11.9090909 C11.7272732,12.2856487 12.0325336,12.5909091 12.4090914,12.5909091 C12.7856491,12.5909091 13.0909095,12.2856487 13.0909095,11.9090909 C13.0909095,11.5325331 12.7856491,11.2272727 12.4090914,11.2272727 Z M13.0909095,6.22727273 L4.90909136,6.22727273 L4.90909136,9.63636364 C4.90909136,10.1384407 5.31610523,10.5454545 5.81818227,10.5454545 L12.1818186,10.5454545 C12.6838957,10.5454545 13.0909095,10.1384407 13.0909095,9.63636364 L13.0909095,6.22727273 Z M12.1818186,4.40909091 L5.81818227,4.40909091 C5.31610523,4.40909091 4.90909136,4.81610477 4.90909136,5.31818182 L4.90909136,5.77272727 L13.0909095,5.77272727 L13.0909095,5.31818182 C13.0909095,4.81610477 12.6838957,4.40909091 12.1818186,4.40909091 Z" id="Shape" fill="#FFFFFF" fill-rule="evenodd"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bus-s.svg b/data/styles/default/light/symbols/bus-s.svg
index 7e9553755..456077408 100644
--- a/data/styles/default/light/symbols/bus-s.svg
+++ b/data/styles/default/light/symbols/bus-s.svg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#fff" opacity=".6" />
-  <rect x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" />
-  <path d="m3.9997 4.3897c-0.51566 0-0.94397 0.42831-0.94397 0.94397v4.8878c2.7e-5 0.27612 0.22386 0.49996 0.49998 0.49998h0.48306c0.20293 0.51759 0.70904 0.8893 1.2942 0.8893 0.58475 0 1.091-0.37099 1.2942-0.88797h2.7447c0.20322 0.51701 0.70944 0.88797 1.2942 0.88797s1.091-0.37099 1.2942-0.88797h0.48306c0.27612-2.8e-5 0.49996-0.22386 0.49998-0.49998v-2.2122c4.7e-4 -0.00347 9.33e-4 -0.00694 0.0013-0.01042-5e-5 -0.016526-9.33e-4 -0.033039-0.0026-0.049478-0.009226-0.93623-0.27831-1.7919-0.74214-2.4413-0.47204-0.66086-1.175-1.1198-1.9778-1.1198zm0.05598 0.90464h1.2422v1.9143h-1.2422zm2.1692 0h1.2747v1.9143h-1.2747zm2.1968 0h0.95157l0.39061 1.9143h-1.3422zm1.7906 0c1.4777 0.23158 1.8643 1.7379 1.9112 2.6732l-1.275-0.015579zm-4.8793 4.3412c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592zm5.3331 0c0.33308 0 0.58722 0.25284 0.58722 0.58592 0 0.33308-0.25414 0.58722-0.58722 0.58722-0.33308 0-0.58722-0.25414-0.58722-0.58722s0.25414-0.58592 0.58722-0.58592z" fill="#fff" />
- </g>
-</svg>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bus-s</title>
+    <g id="bus-s" stroke="none" fill="none">
+        <rect id="Rectangle" fill="#FFFFFF" fill-rule="nonzero" opacity="0.6" x="0" y="0" width="12" height="12" rx="1.875"></rect>
+        <rect id="Rectangle" fill="#2F6499" fill-rule="nonzero" x="0.5000025" y="0.5000025" width="11.00025" height="11.00025" rx="1.5"></rect>
+        <path d="M3.29508977,9.34523502 C3.44586141,9.39262979 3.60631034,9.41818182 3.77272727,9.41818182 L4.24936364,9.41818182 L4.25,9.73917814 C4.25,10.0027686 4.03631772,10.2164509 3.77272727,10.2164509 C3.50913682,10.2164509 3.29545455,10.0027686 3.29545455,9.73917814 L3.29508977,9.34523502 Z M8.70427756,9.34543375 L8.70454545,9.73917814 C8.70454545,10.0027686 8.49086318,10.2164509 8.22727273,10.2164509 C7.96368228,10.2164509 7.75,10.0027686 7.75,9.73917814 L7.74936364,9.41818182 L8.22727273,9.41818182 C8.3934569,9.41818182 8.55368977,9.39270121 8.70427756,9.34543375 Z M8.22727273,2.1 C8.93018059,2.1 9.5,2.66981941 9.5,3.37272727 L9.5,7.82727273 C9.5,8.53018059 8.93018059,9.1 8.22727273,9.1 L3.77272727,9.1 C3.06981941,9.1 2.5,8.53018059 2.5,7.82727273 L2.5,3.37272727 C2.5,2.66981941 3.06981941,2.1 3.77272727,2.1 L8.22727273,2.1 Z M3.61363668,7.50909091 C3.35004623,7.50909091 3.13636395,7.72277319 3.13636395,7.98636364 C3.13636395,8.24995409 3.35004623,8.46363636 3.61363668,8.46363636 C3.87722713,8.46363636 4.09090941,8.24995409 4.09090941,7.98636364 C4.09090941,7.72277319 3.87722713,7.50909091 3.61363668,7.50909091 Z M8.38636395,7.50909091 C8.12277351,7.50909091 7.90909123,7.72277319 7.90909123,7.98636364 C7.90909123,8.24995409 8.12277351,8.46363636 8.38636395,8.46363636 C8.6499544,8.46363636 8.86363668,8.24995409 8.86363668,7.98636364 C8.86363668,7.72277319 8.6499544,7.50909091 8.38636395,7.50909091 Z M8.86363668,4.00909091 L3.13636395,4.00909091 L3.13636395,6.39545455 C3.13636395,6.74690848 3.42127366,7.03181818 3.77272759,7.03181818 L8.22727305,7.03181818 C8.57872698,7.03181818 8.86363668,6.74690848 8.86363668,6.39545455 L8.86363668,4.00909091 Z M8.22727305,2.73636364 L3.77272759,2.73636364 C3.42127366,2.73636364 3.13636395,3.02127334 3.13636395,3.37272727 L3.13636395,3.69090909 L8.86363668,3.69090909 L8.86363668,3.37272727 C8.86363668,3.02127334 8.57872698,2.73636364 8.22727305,2.73636364 Z" id="Shape" fill="#FFFFFF" fill-rule="evenodd"></path>
+    </g>
+</svg>
\ No newline at end of file