diff --git a/data/styles/default/dark/symbols/bus-m.svg b/data/styles/default/dark/symbols/bus-m.svg
index 0763f0268..989d2b1bb 100644
--- a/data/styles/default/dark/symbols/bus-m.svg
+++ b/data/styles/default/dark/symbols/bus-m.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m5.17 13.7655956c.25262545.0671526.52146569.1033566.8003056.1033566h.79862814l.00106626.4548118c0 .3734748-.35803538.676236-.7996944.676236-.44165903 0-.7996944-.3027612-.7996944-.676236zm7.6595513.0002816.0004487.5578868c0 .3734748-.3579336.676236-.799467.676236-.4415335 0-.799467-.3027612-.799467-.676236l-.001066-.4548118h.800533c.2783706 0 .5467725-.0361028.7990183-.103075zm-.6737832-10.2658772c.9959329 0 1.803296.80736314 1.803296 1.80329603v6.31153617c0 .9959329-.8073631 1.803296-1.803296 1.803296h-6.31153616c-.99593289 0-1.80329603-.8073631-1.80329603-1.803296v-6.31153617c0-.99593289.80736314-1.80329603 1.80329603-1.80329603zm-6.28953208 7.6640081c-.37347484 0-.67623602.3027612-.67623602.676236 0 .3734749.30276118.6762361.67623602.6762361.37347483 0 .67623601-.3027612.67623601-.6762361 0-.3734748-.30276118-.676236-.67623601-.676236zm6.25999998 0c-.3734748 0-.676236.3027612-.676236.676236 0 .3734749.3027612.6762361.676236.6762361s.676236-.3027612.676236-.6762361c0-.3734748-.3027612-.676236-.676236-.676236zm.673764-4.6140081h-7.61v2.90526319c0 .42787536.37856812.77473681.84555556.77473681h5.91888884c.4669875 0 .8455556-.34686145.8455556-.77473681zm-.8455556-1.9h-5.91888884c-.46698744 0-.84555556.40368156-.84555556.90164802v.450824h7.61v-.450824c0-.49796646-.3785681-.90164802-.8455556-.90164802z" fill="#000" fill-rule="evenodd"/></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 af8800afb..65525513a 100644
--- a/data/styles/default/dark/symbols/bus-s.svg
+++ b/data/styles/default/dark/symbols/bus-s.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m3.4573332 9.06099952c.1417353.04455422.2925679.06857481.44901081.06857481h.44806967l.00059822.30175775c0 .24779244-.20087546.44866792-.44866789.44866792-.24779244 0-.44866789-.20087548-.44866789-.44866792zm5.08499384.00018682.00025184.37014574c0 .24779244-.20087545.44866792-.44866789.44866792-.24779243 0-.44866789-.20087548-.44866789-.44866792l-.00059822-.30175775h.44926611c.1562241 0 .30685358-.02395345.44841605-.06838799zm-.44841605-6.81118634c.66077983 0 1.19644771.53566789 1.19644771 1.19644771v4.18756699c0 .66077982-.53566788 1.1964477-1.19644771 1.1964477h-4.18756698c-.66077983 0-1.19644771-.53566788-1.19644771-1.1964477v-4.18756699c0-.66077982.53566788-1.19644771 1.19644771-1.19644771zm-4.33712265 5.08490277c-.24779243 0-.44866789.20087546-.44866789.44866789 0 .24779244.20087546.44866789.44866789.44866789.24779244 0 .4486679-.20087545.4486679-.44866789 0-.24779243-.20087546-.44866789-.4486679-.44866789zm4.48667891 0c-.24779243 0-.44866788.20087546-.44866788.44866789 0 .24779244.20087545.44866789.44866788.44866789.24779244 0 .44866789-.20087545.44866789-.44866789 0-.24779243-.20087545-.44866789-.44866789-.44866789zm.44866789-3.2902312h-5.38401469v2.24333945c0 .33038992.26783395.59822385.59822386.59822385h4.18756699c.33038991 0 .59822384-.26783393.59822384-.59822385zm-.59822384-1.19644771h-4.18756699c-.33038991 0-.59822386.26783394-.59822386.59822385v.29911193h5.38401469v-.29911193c0-.33038991-.26783393-.59822385-.59822384-.59822385z" fill="#000" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/subway-m.svg b/data/styles/default/dark/symbols/subway-m.svg
index 90cf050b5..f90a2f656 100644
--- a/data/styles/default/dark/symbols/subway-m.svg
+++ b/data/styles/default/dark/symbols/subway-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m10.5714286 3.89285714c2.1696714 0 3.9285714 1.7589 3.9285714 3.92857143v6.28571433c-.4339343 0-.7857143-.35178-.7857143-.7857143v-5.34285717c0-1.82254286-1.4774571-3.3-3.3-3.3h-2.82857141c-1.82254286 0-3.3 1.47745714-3.3 3.3v5.34285717c0 .4339343-.35178.7857143-.78571429.7857143v-6.28571433c0-2.16967143 1.7589-3.92857143 3.92857143-3.92857143zm.2084058 2.35712124c.7351437 0 1.3402125.57820812 1.3735562 1.312575l.2187488 4.81250002c.0320192.7044027-.471848 1.3090975-1.1513655 1.4195212l-.1909754.0175924-4.02841944.0003546c-.70516875 0-1.28632513-.5308049-1.36574966-1.2146459l-.00889573-.19158.21981239-4.84370939c.0333795-.7343875.6384675-1.31260793 1.37355625-1.31260793zm-3.7048344 5.50000002c-.30375812 0-.55.2462419-.55.55s.24624188.55.55.55c.30375813 0 .55-.2462419.55-.55s-.24624187-.55-.55-.55zm3.85 0c-.3037581 0-.55.2462419-.55.55s.2462419.55.55.55.55-.2462419.55-.55-.2462419-.55-.55-.55zm-.3826454-4.46875002h-3.0847438c-.3678158 0-.6704808.28951312-.68680892.656975l-.07706614 1.74927569c0 .37969253.3078075.68750003.6875.68750003l3.26803196-.000678c.3793212-.0168589.6731519-.3380232.6562944-.71733754l-.0763882-1.71875c-.0163315-.36746187-.319-.65698518-.6868193-.65698518z" fill="#000"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m10.6923077 3.25c2.3365692 0 4.2307692 1.89419999 4.2307692 4.23076921v6.76923079c-.4673139 0-.8461538-.37884-.8461538-.8461539v-5.75384612c0-1.96273845-1.5911077-3.55384613-3.5538462-3.55384613h-3.04615381c-1.96273846 0-3.55384614 1.59110768-3.55384614 3.55384613v5.75384612c0 .4673139-.37884.8461539-.84615385.8461539v-6.76923079c0-2.33656922 1.89419999-4.23076921 4.23076922-4.23076921zm.224437 2.53843825c.7916932 0 1.4433058.62268566 1.4792144 1.4135423l.2355756 5.18269235c.0344822.7585875-.508144 1.4097973-1.239932 1.5287151l-.2056659.0189456-4.3382978.0003819c-.7594125 0-1.38527321-.571636-1.47080732-1.3080802l-.00958002-.2063169.23672104-5.21630239c.03594715-.79087884.68758038-1.41357776 1.47921441-1.41357776zm-3.98982161 5.92307695c-.32712413 0-.59230769.2651835-.59230769.5923077 0 .3271241.26518356.5923076.59230769.5923076s.59230769-.2651835.59230769-.5923076c0-.3271242-.26518356-.5923077-.59230769-.5923077zm4.14615381 0c-.3271241 0-.5923077.2651835-.5923077.5923077 0 .3271241.2651836.5923076.5923077.5923076s.5923077-.2651835.5923077-.5923076c0-.3271242-.2651836-.5923077-.5923077-.5923077zm-.4120796-4.81250003h-3.32203182c-.39610932 0-.72205624.31178335-.73964037.70751153l-.0829943 1.88383535c0 .40889965.331485.74038465.74038461.74038465l3.51941898-.0007302c.4084998-.0181557.7249329-.36402494.7067786-.77251731l-.0822642-1.85096153c-.0175878-.39572816-.3435385-.70752249-.7396515-.70752249z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/subway-s.svg b/data/styles/default/dark/symbols/subway-s.svg
index 0ffea6eb5..99e2f3fe1 100644
--- a/data/styles/default/dark/symbols/subway-s.svg
+++ b/data/styles/default/dark/symbols/subway-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.125" width="12"/><rect fill="#2f6499" height="10.5" rx=".75" width="10.5" x=".75" y=".75"/><path d="m7.14285714 2.28571429c1.57794286 0 2.85714286 1.2792 2.85714286 2.85714285v4.57142857c-.31558857 0-.57142857-.25584-.57142857-.57142857v-3.88571428c0-1.32548572-1.07451429-2.4-2.4-2.4h-2.05714286c-1.32548571 0-2.4 1.07451428-2.4 2.4v3.88571428c0 .31558857-.25584.57142857-.57142857.57142857v-4.57142857c0-1.57794285 1.2792-2.85714285 2.85714286-2.85714285zm.15156786 1.71426998c.53465 0 .9747.420515.99895.9546l.15909 3.5c.02328671.51229286-.34316213.95207092-.83735668 1.03237909l-.13889126.01279447-2.92975956.00025789c-.51285 0-.93550918-.38603997-.99327249-.88337882l-.00646961-.13933093.15986355-3.52269775c.024276-.5341.46434-.95462395.99895-.95462395zm-2.694425 4.00000001c-.220915 0-.4.179085-.4.4s.179085.4.4.4.4-.179085.4-.4-.179085-.4-.4-.4zm2.8 0c-.220915 0-.4.179085-.4.4s.179085.4.4.4.4-.179085.4-.4-.179085-.4-.4-.4zm-.2782876-3.25h-2.24345c-.2675024 0-.4876224.210555-.4994974.4778l-.0560481 1.2722005c0 .27614.22386.5.5.5l2.3767505-.0004931c.27587-.012261.489565-.245835.477305-.5217l-.055555-1.25c-.0118775-.267245-.232-.4778074-.499505-.4778074z" fill="#000"/></g></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.125" width="12"/><rect fill="#2f6499" height="10.5" rx=".75" width="10.5" x=".75" y=".75"/><path d="m7.15384615 2.25c1.59311539 0 2.88461535 1.2915 2.88461535 2.88461538v4.61538462c-.31862303 0-.57692304-.2583-.57692304-.57692308v-3.92307692c0-1.33823077-1.08484615-2.42307692-2.42307692-2.42307692h-2.07692308c-1.33823077 0-2.42307693 1.08484615-2.42307693 2.42307692v3.92307692c0 .31862308-.2583.57692308-.57692307.57692308v-4.61538462c0-1.59311538 1.2915-2.88461538 2.88461539-2.88461538zm.15302525 1.73075335c.53979086 0 .98407211.42455841 1.00855529.96377884l.16061971 3.53365385c.02351062.51721876-.34646177.96122545-.84540819 1.04230582l-.14022675.01291749-2.95793033.00026037c-.51778125 0-.94450446-.38975189-1.00282319-.89187285l-.00653182-.14067065.1614007-3.55656985c.02450942-.53923557.46880481-.96380302 1.00855529-.96380302zm-2.72033294 4.03846155c-.22303918 0-.40384615.18080697-.40384615.40384615 0 .22303919.18080697.40384616.40384615.40384616s.40384615-.18080697.40384615-.40384616c0-.22303918-.18080697-.40384615-.40384615-.40384615zm2.82692308 0c-.22303918 0-.40384615.18080697-.40384615.40384615 0 .22303919.18080697.40384616.40384615.40384616s.40384615-.18080697.40384615-.40384616c0-.22303918-.18080697-.40384615-.40384615-.40384615zm-.28096344-3.28125h-2.26502164c-.27007454 0-.49231108.21257956-.50430026.48239423l-.05658702 1.2844332c0 .27879519.2260125.50480769.50480769.50480769l2.39960387-.00049784c.2785226-.0123789.49427236-.2481988.48189447-.52671635l-.05608918-1.26201923c-.01199171-.26981466-.23423077-.4824017-.50430793-.4824017z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/train-m.svg b/data/styles/default/dark/symbols/train-m.svg
index 02e968bca..98168cfa8 100644
--- a/data/styles/default/dark/symbols/train-m.svg
+++ b/data/styles/default/dark/symbols/train-m.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="0 0 24 24"
-   width="18"
-   height="18"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs1" />
-  <title
-     id="title1">train-m</title>
-  <g
-     id="Page-2:-Night"
-     fill="none"
-     fill-rule="evenodd"
-     opacity="1">
-    <g
-       id="train-m"
-       fill-rule="nonzero">
-      <rect
-         id="Rectangle"
-         width="24"
-         height="24"
-         rx="2.5"
-         fill="#000"
-         opacity=".6" />
-      <rect
-         id="rect1"
-         x="1"
-         y="1"
-         width="22"
-         height="22"
-         rx="2"
-         fill="#2F6499" />
-      <path
-         id="train-m-a"
-         d="m 9.033318,18 0.66667,-1 h -1.7 l -2,3 h 0.62963 c 0.66871,0 1.2932,-0.3342 1.6641,-0.8906 L 8.366652,19 h 7.2667 l 0.07293,0.1094 c 0.37093,0.5564 0.99539,0.8906 1.6641,0.8906 h 0.62963 l -2,-3 h -1.7 l 0.66667,1 h -5.9333 z m 0.3535,-14 h 5.2263 c 1.612,0 2.9358,1.2739 2.9978,2.8847 l 0.30917,8.0384 c 0.04245,1.1038 -0.8179,2.0329 -1.9217,2.0754 C 15.972778,16.999485 15.947148,17 15.921518,17 h -7.8432 c -1.1046,0 -2,-0.89543 -2,-2 0,-0.02563 4.926e-4,-0.05126 0.00148,-0.07687 l 0.30917,-8.0384003 c 0.061954,-1.6108 1.3858,-2.8847 2.9978,-2.8847 z m -0.46364,2.5 c -0.52136,0 -0.95524,0.40055 -0.99682,0.92025 l -0.24,3 c -0.00212,0.02653 -0.00318,0.05313 -0.00318,0.07975 0,0.55228 0.44772,1 1,1 h 6.6336 c 0.02661,0 0.05322,-0.0011 0.07974,-0.0032 0.55053,-0.04404 0.96111,-0.52603 0.91707,-1.0766 l -0.24,-3 c -0.04158,-0.5197 -0.47545,-0.92025 -0.99682,-0.92025 h -6.1536 z M 8.999983,15 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 z m 6,0 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 z m -4.75,-10 c -0.13807,0 -0.25,0.11193 -0.25,0.25 0,0.13807 0.11193,0.25 0.25,0.25 h 3.5 c 0.13807,0 0.25,-0.11193 0.25,-0.25 0,-0.13807 -0.11193,-0.25 -0.25,-0.25 z"
-         style="fill:#000000;fill-opacity:1" />
-    </g>
-  </g>
-  <metadata
-     id="metadata1">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:title>train-m</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" transform="matrix(-1 0 0 1 18 0)" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" transform="matrix(-1 0 0 1 18 0)" width="16.5" x=".75" y=".75"/><path d="m6.58956925 14.375.54166937-.8125h-1.38125l-1.625 2.4375h.51157438c.54332687 0 1.050725-.2715375 1.35208125-.7236125l.05925887-.0888875h5.90419378l.0592588.0888875c.3013807.452075.8087544.7236125 1.3520813.7236125h.5115744l-1.625-2.4375h-1.38125l.5416693.8125h-4.8208062zm.28721875-11.375h4.2463687c1.30975 0 2.3853375 1.03504375 2.4357125 2.34381875l.2512007 6.53119995c.0344906.8968376-.6645438 1.6517313-1.5613813 1.6862626-.0208081.0008003-.04163.0012187-.0624536.0012187h-6.3726c-.8974875 0-1.625-.7275369-1.625-1.625 0-.0208244.00040027-.0416487.00120063-.0624569l.25120063-6.53120022c.05033762-1.308775 1.1259625-2.34384288 2.4357125-2.34384288zm-.3767075 2.03122156c-.423605 0-.7761325.32547532-.80991625.74773157l-.195 2.43749999c-.0017225.02155482-.00258375.04316975-.00258375.06479282 0 .4487275.3637725.8125.8125.8125h5.3898c.0216239 0 .043238-.00086125.0647928-.00258375.4473056-.03578413.7809019-.42739938.7451194-.8747375l-.195-2.4375c-.0337838-.42225625-.3863031-.74770313-.8099163-.74770313h-4.99979996zm.06240406 6.90627844c.4487275 0 .8125-.3637725.8125-.8125s-.3637725-.8125-.8125-.8125-.8125.3637725-.8125.8125.3637725.8125.8125.8125zm4.87500004 0c.4487275 0 .8125-.3637725.8125-.8125s-.3637725-.8125-.8125-.8125-.8125.3637725-.8125.8125.3637725.8125.8125.8125zm-3.85937504-8.125c-.11218187 0-.203125.09094312-.203125.203125s.09094313.203125.203125.203125h2.84375004c.1121818 0 .203125-.09094312.203125-.203125s-.0909432-.203125-.203125-.203125z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/train-s.svg b/data/styles/default/dark/symbols/train-s.svg
index b0dfacd85..55213de62 100644
--- a/data/styles/default/dark/symbols/train-s.svg
+++ b/data/styles/default/dark/symbols/train-s.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="0 0 16 16"
-   width="12"
-   height="12"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs1" />
-  <title
-     id="title1">train-s</title>
-  <g
-     id="Page-2:-Night"
-     fill="none"
-     fill-rule="evenodd"
-     opacity="1">
-    <g
-       id="train-s"
-       fill-rule="nonzero">
-      <rect
-         id="Rectangle"
-         width="16"
-         height="16"
-         rx="2.5"
-         fill="#000"
-         opacity=".6" />
-      <rect
-         id="rect1"
-         x=".66667"
-         y=".66667"
-         width="14.667"
-         height="14.667"
-         rx="2"
-         fill="#2F6499" />
-      <path
-         id="train-m-a"
-         d="M 6.0222132,12 6.4666598,11.333333 H 5.3333265 l -1.333333,2 h 0.419753 c 0.445807,0 0.862133,-0.2228 1.1094,-0.593733 l 0.04862,-0.07293 h 4.8444665 l 0.04862,0.07293 c 0.247287,0.370933 0.663593,0.593733 1.1094,0.593733 h 0.419753 l -1.333333,-2 H 9.5333398 L 9.9777865,12 H 6.0222532 Z M 6.2578798,2.6666669 h 3.4842001 c 1.0746661,0 1.9572001,0.8492666 1.9985331,1.9231332 l 0.206113,5.3589334 C 11.975026,10.6846 11.40146,11.304 10.665593,11.332333 c -0.01707,6.57e-4 -0.03416,10e-4 -0.05125,10e-4 H 5.3855465 c -0.7364,0 -1.333333,-0.596953 -1.333333,-1.333333 0,-0.017087 3.28e-4,-0.034173 0.001,-0.051247 l 0.206113,-5.3589336 c 0.0413,-1.0738667 0.923867,-1.9231333 1.998533,-1.9231333 z M 5.9487865,4.3333334 c -0.347573,0 -0.636827,0.2670334 -0.664547,0.6135 l -0.16,2 c -0.0014,0.017687 -0.0021,0.03542 -0.0021,0.053167 0,0.3681867 0.29848,0.6666667 0.666667,0.6666667 h 4.4223995 c 0.01774,0 0.03548,-7.334e-4 0.05316,-0.00213 0.36702,-0.02936 0.64074,-0.3506866 0.61138,-0.7177333 l -0.16,-2 c -0.02775,-0.3464704 -0.317,-0.6135037 -0.66458,-0.6135037 H 5.9487665 Z M 5.9999935,10 c 0.3681863,0 0.6666663,-0.2984798 0.6666663,-0.6666665 0,-0.3681866 -0.29848,-0.6666666 -0.6666663,-0.6666666 -0.368187,0 -0.666667,0.29848 -0.666667,0.6666666 C 5.3333265,9.7015202 5.6318065,10 5.9999935,10 Z m 3.9999997,0 C 10.36818,10 10.66666,9.7015202 10.66666,9.3333335 c 0,-0.3681866 -0.29848,-0.6666666 -0.6666668,-0.6666666 -0.3681868,0 -0.6666667,0.29848 -0.6666667,0.6666666 C 9.3333265,9.7015202 9.6318064,10 9.9999932,10 Z M 6.8333265,3.3333334 c -0.092047,0 -0.1666667,0.07462 -0.1666667,0.1666667 0,0.092047 0.07462,0.1666667 0.1666667,0.1666667 h 2.3333333 c 0.092047,0 0.1666667,-0.07462 0.1666667,-0.1666667 0,-0.092047 -0.07462,-0.1666667 -0.1666667,-0.1666667 z"
-         style="fill:#000000;fill-opacity:1;stroke-width:0.666667" />
-    </g>
-  </g>
-  <metadata
-     id="metadata1">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:title>train-s</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-</svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m4.516658 9.33.333335-.5h-.85l-1 1.5h.314815c.334355 0 .6466-.1671.83205-.4453l.036467-.0547h3.63335l.036467.0547c.185465.2782.497695.4453.83205.4453h.314815l-1-1.5h-.85l.333335.5h-2.96665zm.17675-7h2.61315c.806 0 1.4679.63695 1.4989 1.44235l.154585 4.0192c.021225.5519-.40895 1.01645-.96085 1.0377-.012805.0004925-.0256185.00075-.038433.00075h-3.9216c-.5523 0-1-.447715-1-1 0-.012815.00024632-.02563.00073885-.038435l.154585-4.01920015c.030977-.8054.6929-1.44236485 1.4989-1.44236485zm-.23182 1.2499825c-.26068 0-.47762.2002925-.49841.4601425l-.12 1.5c-.00106.0132645-.00159.026566-.00159.0398725 0 .27614.22386.5.5.5h3.3168c.013307 0 .026608-.00053.0398725-.00159.275265-.022021.480555-.263015.458535-.5383l-.12-1.5c-.02079-.25985-.237725-.460125-.49841-.460125h-3.0768zm.0384025 4.2500175c.27614 0 .5-.22386.5-.5s-.22386-.5-.5-.5-.5.22386-.5.5.22386.5.5.5zm3 0c.27614 0 .5-.22386.5-.5s-.22386-.5-.5-.5-.5.22386-.5.5.22386.5.5.5zm-2.375-5c-.069035 0-.125.055965-.125.125s.055965.125.125.125h1.75c.069035 0 .125-.055965.125-.125s-.055965-.125-.125-.125z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/tram-m.svg b/data/styles/default/dark/symbols/tram-m.svg
index 048149634..3ffbabd27 100644
--- a/data/styles/default/dark/symbols/tram-m.svg
+++ b/data/styles/default/dark/symbols/tram-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.5221538 7c-.075-.9-.75-1.5-1.575-1.5h-1.35000001v-.675c.3 0 .67500001.075 1.05000001.15.3.075.6-.15.75-.525.075-.375-.15-.675-.525-.825-.675-.15-1.35000001-.225-1.95000001-.225h-.075c-1.125 0-1.95.225-2.025.225-.3.15-.45.525-.375.9s.45.6.825.525c.15 0 .525-.15.975-.15v.675h-1.425c-.825-.075-1.5.6-1.5 1.425l-.225 5.55v.075c0 .9.675 1.575 1.575 1.575h4.65000001.075c.9-.075 1.575-.825 1.5-1.65zm-6.30000001 2.775.075-2.175c0-.525.375-.9.825-.9h3.60000001c.45 0 .75.375.825.9l.075 2.175c0 .525-.3.9-.75.9h-.075-3.75000001c-.45 0-.825-.375-.825-.9zm.525 3.375c-.375 0-.675-.3-.675-.675s.3-.675.675-.675.675.225.675.6-.3.75-.675.75zm4.35000001 0c-.375 0-.675-.3-.675-.675s.3-.675.675-.675.675.3.675.675c0 .3-.3.675-.675.675z" fill="#000"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/tram-s.svg b/data/styles/default/dark/symbols/tram-s.svg
index 7d3351a92..c942a1d73 100644
--- a/data/styles/default/dark/symbols/tram-s.svg
+++ b/data/styles/default/dark/symbols/tram-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.32323573 4.7745836c-.04947049-.5936459-.49470492-.98940983-1.03888032-.98940983h-.89046885v-.44523443c.19788196 0 .44523442.04947049.69258688.09894098.19788197.0494705.39576393-.09894098.49470492-.34629344.04947049-.24735246-.09894099-.44523442-.34629345-.54417541-.44523442-.09894098-.89046884-.14841147-1.28623278-.14841147h-.04947049c-.74205737 0-1.28623278.14841147-1.33570327.14841147-.19788197.09894099-.29682295.34629345-.24735246.5936459.04947049.24735246.29682295.39576394.54417541.34629345.09894098 0 .34629344-.09894099.64311639-.09894099v.44523443h-.93993934c-.54417541-.04947049-.98940983.39576393-.98940983.93993934l-.14841148 3.66081638v.04947049c0 .5936459.44523442 1.03888032 1.03888032 1.03888032h3.06717048.0494705c.5936459-.04947049 1.03888032-.54417541.98940983-1.08835081zm-4.1555213 1.83040819.0494705-1.43464426c0-.34629344.24735245-.5936459.5441754-.5936459h2.3745836c.29682295 0 .49470492.24735246.54417541.5936459l.04947049 1.43464426c0 .34629344-.19788197.5936459-.49470492.5936459h-.04947049-2.47352458c-.29682295 0-.54417541-.24735246-.54417541-.5936459zm.34629345 2.22617212c-.24735246 0-.44523443-.19788197-.44523443-.44523442 0-.24735246.19788197-.44523443.44523443-.44523443.24735245 0 .44523442.14841148.44523442.39576393 0 .24735246-.19788197.49470492-.44523442.49470492zm2.86928851 0c-.24735246 0-.44523442-.19788197-.44523442-.44523442 0-.24735246.19788196-.44523443.44523442-.44523443s.44523442.19788197.44523442.44523443c0 .19788196-.19788196.44523442-.44523442.44523442z" fill="#000"/></g></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#000"/></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 dbed078c9..83a49048f 100644
--- a/data/styles/default/light/symbols/bus-m.svg
+++ b/data/styles/default/light/symbols/bus-m.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m5.17 13.7655956c.25262545.0671526.52146569.1033566.8003056.1033566h.79862814l.00106626.4548118c0 .3734748-.35803538.676236-.7996944.676236-.44165903 0-.7996944-.3027612-.7996944-.676236zm7.6595513.0002816.0004487.5578868c0 .3734748-.3579336.676236-.799467.676236-.4415335 0-.799467-.3027612-.799467-.676236l-.001066-.4548118h.800533c.2783706 0 .5467725-.0361028.7990183-.103075zm-.6737832-10.2658772c.9959329 0 1.803296.80736314 1.803296 1.80329603v6.31153617c0 .9959329-.8073631 1.803296-1.803296 1.803296h-6.31153616c-.99593289 0-1.80329603-.8073631-1.80329603-1.803296v-6.31153617c0-.99593289.80736314-1.80329603 1.80329603-1.80329603zm-6.28953208 7.6640081c-.37347484 0-.67623602.3027612-.67623602.676236 0 .3734749.30276118.6762361.67623602.6762361.37347483 0 .67623601-.3027612.67623601-.6762361 0-.3734748-.30276118-.676236-.67623601-.676236zm6.25999998 0c-.3734748 0-.676236.3027612-.676236.676236 0 .3734749.3027612.6762361.676236.6762361s.676236-.3027612.676236-.6762361c0-.3734748-.3027612-.676236-.676236-.676236zm.673764-4.6140081h-7.61v2.90526319c0 .42787536.37856812.77473681.84555556.77473681h5.91888884c.4669875 0 .8455556-.34686145.8455556-.77473681zm-.8455556-1.9h-5.91888884c-.46698744 0-.84555556.40368156-.84555556.90164802v.450824h7.61v-.450824c0-.49796646-.3785681-.90164802-.8455556-.90164802z" fill="#fff" fill-rule="evenodd"/></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 456077408..64fbec9aa 100644
--- a/data/styles/default/light/symbols/bus-s.svg
+++ b/data/styles/default/light/symbols/bus-s.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m3.4573332 9.06099952c.1417353.04455422.2925679.06857481.44901081.06857481h.44806967l.00059822.30175775c0 .24779244-.20087546.44866792-.44866789.44866792-.24779244 0-.44866789-.20087548-.44866789-.44866792zm5.08499384.00018682.00025184.37014574c0 .24779244-.20087545.44866792-.44866789.44866792-.24779243 0-.44866789-.20087548-.44866789-.44866792l-.00059822-.30175775h.44926611c.1562241 0 .30685358-.02395345.44841605-.06838799zm-.44841605-6.81118634c.66077983 0 1.19644771.53566789 1.19644771 1.19644771v4.18756699c0 .66077982-.53566788 1.1964477-1.19644771 1.1964477h-4.18756698c-.66077983 0-1.19644771-.53566788-1.19644771-1.1964477v-4.18756699c0-.66077982.53566788-1.19644771 1.19644771-1.19644771zm-4.33712265 5.08490277c-.24779243 0-.44866789.20087546-.44866789.44866789 0 .24779244.20087546.44866789.44866789.44866789.24779244 0 .4486679-.20087545.4486679-.44866789 0-.24779243-.20087546-.44866789-.4486679-.44866789zm4.48667891 0c-.24779243 0-.44866788.20087546-.44866788.44866789 0 .24779244.20087545.44866789.44866788.44866789.24779244 0 .44866789-.20087545.44866789-.44866789 0-.24779243-.20087545-.44866789-.44866789-.44866789zm.44866789-3.2902312h-5.38401469v2.24333945c0 .33038992.26783395.59822385.59822386.59822385h4.18756699c.33038991 0 .59822384-.26783393.59822384-.59822385zm-.59822384-1.19644771h-4.18756699c-.33038991 0-.59822386.26783394-.59822386.59822385v.29911193h5.38401469v-.29911193c0-.33038991-.26783393-.59822385-.59822384-.59822385z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/subway-m.svg b/data/styles/default/light/symbols/subway-m.svg
index b8aed2e5b..d5cd60446 100644
--- a/data/styles/default/light/symbols/subway-m.svg
+++ b/data/styles/default/light/symbols/subway-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m10.5714286 3.89285714c2.1696714 0 3.9285714 1.7589 3.9285714 3.92857143v6.28571433c-.4339343 0-.7857143-.35178-.7857143-.7857143v-5.34285717c0-1.82254286-1.4774571-3.3-3.3-3.3h-2.82857141c-1.82254286 0-3.3 1.47745714-3.3 3.3v5.34285717c0 .4339343-.35178.7857143-.78571429.7857143v-6.28571433c0-2.16967143 1.7589-3.92857143 3.92857143-3.92857143zm.2084058 2.35712124c.7351437 0 1.3402125.57820812 1.3735562 1.312575l.2187488 4.81250002c.0320192.7044027-.471848 1.3090975-1.1513655 1.4195212l-.1909754.0175924-4.02841944.0003546c-.70516875 0-1.28632513-.5308049-1.36574966-1.2146459l-.00889573-.19158.21981239-4.84370939c.0333795-.7343875.6384675-1.31260793 1.37355625-1.31260793zm-3.7048344 5.50000002c-.30375812 0-.55.2462419-.55.55s.24624188.55.55.55c.30375813 0 .55-.2462419.55-.55s-.24624187-.55-.55-.55zm3.85 0c-.3037581 0-.55.2462419-.55.55s.2462419.55.55.55.55-.2462419.55-.55-.2462419-.55-.55-.55zm-.3826454-4.46875002h-3.0847438c-.3678158 0-.6704808.28951312-.68680892.656975l-.07706614 1.74927569c0 .37969253.3078075.68750003.6875.68750003l3.26803196-.000678c.3793212-.0168589.6731519-.3380232.6562944-.71733754l-.0763882-1.71875c-.0163315-.36746187-.319-.65698518-.6868193-.65698518z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m10.6923077 3.25c2.3365692 0 4.2307692 1.89419999 4.2307692 4.23076921v6.76923079c-.4673139 0-.8461538-.37884-.8461538-.8461539v-5.75384612c0-1.96273845-1.5911077-3.55384613-3.5538462-3.55384613h-3.04615381c-1.96273846 0-3.55384614 1.59110768-3.55384614 3.55384613v5.75384612c0 .4673139-.37884.8461539-.84615385.8461539v-6.76923079c0-2.33656922 1.89419999-4.23076921 4.23076922-4.23076921zm.224437 2.53843825c.7916932 0 1.4433058.62268566 1.4792144 1.4135423l.2355756 5.18269235c.0344822.7585875-.508144 1.4097973-1.239932 1.5287151l-.2056659.0189456-4.3382978.0003819c-.7594125 0-1.38527321-.571636-1.47080732-1.3080802l-.00958002-.2063169.23672104-5.21630239c.03594715-.79087884.68758038-1.41357776 1.47921441-1.41357776zm-3.98982161 5.92307695c-.32712413 0-.59230769.2651835-.59230769.5923077 0 .3271241.26518356.5923076.59230769.5923076s.59230769-.2651835.59230769-.5923076c0-.3271242-.26518356-.5923077-.59230769-.5923077zm4.14615381 0c-.3271241 0-.5923077.2651835-.5923077.5923077 0 .3271241.2651836.5923076.5923077.5923076s.5923077-.2651835.5923077-.5923076c0-.3271242-.2651836-.5923077-.5923077-.5923077zm-.4120796-4.81250003h-3.32203182c-.39610932 0-.72205624.31178335-.73964037.70751153l-.0829943 1.88383535c0 .40889965.331485.74038465.74038461.74038465l3.51941898-.0007302c.4084998-.0181557.7249329-.36402494.7067786-.77251731l-.0822642-1.85096153c-.0175878-.39572816-.3435385-.70752249-.7396515-.70752249z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/subway-s.svg b/data/styles/default/light/symbols/subway-s.svg
index c41b2cd19..7dd4c5871 100644
--- a/data/styles/default/light/symbols/subway-s.svg
+++ b/data/styles/default/light/symbols/subway-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.125" width="12"/><rect fill="#2f6499" height="10.5" rx=".75" width="10.5" x=".75" y=".75"/><path d="m7.14285714 2.28571429c1.57794286 0 2.85714286 1.2792 2.85714286 2.85714285v4.57142857c-.31558857 0-.57142857-.25584-.57142857-.57142857v-3.88571428c0-1.32548572-1.07451429-2.4-2.4-2.4h-2.05714286c-1.32548571 0-2.4 1.07451428-2.4 2.4v3.88571428c0 .31558857-.25584.57142857-.57142857.57142857v-4.57142857c0-1.57794285 1.2792-2.85714285 2.85714286-2.85714285zm.15156786 1.71426998c.53465 0 .9747.420515.99895.9546l.15909 3.5c.02328671.51229286-.34316213.95207092-.83735668 1.03237909l-.13889126.01279447-2.92975956.00025789c-.51285 0-.93550918-.38603997-.99327249-.88337882l-.00646961-.13933093.15986355-3.52269775c.024276-.5341.46434-.95462395.99895-.95462395zm-2.694425 4.00000001c-.220915 0-.4.179085-.4.4s.179085.4.4.4.4-.179085.4-.4-.179085-.4-.4-.4zm2.8 0c-.220915 0-.4.179085-.4.4s.179085.4.4.4.4-.179085.4-.4-.179085-.4-.4-.4zm-.2782876-3.25h-2.24345c-.2675024 0-.4876224.210555-.4994974.4778l-.0560481 1.2722005c0 .27614.22386.5.5.5l2.3767505-.0004931c.27587-.012261.489565-.245835.477305-.5217l-.055555-1.25c-.0118775-.267245-.232-.4778074-.499505-.4778074z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.125" width="12"/><rect fill="#2f6499" height="10.5" rx=".75" width="10.5" x=".75" y=".75"/><path d="m7.15384615 2.25c1.59311539 0 2.88461535 1.2915 2.88461535 2.88461538v4.61538462c-.31862303 0-.57692304-.2583-.57692304-.57692308v-3.92307692c0-1.33823077-1.08484615-2.42307692-2.42307692-2.42307692h-2.07692308c-1.33823077 0-2.42307693 1.08484615-2.42307693 2.42307692v3.92307692c0 .31862308-.2583.57692308-.57692307.57692308v-4.61538462c0-1.59311538 1.2915-2.88461538 2.88461539-2.88461538zm.15302525 1.73075335c.53979086 0 .98407211.42455841 1.00855529.96377884l.16061971 3.53365385c.02351062.51721876-.34646177.96122545-.84540819 1.04230582l-.14022675.01291749-2.95793033.00026037c-.51778125 0-.94450446-.38975189-1.00282319-.89187285l-.00653182-.14067065.1614007-3.55656985c.02450942-.53923557.46880481-.96380302 1.00855529-.96380302zm-2.72033294 4.03846155c-.22303918 0-.40384615.18080697-.40384615.40384615 0 .22303919.18080697.40384616.40384615.40384616s.40384615-.18080697.40384615-.40384616c0-.22303918-.18080697-.40384615-.40384615-.40384615zm2.82692308 0c-.22303918 0-.40384615.18080697-.40384615.40384615 0 .22303919.18080697.40384616.40384615.40384616s.40384615-.18080697.40384615-.40384616c0-.22303918-.18080697-.40384615-.40384615-.40384615zm-.28096344-3.28125h-2.26502164c-.27007454 0-.49231108.21257956-.50430026.48239423l-.05658702 1.2844332c0 .27879519.2260125.50480769.50480769.50480769l2.39960387-.00049784c.2785226-.0123789.49427236-.2481988.48189447-.52671635l-.05608918-1.26201923c-.01199171-.26981466-.23423077-.4824017-.50430793-.4824017z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/train-m.svg b/data/styles/default/light/symbols/train-m.svg
index c414a743c..43322f42f 100644
--- a/data/styles/default/light/symbols/train-m.svg
+++ b/data/styles/default/light/symbols/train-m.svg
@@ -1,58 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="0 0 24 24"
-   width="18"
-   height="18"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs1" />
-  <title
-     id="title1">train-m</title>
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="g1"
-     transform="matrix(-1,0,0,1,24,0)">
-    <g
-       id="train-m"
-       fill-rule="nonzero">
-      <rect
-         id="Rectangle"
-         width="24"
-         height="24"
-         rx="2.5"
-         fill="#ffffff"
-         opacity="0.6"
-         x="0"
-         y="0" />
-      <rect
-         id="rect1"
-         x="1"
-         y="1"
-         width="22"
-         height="22"
-         rx="2"
-         fill="#2f6499" />
-      <path
-         id="train-m-a"
-         d="m 3.0333,14 0.66667,-1 h -1.7 l -2,3 H 0.6296 c 0.66871,0 1.2932,-0.3342 1.6641,-0.8906 L 2.366634,15 h 7.2667 l 0.072934,0.1094 c 0.37093,0.5564 0.99539,0.8906 1.6641,0.8906 h 0.62963 l -2,-3 h -1.7 l 0.66667,1 h -5.9333 z M 3.3868,0 h 5.2263 c 1.612,0 2.9358,1.2739 2.9978,2.8847 l 0.30917,8.0384 c 0.04245,1.1038 -0.8179,2.0329 -1.9217,2.0754 C 9.97276,12.999485 9.947133,13 9.921504,13 h -7.8432 c -1.1046,0 -2,-0.89543 -2,-2 0,-0.02563 4.9264e-4,-0.05126 0.0014777,-0.07687 l 0.30917,-8.0384003 c 0.061954,-1.6108 1.3858,-2.8847 2.9978,-2.8847 z M 2.92316,2.5 C 2.4018,2.5 1.96792,2.90055 1.92634,3.42025 l -0.24,3 C 1.68422,6.446779 1.68316,6.473382 1.68316,6.499995 c 0,0.55228 0.44772,1 1,1 h 6.6336 c 0.026614,0 0.053216,-0.00106 0.079745,-0.00318 0.55053,-0.044042 0.96111,-0.52603 0.91707,-1.0766 l -0.24,-3 c -0.04158,-0.5197 -0.47545,-0.92025 -0.99682,-0.92025 h -6.1536 z M 2.999965,11 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 z m 6,0 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 z m -4.75,-10 c -0.13807,0 -0.25,0.11193 -0.25,0.25 0,0.13807 0.11193,0.25 0.25,0.25 h 3.5 c 0.13807,0 0.25,-0.11193 0.25,-0.25 0,-0.13807 -0.11193,-0.25 -0.25,-0.25 z"
-         transform="matrix(-1,0,0,1,17.999984,4)"
-         style="fill:#ffffff;fill-opacity:1" />
-    </g>
-  </g>
-  <metadata
-     id="metadata1">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:title>train-m</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" transform="matrix(-1 0 0 1 18 0)" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" transform="matrix(-1 0 0 1 18 0)" width="16.5" x=".75" y=".75"/><path d="m6.58956925 14.375.54166937-.8125h-1.38125l-1.625 2.4375h.51157438c.54332687 0 1.050725-.2715375 1.35208125-.7236125l.05925887-.0888875h5.90419378l.0592588.0888875c.3013807.452075.8087544.7236125 1.3520813.7236125h.5115744l-1.625-2.4375h-1.38125l.5416693.8125h-4.8208062zm.28721875-11.375h4.2463687c1.30975 0 2.3853375 1.03504375 2.4357125 2.34381875l.2512007 6.53119995c.0344906.8968376-.6645438 1.6517313-1.5613813 1.6862626-.0208081.0008003-.04163.0012187-.0624536.0012187h-6.3726c-.8974875 0-1.625-.7275369-1.625-1.625 0-.0208244.00040027-.0416487.00120063-.0624569l.25120063-6.53120022c.05033762-1.308775 1.1259625-2.34384288 2.4357125-2.34384288zm-.3767075 2.03122156c-.423605 0-.7761325.32547532-.80991625.74773157l-.195 2.43749999c-.0017225.02155482-.00258375.04316975-.00258375.06479282 0 .4487275.3637725.8125.8125.8125h5.3898c.0216239 0 .043238-.00086125.0647928-.00258375.4473056-.03578413.7809019-.42739938.7451194-.8747375l-.195-2.4375c-.0337838-.42225625-.3863031-.74770313-.8099163-.74770313h-4.99979996zm.06240406 6.90627844c.4487275 0 .8125-.3637725.8125-.8125s-.3637725-.8125-.8125-.8125-.8125.3637725-.8125.8125.3637725.8125.8125.8125zm4.87500004 0c.4487275 0 .8125-.3637725.8125-.8125s-.3637725-.8125-.8125-.8125-.8125.3637725-.8125.8125.3637725.8125.8125.8125zm-3.85937504-8.125c-.11218187 0-.203125.09094312-.203125.203125s.09094313.203125.203125.203125h2.84375004c.1121818 0 .203125-.09094312.203125-.203125s-.0909432-.203125-.203125-.203125z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/train-s.svg b/data/styles/default/light/symbols/train-s.svg
index 703ff811a..62c169562 100644
--- a/data/styles/default/light/symbols/train-s.svg
+++ b/data/styles/default/light/symbols/train-s.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="0 0 16 16"
-   width="12"
-   height="12"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs1" />
-  <title
-     id="title1">train-s</title>
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="g1">
-    <g
-       id="train-s"
-       fill-rule="nonzero">
-      <rect
-         id="Rectangle"
-         width="16"
-         height="16"
-         rx="2.5"
-         fill="#fff"
-         opacity=".6" />
-      <rect
-         id="rect1"
-         x=".66667"
-         y=".66667"
-         width="14.667"
-         height="14.667"
-         rx="2"
-         fill="#2F6499" />
-      <path
-         id="train-m-a-8"
-         d="m 3.0333,14 0.66667,-1 h -1.7 l -2,3 H 0.6296 c 0.66871,0 1.2932,-0.3342 1.6641,-0.8906 L 2.366634,15 h 7.2667 l 0.072934,0.1094 c 0.37093,0.5564 0.99539,0.8906 1.6641,0.8906 h 0.62963 l -2,-3 h -1.7 l 0.66667,1 h -5.9333 z M 3.3868,0 h 5.2263 c 1.612,0 2.9358,1.2739 2.9978,2.8847 l 0.30917,8.0384 c 0.04245,1.1038 -0.8179,2.0329 -1.9217,2.0754 C 9.97276,12.999485 9.947133,13 9.921504,13 h -7.8432 c -1.1046,0 -2,-0.89543 -2,-2 0,-0.02563 4.9264e-4,-0.05126 0.0014777,-0.07687 l 0.30917,-8.0384003 c 0.061954,-1.6108 1.3858,-2.8847 2.9978,-2.8847 z M 2.92316,2.5 C 2.4018,2.5 1.96792,2.90055 1.92634,3.42025 l -0.24,3 C 1.68422,6.446779 1.68316,6.473382 1.68316,6.499995 c 0,0.55228 0.44772,1 1,1 h 6.6336 c 0.026614,0 0.053216,-0.00106 0.079745,-0.00318 0.55053,-0.044042 0.96111,-0.52603 0.91707,-1.0766 l -0.24,-3 c -0.04158,-0.5197 -0.47545,-0.92025 -0.99682,-0.92025 h -6.1536 z M 2.999965,11 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 z m 6,0 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 z m -4.75,-10 c -0.13807,0 -0.25,0.11193 -0.25,0.25 0,0.13807 0.11193,0.25 0.25,0.25 h 3.5 c 0.13807,0 0.25,-0.11193 0.25,-0.25 0,-0.13807 -0.11193,-0.25 -0.25,-0.25 z"
-         transform="matrix(0.66666667,0,0,0.66666667,4.0001807,2.6668367)"
-         style="fill:#ffffff;fill-opacity:1" />
-    </g>
-  </g>
-  <metadata
-     id="metadata1">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:title>train-s</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-</svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m4.516658 9.33.333335-.5h-.85l-1 1.5h.314815c.334355 0 .6466-.1671.83205-.4453l.036467-.0547h3.63335l.036467.0547c.185465.2782.497695.4453.83205.4453h.314815l-1-1.5h-.85l.333335.5h-2.96665zm.17675-7h2.61315c.806 0 1.4679.63695 1.4989 1.44235l.154585 4.0192c.021225.5519-.40895 1.01645-.96085 1.0377-.012805.0004925-.0256185.00075-.038433.00075h-3.9216c-.5523 0-1-.447715-1-1 0-.012815.00024632-.02563.00073885-.038435l.154585-4.01920015c.030977-.8054.6929-1.44236485 1.4989-1.44236485zm-.23182 1.2499825c-.26068 0-.47762.2002925-.49841.4601425l-.12 1.5c-.00106.0132645-.00159.026566-.00159.0398725 0 .27614.22386.5.5.5h3.3168c.013307 0 .026608-.00053.0398725-.00159.275265-.022021.480555-.263015.458535-.5383l-.12-1.5c-.02079-.25985-.237725-.460125-.49841-.460125h-3.0768zm.0384025 4.2500175c.27614 0 .5-.22386.5-.5s-.22386-.5-.5-.5-.5.22386-.5.5.22386.5.5.5zm3 0c.27614 0 .5-.22386.5-.5s-.22386-.5-.5-.5-.5.22386-.5.5.22386.5.5.5zm-2.375-5c-.069035 0-.125.055965-.125.125s.055965.125.125.125h1.75c.069035 0 .125-.055965.125-.125s-.055965-.125-.125-.125z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/tram-m.svg b/data/styles/default/light/symbols/tram-m.svg
index 3156bc89f..b996a264c 100644
--- a/data/styles/default/light/symbols/tram-m.svg
+++ b/data/styles/default/light/symbols/tram-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.5221538 7c-.075-.9-.75-1.5-1.575-1.5h-1.35000001v-.675c.3 0 .67500001.075 1.05000001.15.3.075.6-.15.75-.525.075-.375-.15-.675-.525-.825-.675-.15-1.35000001-.225-1.95000001-.225h-.075c-1.125 0-1.95.225-2.025.225-.3.15-.45.525-.375.9s.45.6.825.525c.15 0 .525-.15.975-.15v.675h-1.425c-.825-.075-1.5.6-1.5 1.425l-.225 5.55v.075c0 .9.675 1.575 1.575 1.575h4.65000001.075c.9-.075 1.575-.825 1.5-1.65zm-6.30000001 2.775.075-2.175c0-.525.375-.9.825-.9h3.60000001c.45 0 .75.375.825.9l.075 2.175c0 .525-.3.9-.75.9h-.075-3.75000001c-.45 0-.825-.375-.825-.9zm.525 3.375c-.375 0-.675-.3-.675-.675s.3-.675.675-.675.675.225.675.6-.3.75-.675.75zm4.35000001 0c-.375 0-.675-.3-.675-.675s.3-.675.675-.675.675.3.675.675c0 .3-.3.675-.675.675z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/tram-s.svg b/data/styles/default/light/symbols/tram-s.svg
index 52ab84a7e..e84d5ded2 100644
--- a/data/styles/default/light/symbols/tram-s.svg
+++ b/data/styles/default/light/symbols/tram-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.32323573 4.7745836c-.04947049-.5936459-.49470492-.98940983-1.03888032-.98940983h-.89046885v-.44523443c.19788196 0 .44523442.04947049.69258688.09894098.19788197.0494705.39576393-.09894098.49470492-.34629344.04947049-.24735246-.09894099-.44523442-.34629345-.54417541-.44523442-.09894098-.89046884-.14841147-1.28623278-.14841147h-.04947049c-.74205737 0-1.28623278.14841147-1.33570327.14841147-.19788197.09894099-.29682295.34629345-.24735246.5936459.04947049.24735246.29682295.39576394.54417541.34629345.09894098 0 .34629344-.09894099.64311639-.09894099v.44523443h-.93993934c-.54417541-.04947049-.98940983.39576393-.98940983.93993934l-.14841148 3.66081638v.04947049c0 .5936459.44523442 1.03888032 1.03888032 1.03888032h3.06717048.0494705c.5936459-.04947049 1.03888032-.54417541.98940983-1.08835081zm-4.1555213 1.83040819.0494705-1.43464426c0-.34629344.24735245-.5936459.5441754-.5936459h2.3745836c.29682295 0 .49470492.24735246.54417541.5936459l.04947049 1.43464426c0 .34629344-.19788197.5936459-.49470492.5936459h-.04947049-2.47352458c-.29682295 0-.54417541-.24735246-.54417541-.5936459zm.34629345 2.22617212c-.24735246 0-.44523443-.19788197-.44523443-.44523442 0-.24735246.19788197-.44523443.44523443-.44523443.24735245 0 .44523442.14841148.44523442.39576393 0 .24735246-.19788197.49470492-.44523442.49470492zm2.86928851 0c-.24735246 0-.44523442-.19788197-.44523442-.44523442 0-.24735246.19788196-.44523443.44523442-.44523443s.44523442.19788197.44523442.44523443c0 .19788196-.19788196.44523442-.44523442.44523442z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#fff"/></g></svg>
\ No newline at end of file