diff --git a/docs/Changelog.md b/docs/Changelog.md
index c2b3d68d..655010a9 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -13,6 +13,7 @@
 - MapFileTileSource zoom level API enhancements [#219](https://github.com/mapsforge/vtm/issues/219)
 - Animator enhancements with easing functions [#246](https://github.com/mapsforge/vtm/issues/246)
 - Tile grid layer scaling [#238](https://github.com/mapsforge/vtm/issues/238)
+- Internal render themes new SVG resources [#251](https://github.com/mapsforge/vtm/issues/251)
 - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41)
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.7.0)
diff --git a/vtm-playground/resources/assets/styles/stylemenu.xml b/vtm-playground/resources/assets/vtm/stylemenu.xml
similarity index 100%
rename from vtm-playground/resources/assets/styles/stylemenu.xml
rename to vtm-playground/resources/assets/vtm/stylemenu.xml
diff --git a/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java b/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
index 16fd484d..7eb21521 100644
--- a/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
+++ b/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
@@ -72,7 +72,7 @@ public class MapsforgeStyleTest extends GdxMap {
     }
 
     private void loadTheme(final String styleId) {
-        mMap.setTheme(new StreamRenderTheme("", getClass().getResourceAsStream("/assets/styles/stylemenu.xml"), new XmlRenderThemeMenuCallback() {
+        mMap.setTheme(new StreamRenderTheme("", getClass().getResourceAsStream("/assets/vtm/stylemenu.xml"), new XmlRenderThemeMenuCallback() {
             @Override
             public Set<String> getCategories(XmlRenderThemeStyleMenu renderThemeStyleMenu) {
                 // Use the selected style or the default
diff --git a/vtm-themes/icons/maki.png b/vtm-themes/icons/atlas/maki.png
similarity index 100%
rename from vtm-themes/icons/maki.png
rename to vtm-themes/icons/atlas/maki.png
diff --git a/vtm-themes/icons/maki.xml b/vtm-themes/icons/atlas/maki.xml
similarity index 100%
rename from vtm-themes/icons/maki.xml
rename to vtm-themes/icons/atlas/maki.xml
diff --git a/vtm-themes/icons/osm.png b/vtm-themes/icons/atlas/osm.png
similarity index 100%
rename from vtm-themes/icons/osm.png
rename to vtm-themes/icons/atlas/osm.png
diff --git a/vtm-themes/icons/osm.xml b/vtm-themes/icons/atlas/osm.xml
similarity index 100%
rename from vtm-themes/icons/osm.xml
rename to vtm-themes/icons/atlas/osm.xml
diff --git a/vtm-themes/icons/osmarender.png b/vtm-themes/icons/atlas/osmarender.png
similarity index 100%
rename from vtm-themes/icons/osmarender.png
rename to vtm-themes/icons/atlas/osmarender.png
diff --git a/vtm-themes/icons/osmarender.xml b/vtm-themes/icons/atlas/osmarender.xml
similarity index 100%
rename from vtm-themes/icons/osmarender.xml
rename to vtm-themes/icons/atlas/osmarender.xml
diff --git a/vtm-themes/icons/symbols/accommodation/alpinehut.svg b/vtm-themes/icons/symbols/accommodation/alpinehut.svg
new file mode 100755
index 00000000..d949def5
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/alpinehut.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 292.5262,455.65339 L 302.89454,540.80137 C 304.14266,550.0975 309.72218,555.51628 319.63318,557.05772 C 326.45137,557.99397 332.41627,556.06004 337.52792,551.25594 C 342.63911,546.45188 344.73145,540.64065 343.8049,533.82221 L 331.56409,437.07068 C 330.32503,429.94032 326.00325,425.62529 321.87774,419.87263 L 290.14433,375.62306 L 320.8271,322.17291 L 336.16139,341.69185 C 337.40003,343.55503 339.26302,344.94992 341.75038,345.87653 L 376.21612,362.61516 C 377.75733,363.23001 379.14748,363.53734 380.38661,363.5372 C 384.72702,363.53734 388.44828,361.83275 391.55043,358.42341 C 394.65198,355.01437 396.2029,351.13942 396.2032,346.79856 C 396.2029,339.05357 392.48164,333.94215 385.03936,331.46426 L 358.47484,316.59809 L 320.35898,270.56683 C 315.09133,264.37284 307.6535,260.50027 298.04553,258.94909 C 281.31618,256.47165 268.76696,262.35854 260.39777,276.60977 L 218.09726,349.59306 C 215.30739,354.24601 214.06854,359.97684 214.38069,366.78563 L 215.77087,459.28787 L 183.69795,528.08652 C 182.45904,530.87627 181.6883,533.19792 181.38573,535.0515 C 180.44945,540.94308 181.68594,546.13489 185.09519,550.62694 C 188.50433,555.11889 193.15474,557.83301 199.04641,558.76928 C 208.95713,560.3107 215.92681,556.90151 219.95553,548.54169 L 255.29108,473.23201 C 256.52978,470.44228 257.14922,467.5012 257.14934,464.40876 L 256.68123,407.22788 L 292.5262,455.65339 z M 317.11053,254.76443 C 325.47967,254.76469 332.76143,251.74323 338.95589,245.70003 C 345.14992,239.65738 348.24704,232.29994 348.24725,223.62772 C 348.24704,215.2587 345.14992,207.97457 338.95589,201.77529 C 332.76143,195.57664 325.47967,192.47717 317.11053,192.47684 C 308.42897,192.47717 301.06681,195.57664 295.02407,201.77529 C 288.98096,207.97457 285.9595,215.2587 285.95964,223.62772 C 285.9595,232.29994 288.98096,239.65738 295.02407,245.70003 C 301.06681,251.74323 308.42897,254.76469 317.11053,254.76443 L 317.11053,254.76443 z M 208.33779,339.83357 L 254.82297,259.88531 C 257.92469,254.61811 256.84187,250.5895 251.57453,247.79947 L 236.69415,238.96201 C 231.42659,235.8699 227.39797,236.95743 224.60829,242.22464 L 178.12313,322.17291 C 175.0307,327.44057 176.11822,331.46918 181.38573,334.25878 L 196.25192,343.08201 C 201.5193,346.18402 205.54793,345.10123 208.33779,339.83357 L 208.33779,339.83357 z" id="flowRoot3192" sodipodi:nodetypes="cccsccscccccsssccccccccccscccccccsscsssscccccccccccc" fill="#ffffff"/>
+ <path d="M 378.7668,360.28972 L 378.7668,540.66063" id="path2770" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="12.867"/>
+ <g id="g3548" transform="translate(0,-94)">
+  <path d="M 31.672085,267.24336 L 288.29972,130.37529 L 544.92735,267.24336 L 527.74447,284.74081 L 441.94873,250.13486 L 288.20798,231.63196 L 134.11608,249.86754 L 48.769323,284.35596 L 31.672085,267.24336 z" id="path7057" sodipodi:nodetypes="ccccccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.944"/>
+  <rect id="rect7061" width="31.996" height="308.13" x="456.8" y="266.58" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25.17" rx="0"/>
+  <rect y="266.58" x="84.8" height="308.13" width="31.996" id="rect3546" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25.17" rx="0"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/bed_and_breakfast.svg b/vtm-themes/icons/symbols/accommodation/bed_and_breakfast.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/bed_and_breakfast.svg
rename to vtm-themes/icons/symbols/accommodation/bed_and_breakfast.svg
diff --git a/vtm-themes/resources/assets/symbols/accommodation/bed_and_breakfast2.svg b/vtm-themes/icons/symbols/accommodation/bed_and_breakfast2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/bed_and_breakfast2.svg
rename to vtm-themes/icons/symbols/accommodation/bed_and_breakfast2.svg
diff --git a/vtm-themes/icons/symbols/accommodation/camping.svg b/vtm-themes/icons/symbols/accommodation/camping.svg
new file mode 100755
index 00000000..d67767b7
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/camping.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 288.27197,138.47099 C 286.76224,146.8004 92.8253,507.19334 92.8253,507.19334 L 483.17348,506.5467 L 288.27197,138.47099 z" id="path2443" sodipodi:nodetypes="cccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
+ <path sodipodi:nodetypes="csccc" id="path2383" d="M 288.27197,162.58083 C 287.53256,166.66023 275.50214,187.26222 301.10443,277.13002 C 327.77756,370.75661 399.37636,507.19334 399.37636,507.19334 L 483.17348,506.5467 L 288.27197,162.58083 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
+ <path d="M 291.6525,162.58083 C 292.3919,166.66023 304.42233,187.26222 278.82004,277.13002 C 252.14691,370.75661 180.54811,507.19334 180.54811,507.19334 L 96.75099,506.5467 L 291.6525,162.58083 z" id="path3155" sodipodi:nodetypes="csccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
+ <path sodipodi:nodetypes="ccc" id="path3157" d="M 249.69622,63.73048 L 483.17348,506.5467 L 249.69622,63.73048 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
+ <path d="M 328.51443,66.14146 L 95.393229,506.5467 L 328.51443,66.14146 z" id="path3161" sodipodi:nodetypes="ccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/accommodation/caravan_park.svg b/vtm-themes/icons/symbols/accommodation/caravan_park.svg
new file mode 100755
index 00000000..7b0398e3
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/caravan_park.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path transform="matrix(14.685839,0,0,14.685839,565.76584,1146.0639)" d="M -8.7426758,-60.988525 C -8.7427061,-60.215399 -9.115834,-59.828844 -9.8620605,-59.828857 L -13.822021,-59.828857 C -14.569116,-59.828844 -14.942651,-60.215399 -14.942627,-60.988525 L -14.942627,-62.868408 C -14.942651,-63.615461 -14.569116,-63.988996 -13.822021,-63.989014 L -9.8620605,-63.989014 C -9.115834,-63.988996 -8.7427061,-63.615461 -8.7426758,-62.868408 L -8.7426758,-60.988525 z M -20.021973,-60.948242 C -20.021992,-60.201972 -20.408954,-59.828844 -21.182861,-59.828857 L -29.742432,-59.828857 C -30.489511,-59.828844 -30.863045,-60.201972 -30.863037,-60.948242 L -30.863037,-62.868408 C -30.863045,-63.615461 -30.489511,-63.988996 -29.742432,-63.989014 L -21.182861,-63.989014 C -20.408954,-63.988996 -20.021992,-63.615461 -20.021973,-62.868408 L -20.021973,-60.948242 z M -2.4621582,-51.947998 L -5.3430176,-51.947998 L -5.3430176,-61.947998 C -5.3430513,-63.495018 -5.8830084,-64.80178 -6.9628906,-65.868286 C -8.042837,-66.934753 -9.3428845,-67.467996 -10.863037,-67.468018 L -29.58252,-67.468018 C -31.129565,-67.467996 -32.436327,-66.934753 -33.502808,-65.868286 C -34.5693,-64.80178 -35.102543,-63.495018 -35.102539,-61.947998 L -35.102539,-54.86792 C -35.102543,-53.748121 -34.70256,-52.788242 -33.902588,-51.988281 C -33.102626,-51.188309 -32.142748,-50.788325 -31.022949,-50.78833 L -24.58252,-50.78833 C -24.502781,-51.934971 -24.049494,-52.908278 -23.222656,-53.708252 C -22.39585,-54.508211 -21.395688,-54.908194 -20.222168,-54.908203 C -19.075541,-54.908194 -18.082296,-54.508211 -17.242432,-53.708252 C -16.402611,-52.908278 -15.955834,-51.948399 -15.9021,-50.828613 L -1.3427734,-50.828613 C -1.3428112,-51.574864 -1.715939,-51.947992 -2.4621582,-51.947998 L -2.4621582,-51.947998 z M -20.222168,-49.148926 C -20.595722,-49.148923 -20.915749,-49.282183 -21.182251,-49.548706 C -21.448789,-49.815223 -21.582049,-50.13525 -21.582031,-50.508789 C -21.582049,-50.908361 -21.448789,-51.234899 -21.182251,-51.488403 C -20.915749,-51.741897 -20.595722,-51.868647 -20.222168,-51.868652 C -19.849466,-51.868647 -19.529642,-51.741897 -19.262695,-51.488403 C -18.995788,-51.234899 -18.862325,-50.908361 -18.862305,-50.508789 C -18.862325,-50.13525 -18.995788,-49.815223 -19.262695,-49.548706 C -19.529642,-49.282183 -19.849466,-49.148923 -20.222168,-49.148926 L -20.222168,-49.148926 z M -20.222168,-53.667969 C -21.10272,-53.667961 -21.849586,-53.361362 -22.462769,-52.748169 C -23.075984,-52.134963 -23.382584,-51.388504 -23.382568,-50.508789 C -23.382584,-49.655107 -23.075984,-48.921669 -22.462769,-48.308472 C -21.849586,-47.69527 -21.10272,-47.388671 -20.222168,-47.388672 C -19.369323,-47.388671 -18.636088,-47.69527 -18.022461,-48.308472 C -17.408876,-48.921669 -17.102073,-49.655107 -17.102051,-50.508789 C -17.102073,-51.388504 -17.408876,-52.134963 -18.022461,-52.748169 C -18.636088,-53.361362 -19.369323,-53.667961 -20.222168,-53.667969 L -20.222168,-53.667969 z" id="flowRoot3192" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/accommodation/chalet.svg b/vtm-themes/icons/symbols/accommodation/chalet.svg
new file mode 100755
index 00000000..94ea0318
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/chalet.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g3757" transform="matrix(3.2822464,0,0,3.2822464,-751.11276,-1010.2429)" opacity=".5">
+  <path id="path3734" d="m 348.78208,372.60284 c -6.88742,14.60266 -13.78726,29.19945 -20.71875,43.78125 -3.83966,-5.29946 -7.70451,-10.58057 -11.59375,-15.84375 -11.91853,19.07569 -23.7213,38.22363 -35.71875,57.25 37.43746,0.31752 74.87509,0.61481 112.3125,0.9375 -14.10629,-30.01312 -28.29628,-59.98684 -42.46875,-89.96875 -0.60417,1.28125 -1.20833,2.5625 -1.8125,3.84375 z" fill="none" stroke="#ffffff" stroke-width="5"/>
+  <path id="path3744" d="m 350.59375,362.90625 -2.25,4.78125 -1.8125,3.84375 c -6.29252,13.34135 -12.61036,26.67706 -18.9375,40 -3.0311,-4.16567 -6.06341,-8.3256 -9.125,-12.46875 l -2.1875,-2.96875 -1.9375,3.125 c -11.92389,19.08426 -23.73037,38.23802 -35.71875,57.25 l -2.375,3.78125 4.46875,0.0312 c 37.43836,0.31753 74.87622,0.61482 112.3125,0.9375 l 4,0.0312 -1.71875,-3.59375 C 381.20423,427.63902 367.0158,397.66853 352.84375,367.6875 l -2.25,-4.78125 z m 0,42.34375 c 0.75716,0.002 1.50495,0.37027 1.96875,0.96875 2.23609,2.81658 4.41247,5.11927 5.28125,5.46875 0.43439,0.17479 0.32832,0.20284 0.78125,-0.0937 0.45293,-0.29659 1.36745,-1.25512 2.375,-3.21875 0.42481,-0.81769 1.32863,-1.35665 2.25,-1.34375 0.92136,0.0129 1.81697,0.577 2.21875,1.40625 l 20.375,43.125 c 0.74253,1.52641 -0.58397,3.61605 -2.28125,3.59375 L 291.5,454.375 c -0.87906,-0.0121 -1.73306,-0.51067 -2.15625,-1.28125 -0.42315,-0.77058 -0.399,-1.78298 0.0625,-2.53125 l 18.125,-29.09375 c 0.7864,-1.26885 2.80873,-1.51348 3.875,-0.46875 1.6156,1.60179 3.01438,2.44959 4.6875,2.5625 1.67312,0.11291 4.01716,-0.51385 7.46875,-3.0625 1.05857,-0.79816 2.75437,-0.54304 3.53125,0.53125 l 1.59375,2.1875 6.5625,-13.875 c 0.3838,-0.83866 1.26576,-1.43655 2.1875,-1.46875 0.92174,-0.0322 1.83981,0.5027 2.28125,1.3125 0.64944,1.17852 1.29638,1.8353 1.78125,2.125 0.48487,0.28965 0.79816,0.34143 1.375,0.21875 1.15368,-0.24536 3.37836,-1.82644 5.6875,-5.1875 0.44955,-0.66088 1.23205,-1.08225 2.03125,-1.09375 z" color="#000000" stroke-width="5" fill="#ffffff"/>
+ </g>
+ <path d="M 184.57113,66.176498 22.127529,206.5523 l 32.488502,0 0,210.56359 97.466389,0 0,-107.00635 67.20514,0 2.2e-4,107.00635 95.23845,0 0,-210.56359 32.4887,0 -162.4438,-140.375802 0,0 0,0 z" id="path645" sodipodi:nodetypes="ccccccccccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width=".852"/>
+ <g transform="matrix(3.2822464,0,0,3.2822464,-751.11276,-1010.2429)" id="g5238" opacity=".25">
+  <path d="m 348.78208,372.60284 c -6.88742,14.60266 -13.78726,29.19945 -20.71875,43.78125 -3.83966,-5.29946 -7.70451,-10.58057 -11.59375,-15.84375 -11.91853,19.07569 -23.7213,38.22363 -35.71875,57.25 37.43746,0.31752 74.87509,0.61481 112.3125,0.9375 -14.10629,-30.01312 -28.29628,-59.98684 -42.46875,-89.96875 -0.60417,1.28125 -1.20833,2.5625 -1.8125,3.84375 z" id="path5240" fill="none" stroke="#ffffff" stroke-width="5"/>
+  <path d="m 350.59375,362.90625 -2.25,4.78125 -1.8125,3.84375 c -6.29252,13.34135 -12.61036,26.67706 -18.9375,40 -3.0311,-4.16567 -6.06341,-8.3256 -9.125,-12.46875 l -2.1875,-2.96875 -1.9375,3.125 c -11.92389,19.08426 -23.73037,38.23802 -35.71875,57.25 l -2.375,3.78125 4.46875,0.0312 c 37.43836,0.31753 74.87622,0.61482 112.3125,0.9375 l 4,0.0312 -1.71875,-3.59375 C 381.20423,427.63902 367.0158,397.66853 352.84375,367.6875 l -2.25,-4.78125 z" id="path5242" sodipodi:nodetypes="ccccccccccccccc" color="#000000" stroke-width="5" fill="#ffffff"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/chalet2.svg b/vtm-themes/icons/symbols/accommodation/chalet2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/chalet2.svg
rename to vtm-themes/icons/symbols/accommodation/chalet2.svg
diff --git a/vtm-themes/icons/symbols/accommodation/hostel.svg b/vtm-themes/icons/symbols/accommodation/hostel.svg
new file mode 100755
index 00000000..de705f15
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/hostel.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 47.545774,43.393944 44.346778,538.12088" id="path2157" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
+ <path d="m 50.744772,485.34997 479.849548,3.19899" id="path2159" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="35.829"/>
+ <path d="m 533.79332,528.52389 3.19899,-384.4845" id="path2161" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
+ <rect id="rect2163" width="207.97" height="38.605" x="237.13" y="393.63" fill="#ffffff" stroke="#ffffff" stroke-width="34.702" rx="19.303"/>
+ <path sodipodi:type="arc" id="path2167" sodipodi:cx="7.7678571" sodipodi:cy="16.017857" sodipodi:rx="1.5178572" sodipodi:ry="1.3392857" d="m 9.2857143,16.017857 a 1.5178572,1.3392857 0 1 1 -3.0357144,0 1.5178572,1.3392857 0 1 1 3.0357144,0 z" transform="matrix(18.921389,0,0,19.889185,29.572525,29.582841)" fill="#ffffff" stroke="#ffffff" stroke-width="2.3"/>
+ <rect id="rect2169" width="80.29" height="6.894" x="119.98" y="423.96" fill="#ffffff" stroke="#ffffff" stroke-width="30.18" rx="3.447"/>
+ <path d="m 55.503588,249.65197 479.849542,3.19899" id="path2159-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="35.829"/>
+ <rect id="rect2163-5" width="207.97" height="38.605" x="241.67" y="159.19" fill="#ffffff" stroke="#ffffff" stroke-width="34.702" rx="19.303"/>
+ <path sodipodi:type="arc" id="path2167-9" sodipodi:cx="7.7678571" sodipodi:cy="16.017857" sodipodi:rx="1.5178572" sodipodi:ry="1.3392857" d="m 9.2857143,16.017857 a 1.5178572,1.3392857 0 1 1 -3.0357144,0 1.5178572,1.3392857 0 1 1 3.0357144,0 z" transform="matrix(18.921389,0,0,19.889185,34.117797,-204.86148)" fill="#ffffff" stroke="#ffffff" stroke-width="2.3"/>
+ <rect id="rect2169-6" width="80.29" height="6.894" x="124.52" y="189.52" fill="#ffffff" stroke="#ffffff" stroke-width="30.18" rx="3.447"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/hotel.svg b/vtm-themes/icons/symbols/accommodation/hotel.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/hotel.svg
rename to vtm-themes/icons/symbols/accommodation/hotel.svg
diff --git a/vtm-themes/icons/symbols/accommodation/hotel2.svg b/vtm-themes/icons/symbols/accommodation/hotel2.svg
new file mode 100755
index 00000000..15dd12c4
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/hotel2.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 47.545774,192.59912 L 44.346778,442.12088" id="path2157" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
+ <path d="M 50.744772,349.34997 L 530.59432,352.54896" id="path2159" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="35.829"/>
+ <path d="M 533.79332,432.52389 L 536.99231,269.37504" id="path2161" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
+ <rect id="rect2163" width="252.72" height="44.786" x="233.09" y="258.18" fill="#ffffff" stroke="#ffffff" stroke-width="41.2" rx="22.393"/>
+ <path sodipodi:type="arc" id="path2167" sodipodi:cx="7.7678571" sodipodi:cy="16.017857" sodipodi:rx="1.5178572" sodipodi:ry="1.3392857" d="M 9.2857143,16.017857 A 1.5178572,1.3392857 0 1 1 6.2499999,16.017857 A 1.5178572,1.3392857 0 1 1 9.2857143,16.017857 z" transform="matrix(22.993274,0,0,23.073314,-16.698545,-171.11131)" fill="#ffffff" stroke="#ffffff" stroke-width="2.3"/>
+ <rect id="rect2169" width="97.57" height="7.997" x="90.73" y="293.37" fill="#ffffff" stroke="#ffffff" stroke-width="35.829" rx="3.999"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/motel.svg b/vtm-themes/icons/symbols/accommodation/motel.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/motel.svg
rename to vtm-themes/icons/symbols/accommodation/motel.svg
diff --git a/vtm-themes/resources/assets/symbols/accommodation/shelter.svg b/vtm-themes/icons/symbols/accommodation/shelter.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/shelter.svg
rename to vtm-themes/icons/symbols/accommodation/shelter.svg
diff --git a/vtm-themes/icons/symbols/accommodation/shelter2.svg b/vtm-themes/icons/symbols/accommodation/shelter2.svg
new file mode 100755
index 00000000..7e133eaf
--- /dev/null
+++ b/vtm-themes/icons/symbols/accommodation/shelter2.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path sodipodi:nodetypes="cc" id="path15803" d="M 134.69281,73.992992 L 55.840019,152.84578" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15805" d="M 241.42628,44.008171 L 162.5735,122.86096" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15807" d="M 114.62614,184.10203 L 52.744667,245.98349" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15809" d="M 275.86078,105.04094 L 197.008,183.89373" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15813" d="M 456.75653,87.944376 L 377.90375,166.79717" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15815" d="M 546.20521,80.62071 L 487.85946,136.84506" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15819" d="M 548.32665,157.79575 L 487.85944,216.84866" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15821" d="M 446.74834,185.50249 L 419.51667,210.61275" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15823" d="M 353.96491,119.46757 L 314.71189,157.30632" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <path sodipodi:nodetypes="cc" id="path15825" d="M 370.55596,33.1566 L 324.23155,80.89529" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
+ <g id="g5417" transform="matrix(0.8724801,0,0,0.8724801,43.27383,78.888966)">
+  <path d="M 48.288912,272.40193 L 288.29972,144.39616 L 528.31052,272.40193 L 512.24025,288.7664 L 431.99984,256.40121 L 288.21392,239.09639 L 144.09958,256.1512 L 64.279091,288.40647 L 48.288912,272.40193 z" id="path7057" sodipodi:nodetypes="ccccccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="21.459"/>
+  <rect id="rect7061" width="30.829" height="258.64" x="415" y="255.09" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.631" rx="0"/>
+  <rect y="255.09" x="129" height="258.64" width="30.829" id="rect2747" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.631" rx="0"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/youth_hostel.svg b/vtm-themes/icons/symbols/accommodation/youth_hostel.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/accommodation/youth_hostel.svg
rename to vtm-themes/icons/symbols/accommodation/youth_hostel.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/bench.svg b/vtm-themes/icons/symbols/amenity/bench.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/bench.svg
rename to vtm-themes/icons/symbols/amenity/bench.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/court.svg b/vtm-themes/icons/symbols/amenity/court.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/court.svg
rename to vtm-themes/icons/symbols/amenity/court.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/firestation.svg b/vtm-themes/icons/symbols/amenity/firestation.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/firestation.svg
rename to vtm-themes/icons/symbols/amenity/firestation.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/firestation2.svg b/vtm-themes/icons/symbols/amenity/firestation2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/firestation2.svg
rename to vtm-themes/icons/symbols/amenity/firestation2.svg
diff --git a/vtm-themes/icons/symbols/amenity/firestation3.svg b/vtm-themes/icons/symbols/amenity/firestation3.svg
new file mode 100755
index 00000000..86c2fc91
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/firestation3.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata1976"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 287.54752,24.82936 c -24.5642,0.06768 -44.92229,15.567008 -65.52354,26.987265 -23.6266,12.365832 -50.62737,17.687102 -77.22099,16.180484 -8.00914,0.305743 -20.08645,0.324417 -22.53392,9.886424 -2.15787,9.897214 7.83419,15.915256 12.76404,22.905207 11.45648,13.41133 23.07625,26.52693 35.15395,39.32286 1.82819,-2.55786 9.43787,-4.26659 4.7588,-7.46361 -13.46471,-16.05758 -28.7322,-30.82111 -40.62307,-48.084441 -1.04162,-7.231398 7.6892,-8.790534 13.09269,-8.177775 20.58788,-0.158094 42.23864,1.050276 60.8922,-9.1012 27.49688,-12.521769 52.84281,-33.892662 84.49479,-34.171994 30.38666,0.588659 55.36729,20.333943 81.25868,33.786037 18.35049,10.37796 38.78565,17.893659 60.09046,17.16022 6.97194,0.550013 15.773,-1.034926 20.84165,4.690856 2.87596,7.13959 -5.66769,10.852295 -9.18145,15.653647 -11.7667,11.78781 -23.58354,23.52236 -35.41137,35.23323 2.9898,1.25929 5.99773,7.36385 8.65624,4.72247 16.12086,-16.62216 33.67318,-31.88907 48.28719,-49.849689 2.29368,-6.32431 -0.55094,-15.255652 -8.28454,-15.638991 C 441.06622,74.794223 422.07122,76.909676 404.28451,71.322273 370.47919,62.297039 344.54784,34.736063 310.4674,26.610697 302.99921,25.016955 295.24308,24.686109 287.54752,24.82936 z M 86.939209,111.3133 c -7.480359,-0.10892 -9.42973,8.79164 -9.365986,14.63106 -1.74212,17.58642 -1.18225,35.93733 -8.565617,52.31922 -12.430588,34.66836 -41.044731,62.89874 -44.79943,100.6102 -2.552721,26.14426 10.564347,49.89374 22.505126,72.18771 13.453163,25.22346 25.051864,53.10611 22.323464,82.31766 -0.379358,8.12228 -0.29675,19.85888 8.372287,23.45428 7.600494,2.07507 12.74036,-5.647 18.644668,-8.877 15.058949,-11.14712 28.974229,-23.48771 42.841169,-36.0424 -2.82391,-2.3273 -4.80551,-10.40584 -8.45925,-4.86144 -15.04154,12.38722 -29.14242,26.10343 -45.069945,37.2521 -7.002255,1.01076 -8.498645,-7.66615 -7.659752,-12.82563 0.49503,-17.5436 0.175452,-35.66235 -8.045709,-51.51035 -13.134565,-30.46259 -35.800093,-58.28599 -37.259646,-92.68893 -0.07709,-31.58405 20.166541,-57.80352 34.647018,-84.1979 10.455182,-18.12728 18.315784,-38.22984 17.605553,-59.4373 0.619876,-6.21604 -1.35145,-15.1109 4.839301,-18.88218 7.453385,-2.05341 11.07661,6.79784 16.26955,10.33176 11.6531,11.40284 22.69484,23.27382 34.64702,34.40951 2.69949,-3.46275 8.27333,-6.92192 2.19535,-10.04834 -16.36459,-16.41676 -31.74328,-33.8695 -50.113335,-48.05296 -1.845609,-0.16378 -3.701492,-0.12879 -5.551836,-0.0891 z m 407.421611,11.3115 c -7.35395,3.57028 -11.69328,11.1389 -18.43645,15.64292 -11.53353,10.66344 -23.31673,21.05092 -34.64741,31.91879 2.70845,1.84416 4.59348,9.76923 7.77213,5.39132 15.1099,-13.23809 29.08548,-28.1614 45.4008,-40.00865 6.86617,-1.56278 8.89515,6.98407 7.89726,12.05372 -0.43005,18.62403 0.45963,37.86428 9.22682,54.71696 13.0417,31.06158 34.53943,60.16856 35.72227,94.9451 -0.83228,30.28543 -20.72727,55.03345 -34.82515,80.3977 -10.19431,17.1618 -17.7315,36.52991 -16.92271,56.85436 -0.69502,6.52265 1.09037,15.72452 -5.28463,19.77285 -7.27002,2.38507 -11.53184,-6.10985 -16.437,-9.71802 -10.90632,-10.40093 -21.81604,-20.79828 -32.72792,-31.19337 -1.24026,2.86873 -7.84194,5.8402 -3.35486,8.31291 17.02487,15.734 32.42127,33.41155 51.00564,47.02732 7.70962,1.2974 13.22536,-6.475 13.06314,-13.53817 2.43855,-16.4053 1.1859,-33.65916 7.77851,-49.28368 10.40368,-32.05008 35.33582,-57.40908 43.76153,-90.16537 5.32885,-23.21576 -0.24145,-47.67258 -11.34119,-68.37368 -14.68592,-30.88062 -33.06529,-62.6132 -31.41092,-98.09233 -0.41235,-8.64176 0.68502,-19.2053 -5.96748,-25.71064 -3.21457,-1.3148 -6.8931,-0.84761 -10.27238,-0.95004 z M 156.38169,440.5045 c -14.42676,16.34815 -32.17238,29.66881 -44.41469,47.79923 -2.41602,7.88733 5.31381,15.11765 12.9903,14.61794 16.48463,2.15517 33.7904,0.89995 49.44559,7.55971 30.51758,9.87269 55.22918,33.16025 86.13153,42.20025 26.66016,7.00514 55.22902,1.12873 78.64851,-12.65283 29.06686,-14.16175 59.6492,-29.8491 92.97915,-27.70364 8.02831,-0.40369 17.63905,0.23055 23.89998,-5.25801 2.97274,-5.84104 1.25082,-13.02853 -4.01377,-16.95623 -13.3288,-15.82981 -27.88544,-30.90815 -41.44003,-46.60783 -1.37399,2.31848 -9.79202,4.42475 -5.19557,6.56126 12.84137,14.87015 27.72134,28.63501 39.42695,44.68189 2.58939,6.57768 -5.79706,9.97262 -11.07399,9.11451 -22.49335,-1.60489 -45.15583,2.26282 -65.28602,12.6178 -28.67962,13.3844 -57.45313,32.64058 -90.55133,30.69839 -33.26122,-2.25785 -59.17506,-25.66237 -88.02777,-39.63476 -15.51146,-7.85626 -32.70407,-11.49812 -50.0259,-11.3115 -5.50746,-0.008 -15.09661,0.40621 -15.31951,-7.15504 1.11914,-6.84299 8.58545,-10.01724 12.24261,-15.41228 10.40026,-10.75101 20.75797,-21.53492 31.16265,-32.26819 -3.31886,-1.71288 -6.56929,-8.6647 -9.44451,-3.09113 -0.71139,0.73349 -1.42279,1.46698 -2.13418,2.20046 z" id="path3575" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="9.5"/>
+ <g id="g5215" transform="matrix(1.0478814,0,0,1.0478814,-14.016475,-23.016508)">
+  <path sodipodi:nodetypes="cscccccccccccc" id="path4356" d="m 198.67153,429.13471 c -27.9052,-15.73923 -44.91267,-52.53932 -32.35461,-107.5395 8.80965,-38.58338 34.48036,-86.20137 14.80642,-125.85126 23.86554,16.49562 48.67818,55.72148 73.70237,100.02462 1.72552,-47.91091 -23.1357,-79.3021 -5.26444,-144.77247 12.26268,80.9952 61.45228,86.01536 86.42474,159.68842 10.62203,-34.63889 32.71786,-46.03994 21.93521,-132.05003 108.58157,148.29018 46.69562,200.96776 25.00613,254.00987 l 7.0193,-73.70234 c -34.05505,98.44168 -61.34018,116.60289 -85.98606,138.63059 13.7744,-46.21019 19.20596,-92.4204 -8.77412,-138.63059 -6.79301,75.87173 -25.9655,60.08286 -29.83187,121.08241 -38.33494,-28.93346 -46.20823,-58.61344 -53.08324,-107.04388 -5.21553,5.66709 -14.0221,29.35386 -13.59983,56.15416 z" fill="#ffffff" fill-rule="evenodd"/>
+  <path sodipodi:nodetypes="ccc" id="path4358" d="M 278.07704,75.100248 C 249.68045,190.40668 301.5257,189.3936 330.28289,257.16259 350.4538,152.66532 290.11046,176.17723 278.07704,75.100248 z" fill="#ffffff" fill-rule="evenodd"/>
+ </g>
+ <path d="m 83.620844,116.43162 -5.563986,44.51188 -15.102245,38.9479 -27.025072,50.07587 -10.333115,37.35818 17.486811,49.28102 24.640506,48.48616 10.333115,66.76782 56.434712,-43.71703 29.40963,31.7942 -48.48615,50.87073 8.7434,7.94855 32.58905,3.17941 30.2045,7.94856 51.66557,30.20448 36.56334,11.12798 34.97362,-4.76913 44.51188,-19.87138 38.9479,-15.10225 42.12732,-5.56398 18.28166,-11.12797 -45.30673,-46.89644 32.58905,-30.2045 48.48616,46.10159 8.74341,-14.30739 4.76913,-42.92217 21.46109,-41.33246 23.05079,-43.71703 5.56399,-30.99935 -14.30739,-39.74274 -23.84565,-44.51189 -9.53826,-45.30674 -3.97429,-34.97362 -27.81992,20.66623 -28.61478,25.43536 -28.61478,-30.99935 45.30674,-49.281008 -9.53826,-10.333115 -42.92218,-4.76913 -40.53761,-15.897101 -44.51188,-24.640506 -32.58906,-7.153696 -38.94789,8.743406 -37.35819,22.255941 -34.17877,10.333116 -54.05014,3.974275 0,9.53826 46.1016,52.460428 -33.38392,28.61479 -56.434706,-48.48616 z" id="path6053" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/fountain.svg b/vtm-themes/icons/symbols/amenity/fountain.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/fountain.svg
rename to vtm-themes/icons/symbols/amenity/fountain.svg
diff --git a/vtm-themes/icons/symbols/amenity/fountain2.svg b/vtm-themes/icons/symbols/amenity/fountain2.svg
new file mode 100755
index 00000000..25c6cec1
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/fountain2.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734a08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g3903" transform="matrix(31.324341,0,0,31.324341,37.064868,-32426.481)" fill="#ffffff">
+  <g id="g3890" transform="matrix(1.0752098,0,0,1.1328229,-44.033537,-140.05992)">
+   <path inkscape:connector-curvature="0" id="path2853" d="m 45.15625,1043.2973 c -0.409367,-0.086 -0.845035,0.032 -1.21875,0.2867 -0.373715,0.2542 -0.704782,0.6543 -1.03125,1.1757 -0.652935,1.0429 -1.243941,2.8667 -1.424583,3.6942 -0.180642,0.8276 -0.389137,1.7889 -0.476559,2.5026 0.155401,-0.6834 0.443128,-1.7111 0.682113,-2.499 0.238984,-0.788 0.965501,-2.574 1.590238,-3.4681 0.330229,-0.4725 0.6827,-0.8352 0.972541,-1.0323 0.289841,-0.1972 0.529512,-0.2533 0.78125,-0.2008 0.503476,0.105 1.373689,0.6712 1.912038,2.0587 0.538349,1.3874 1.118533,3.4851 1.413995,6.3035 l 0.142717,0.039 c -0.297953,-2.8423 -0.751198,-4.948 -1.3125,-6.3947 -0.561302,-1.4465 -1.212516,-2.2953 -2.03125,-2.466 l 0,-5e-4 0,-10e-5 0,5e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="path2857" d="m 47.321232,1038.5625 c -0.111416,-0.068 -0.2879,-0.036 -0.394168,0.031 -0.212539,0.1349 -0.356502,0.3299 -0.464022,0.625 -0.08661,0.2377 -0.28025,0.861 -0.437941,1.6327 -0.15769,0.7717 -0.158855,1.2135 -0.211834,1.8834 0.08208,-0.6739 0.232192,-1.1009 0.418407,-1.8384 0.208593,-0.7179 0.529922,-1.2927 0.669269,-1.5105 0.09744,-0.1523 0.159428,-0.2601 0.208048,-0.261 0.130879,0 0.278134,0.6184 0.371201,1.0335 0.381554,1.7019 0.706663,5.2951 0.852646,11.8213 l 0.292168,-0.011 c -0.146227,-6.5371 -0.43595,-10.3842 -0.788329,-12.1563 -0.08809,-0.443 -0.189334,-0.7475 -0.303202,-0.9687 -0.05694,-0.1107 -0.100822,-0.2133 -0.212243,-0.2813 l 0,10e-5 0,2e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3670" d="m 45.687498,1043.2973 c -0.369195,-0.091 -0.773732,0.029 -1.093748,0.2867 -0.320016,0.2585 -0.600622,0.6554 -0.875,1.1757 -0.548755,1.0407 -0.928739,2.4195 -1.142608,3.6341 -0.213869,1.2145 -0.317812,2.6173 -0.317812,2.6173 0,0 0.263321,-1.3631 0.508059,-2.5715 0.244738,-1.2083 0.739287,-2.5054 1.252513,-3.4788 0.256613,-0.4867 0.679824,-0.8108 0.918596,-1.0036 0.238772,-0.1929 0.437471,-0.2472 0.625,-0.2008 0.187529,0.047 0.500041,0.1701 0.743442,0.5229 0.243401,0.3528 0.662303,0.9037 0.889532,1.5991 0.454459,1.3908 0.796724,3.4731 1.045698,6.2934 l 0.290078,-0.013 c -0.250747,-2.8404 -0.653431,-4.9513 -1.125,-6.3945 -0.235784,-0.7217 -0.468602,-1.284 -0.75,-1.6918 -0.281398,-0.4079 -0.599555,-0.6829 -0.96875,-0.7744 l 0,-3e-4 0,-2e-4 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3672" d="m 45.90625,1043.3259 c -0.155576,0.06 -0.284523,0.1552 -0.40625,0.2868 -0.243454,0.2633 -0.452347,0.6578 -0.65625,1.1757 -0.407806,1.0357 -0.748827,2.5203 -0.949467,3.7665 -0.20064,1.2462 -0.235254,2.2685 -0.235254,2.2685 0,0 0.199903,-0.9721 0.492186,-2.2308 0.292283,-1.259 0.73188,-2.6534 1.117091,-3.6317 0.192606,-0.4892 0.432883,-0.8443 0.606694,-1.0323 0.08691,-0.094 0.164685,-0.1513 0.21875,-0.1721 0.05407,-0.021 0.07729,-0.015 0.125,0 0.09543,0.032 0.398818,0.1449 0.581783,0.5001 0.182965,0.3552 0.456591,0.9136 0.626943,1.6118 0.340704,1.3963 0.711467,3.4806 0.89755,6.3035 l 0.237474,-0.012 c -0.187076,-2.8379 -0.492958,-4.9282 -0.84375,-6.3659 -0.175396,-0.7188 -0.353579,-1.2864 -0.5625,-1.6919 -0.208921,-0.4055 -0.429704,-0.668 -0.75,-0.7742 -0.160148,-0.053 -0.344424,-0.06 -0.5,0 l 0,-7e-4 0,-10e-5 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3674" d="m 47.1875,1043.2686 c -0.08892,0.01 -0.161002,0.045 -0.21875,0.087 -0.115497,0.083 -0.185339,0.1853 -0.25,0.3154 -0.129323,0.2601 -0.235257,0.6346 -0.34375,1.147 -0.216986,1.0247 -0.438374,2.5935 -0.59375,4.6168 l -0.0096,1.3525 0.29781,-1.3242 c 0.154544,-2.0124 0.463433,-3.5698 0.672986,-4.5593 0.104777,-0.4948 0.318721,-0.841 0.413832,-1.0324 0.01818,-0.036 0.0156,-0.035 0.03125,-0.057 0.01153,0.017 0.0186,0 0.03125,0.029 0.04519,0.092 0.163081,0.2496 0.248731,0.4211 0.172696,0.3458 0.300294,0.8834 0.392509,1.5861 0.18443,1.4053 0.398714,3.501 0.498925,6.3272 l 0.234835,-0.018 c -0.100499,-2.8344 -0.249996,-4.937 -0.4375,-6.3658 -0.09375,-0.7145 -0.202483,-1.2375 -0.3125,-1.6346 -0.05501,-0.1985 -0.09209,-0.3855 -0.15625,-0.5161 -0.06416,-0.1306 -0.153501,-0.2367 -0.28125,-0.3155 -0.06388,-0.039 -0.129827,-0.062 -0.21875,-0.057 l 0,-8e-4 -2.8e-5,0 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3678" d="m 47.712764,1038.6562 c -0.07788,0.082 -0.186925,0.4033 -0.271629,0.6573 -0.0847,0.254 -0.275193,1.0681 -0.327523,1.514 -0.05233,0.4459 -0.105675,1.7017 -0.09913,1.7017 0,0 0.221347,-1.388 0.275207,-1.6965 0.05386,-0.3085 0.207936,-0.9201 0.336609,-1.2563 0.107193,-0.2801 0.249003,-0.4256 0.329478,-0.4258 0.08047,-2e-4 0.177845,0.2335 0.257127,1.3257 0.07928,1.0923 0.06389,5.2513 0.11832,11.4766 l 0.188682,0.016 c -0.05712,-6.5336 -0.01996,-11.1392 -0.09319,-12.125 -0.07323,-0.9858 -0.353625,-1.3128 -0.486766,-1.3126 -0.133141,2e-4 -0.149311,0.043 -0.227188,0.1249 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="path3680" d="m 49.351947,1050.9606 c -3.21981,-0.3605 -4.972634,1.3107 -7.440408,1.2353 0,0 0,0.4153 0,0.4153 0.930051,0 1.860102,0 6.510357,0"/>
+  </g>
+ </g>
+ <g id="g3903-1" transform="matrix(-31.324341,0,0,31.324341,539.66897,-32426.481)" fill="#ffffff">
+  <g id="g3890-7" transform="matrix(1.0752098,0,0,1.1328229,-44.033537,-140.05992)">
+   <path inkscape:connector-curvature="0" id="path2853-4" d="m 45.15625,1043.2973 c -0.409367,-0.086 -0.845035,0.032 -1.21875,0.2867 -0.373715,0.2542 -0.704782,0.6543 -1.03125,1.1757 -0.652935,1.0429 -1.243941,2.8667 -1.424583,3.6942 -0.180642,0.8276 -0.389137,1.7889 -0.476559,2.5026 0.155401,-0.6834 0.443128,-1.7111 0.682113,-2.499 0.238984,-0.788 0.965501,-2.574 1.590238,-3.4681 0.330229,-0.4725 0.6827,-0.8352 0.972541,-1.0323 0.289841,-0.1972 0.529512,-0.2533 0.78125,-0.2008 0.503476,0.105 1.373689,0.6712 1.912038,2.0587 0.538349,1.3874 1.118533,3.4851 1.413995,6.3035 l 0.142717,0.039 c -0.297953,-2.8423 -0.751198,-4.948 -1.3125,-6.3947 -0.561302,-1.4465 -1.212516,-2.2953 -2.03125,-2.466 l 0,-5e-4 0,-10e-5 0,5e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="path2857-0" d="m 47.321232,1038.5625 c -0.111416,-0.068 -0.2879,-0.036 -0.394168,0.031 -0.212539,0.1349 -0.356502,0.3299 -0.464022,0.625 -0.08661,0.2377 -0.28025,0.861 -0.437941,1.6327 -0.15769,0.7717 -0.158855,1.2135 -0.211834,1.8834 0.08208,-0.6739 0.232192,-1.1009 0.418407,-1.8384 0.208593,-0.7179 0.529922,-1.2927 0.669269,-1.5105 0.09744,-0.1523 0.159428,-0.2601 0.208048,-0.261 0.130879,0 0.278134,0.6184 0.371201,1.0335 0.381554,1.7019 0.706663,5.2951 0.852646,11.8213 l 0.292168,-0.011 c -0.146227,-6.5371 -0.43595,-10.3842 -0.788329,-12.1563 -0.08809,-0.443 -0.189334,-0.7475 -0.303202,-0.9687 -0.05694,-0.1107 -0.100822,-0.2133 -0.212243,-0.2813 l 0,10e-5 0,2e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3670-9" d="m 45.687498,1043.2973 c -0.369195,-0.091 -0.773732,0.029 -1.093748,0.2867 -0.320016,0.2585 -0.600622,0.6554 -0.875,1.1757 -0.548755,1.0407 -0.928739,2.4195 -1.142608,3.6341 -0.213869,1.2145 -0.317812,2.6173 -0.317812,2.6173 0,0 0.263321,-1.3631 0.508059,-2.5715 0.244738,-1.2083 0.739287,-2.5054 1.252513,-3.4788 0.256613,-0.4867 0.679824,-0.8108 0.918596,-1.0036 0.238772,-0.1929 0.437471,-0.2472 0.625,-0.2008 0.187529,0.047 0.500041,0.1701 0.743442,0.5229 0.243401,0.3528 0.662303,0.9037 0.889532,1.5991 0.454459,1.3908 0.796724,3.4731 1.045698,6.2934 l 0.290078,-0.013 c -0.250747,-2.8404 -0.653431,-4.9513 -1.125,-6.3945 -0.235784,-0.7217 -0.468602,-1.284 -0.75,-1.6918 -0.281398,-0.4079 -0.599555,-0.6829 -0.96875,-0.7744 l 0,-3e-4 0,-2e-4 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3672-4" d="m 45.90625,1043.3259 c -0.155576,0.06 -0.284523,0.1552 -0.40625,0.2868 -0.243454,0.2633 -0.452347,0.6578 -0.65625,1.1757 -0.407806,1.0357 -0.748827,2.5203 -0.949467,3.7665 -0.20064,1.2462 -0.235254,2.2685 -0.235254,2.2685 0,0 0.199903,-0.9721 0.492186,-2.2308 0.292283,-1.259 0.73188,-2.6534 1.117091,-3.6317 0.192606,-0.4892 0.432883,-0.8443 0.606694,-1.0323 0.08691,-0.094 0.164685,-0.1513 0.21875,-0.1721 0.05407,-0.021 0.07729,-0.015 0.125,0 0.09543,0.032 0.398818,0.1449 0.581783,0.5001 0.182965,0.3552 0.456591,0.9136 0.626943,1.6118 0.340704,1.3963 0.711467,3.4806 0.89755,6.3035 l 0.237474,-0.012 c -0.187076,-2.8379 -0.492958,-4.9282 -0.84375,-6.3659 -0.175396,-0.7188 -0.353579,-1.2864 -0.5625,-1.6919 -0.208921,-0.4055 -0.429704,-0.668 -0.75,-0.7742 -0.160148,-0.053 -0.344424,-0.06 -0.5,0 l 0,-7e-4 0,-10e-5 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3674-8" d="m 47.1875,1043.2686 c -0.08892,0.01 -0.161002,0.045 -0.21875,0.087 -0.115497,0.083 -0.185339,0.1853 -0.25,0.3154 -0.129323,0.2601 -0.235257,0.6346 -0.34375,1.147 -0.216986,1.0247 -0.438374,2.5935 -0.59375,4.6168 l -0.0096,1.3525 0.29781,-1.3242 c 0.154544,-2.0124 0.463433,-3.5698 0.672986,-4.5593 0.104777,-0.4948 0.318721,-0.841 0.413832,-1.0324 0.01818,-0.036 0.0156,-0.035 0.03125,-0.057 0.01153,0.017 0.0186,0 0.03125,0.029 0.04519,0.092 0.163081,0.2496 0.248731,0.4211 0.172696,0.3458 0.300294,0.8834 0.392509,1.5861 0.18443,1.4053 0.398714,3.501 0.498925,6.3272 l 0.234835,-0.018 c -0.100499,-2.8344 -0.249996,-4.937 -0.4375,-6.3658 -0.09375,-0.7145 -0.202483,-1.2375 -0.3125,-1.6346 -0.05501,-0.1985 -0.09209,-0.3855 -0.15625,-0.5161 -0.06416,-0.1306 -0.153501,-0.2367 -0.28125,-0.3155 -0.06388,-0.039 -0.129827,-0.062 -0.21875,-0.057 l 0,-8e-4 -2.8e-5,0 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="use3678-8" d="m 47.712764,1038.6562 c -0.07788,0.082 -0.186925,0.4033 -0.271629,0.6573 -0.0847,0.254 -0.275193,1.0681 -0.327523,1.514 -0.05233,0.4459 -0.105675,1.7017 -0.09913,1.7017 0,0 0.221347,-1.388 0.275207,-1.6965 0.05386,-0.3085 0.207936,-0.9201 0.336609,-1.2563 0.107193,-0.2801 0.249003,-0.4256 0.329478,-0.4258 0.08047,-2e-4 0.177845,0.2335 0.257127,1.3257 0.07928,1.0923 0.06389,5.2513 0.11832,11.4766 l 0.188682,0.016 c -0.05712,-6.5336 -0.01996,-11.1392 -0.09319,-12.125 -0.07323,-0.9858 -0.353625,-1.3128 -0.486766,-1.3126 -0.133141,2e-4 -0.149311,0.043 -0.227188,0.1249 z" color="#000000" stroke-width="0.507"/>
+   <path inkscape:connector-curvature="0" id="path3680-2" d="m 49.351947,1050.9606 c -3.21981,-0.3605 -4.972634,1.3107 -7.440408,1.2353 0,0 0,0.4153 0,0.4153 0.930051,0 1.860102,0 6.510357,0"/>
+  </g>
+ </g>
+</svg>
diff --git a/vtm-themes/icons/symbols/amenity/library.svg b/vtm-themes/icons/symbols/amenity/library.svg
new file mode 100755
index 00000000..d4516b7c
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/library.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 73.931354,159.8883 L 302.43289,419.37306 L 521.25215,293.50359 L 298.56009,35.95529 L 73.931354,159.8883 z" id="path3470" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 61.6534,188.60064 L 286.28195,444.21251 L 287.2502,541.03514 L 60.685154,284.9392 L 61.6534,188.60064 z" id="path3474" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 519.50933,327.13704 L 313.25992,447.99014 L 313.11567,451.17546 L 519.19198,330.40891 L 519.50933,327.13704 z" id="path3476" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+ <path sodipodi:nodetypes="ccccc" id="path3505" d="M 519.50933,367.13704 L 313.25992,487.99014 L 313.11567,491.17546 L 519.19198,370.40891 L 519.50933,367.13704 z" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+ <path d="M 519.50933,407.13704 L 313.25992,527.99014 L 313.11567,531.17546 L 519.19198,410.40891 L 519.50933,407.13704 z" id="path3507" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/library2.svg b/vtm-themes/icons/symbols/amenity/library2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/library2.svg
rename to vtm-themes/icons/symbols/amenity/library2.svg
diff --git a/vtm-themes/icons/symbols/amenity/playground.svg b/vtm-themes/icons/symbols/amenity/playground.svg
new file mode 100755
index 00000000..1e8abca4
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/playground.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 44.421016,269.96274 540.35091,367.8097" id="path2383" fill="#ffffff" stroke="#ffffff" stroke-linecap="round" stroke-width="34.524" stroke-miterlimit="1.1"/>
+ <path d="m 292.38579,322.02486 -52.29327,109.83729 104.58725,0 -52.29398,-109.83729 z" id="path2385" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="2.023"/>
+ <g transform="matrix(2.1357106,0.90429401,-0.84164613,2.2946826,-206.63356,-1194.9871)" id="g3185" fill="#ffffff" stroke="#ffffff">
+  <path d="m 338.53918,463.22191 c -8.9525,1.66739 -20.95672,48.62705 -20.95672,48.62705 l 34.61374,-4.78652 c 0,0 -4.32951,15.51183 -8.18502,27.01742 -2.40466,7.17586 5.60707,9.49056 9.63988,1.52914 7.449,-14.70555 13.0522,-30.95967 13.0522,-30.95967 0,0 -18.70966,-43.18825 -28.16408,-41.42742 z" id="path3181" fill-rule="evenodd" stroke-width="1.335"/>
+  <path d="m 286.86472,449.50504 c 0.004,5.13117 -3.71051,9.29292 -8.29328,9.29292 -4.58277,0 -8.29684,-4.16175 -8.29328,-9.29292 -0.004,-5.13117 3.71051,-9.29292 8.29328,-9.29292 4.58277,0 8.29684,4.16175 8.29328,9.29292 z" transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)" id="path3183" stroke-width="5.9"/>
+ </g>
+ <g transform="matrix(-2.3075369,-0.23175279,-0.36219803,2.4172678,1457.3558,-786.99777)" id="g3193" fill="#ffffff" stroke="#ffffff">
+  <path d="m 338.53918,463.22191 c -8.9525,1.66739 -20.95672,48.62705 -20.95672,48.62705 l 34.61374,-4.78652 c 0,0 -4.32951,15.51183 -8.18502,27.01742 -2.40466,7.17586 5.60707,9.49056 9.63988,1.52914 7.449,-14.70555 13.0522,-30.95967 13.0522,-30.95967 0,0 -18.70966,-43.18825 -28.16408,-41.42742 z" id="path3195" fill-rule="evenodd" stroke-width="1.335"/>
+  <path d="m 286.86472,449.50504 c 0.004,5.13117 -3.71051,9.29292 -8.29328,9.29292 -4.58277,0 -8.29684,-4.16175 -8.29328,-9.29292 -0.004,-5.13117 3.71051,-9.29292 8.29328,-9.29292 4.58277,0 8.29684,4.16175 8.29328,9.29292 z" transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)" id="path3197" stroke-width="5.9"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/police.svg b/vtm-themes/icons/symbols/amenity/police.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/police.svg
rename to vtm-themes/icons/symbols/amenity/police.svg
diff --git a/vtm-themes/icons/symbols/amenity/police2.svg b/vtm-themes/icons/symbols/amenity/police2.svg
new file mode 100755
index 00000000..d846903b
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/police2.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata1976"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 178.55078,226.45042 c 1.13144,8.8371 8.46479,15.38618 16.12978,14.40482 l 7.36403,-0.94286 c 7.66503,-0.98136 13.11183,-9.16674 11.9804,-18.00385 l -3.86245,-30.16762 c -1.13144,-8.8371 -8.46476,-15.38626 -16.12983,-14.40479 l -7.36398,0.94284 c -7.66503,0.98135 -13.11185,9.16674 -11.98042,18.00383 l 3.86247,30.16763 z m 14.31001,-2.18259 c -3.93581,-3.51488 -6.69751,-25.08498 -3.77415,-29.47806 2.9233,-4.39311 2.83007,-4.38119 6.76589,-0.86627 3.93581,3.51487 6.6975,25.08498 3.77414,29.47807 -2.92329,4.39311 -2.83006,4.38116 -6.76588,0.86626 z" id="rect3389" sodipodi:nodetypes="cccccccccczzzz" fill="#ffffff"/>
+ <path sodipodi:nodetypes="cccccccccczzzz" id="path3395" d="m 259.93524,142.03746 c 7.60381,5.44209 17.71418,4.87846 22.23787,-1.23975 l 4.34607,-5.87792 c 4.52371,-6.11823 1.9559,-15.75568 -5.64791,-21.19783 L 254.91376,95.143927 c -7.60384,-5.44209 -17.71421,-4.878534 -22.23789,1.239758 l -4.34605,5.877905 c -4.52375,6.11821 -1.95593,15.75568 5.64791,21.19784 l 25.95751,18.57803 z m 8.17482,-11.66981 c -5.4262,0.30249 -23.98607,-12.98089 -25.3642,-18.15341 -1.37815,-5.17241 -1.43317,-5.09802 3.99307,-5.40052 5.42623,-0.30251 23.98606,12.98091 25.36421,18.1534 1.37813,5.17244 1.43318,5.09804 -3.99308,5.40053 z" fill="#ffffff"/>
+ <path d="m 235.90887,119.66591 c 8.87648,-0.76323 15.72468,-7.81806 15.06273,-15.51721 l -0.36157,7.0331 c -0.66197,-7.69921 -8.6139,-13.48154 -17.49039,-12.718358 l -30.30208,2.605328 c -8.87647,0.7632 -15.72479,7.81798 -15.06272,15.51722 l 0.36155,-7.03313 c 0.66196,7.69921 8.61388,13.4815 17.49038,12.71834 l 30.3021,-2.60529 z m -1.58597,-14.38838 c -3.67543,3.7863 -25.34163,5.64915 -29.60948,2.54572 -4.26778,-3.10333 -3.98535,11.42022 -0.30991,7.63389 3.67542,-3.78631 25.34167,-5.64916 29.60946,-2.54574 4.26781,3.10336 3.98537,-11.42022 0.30993,-7.63387 z" id="path3397" sodipodi:nodetypes="cccccccccczzzz" fill="#ffffff"/>
+ <path d="m 207.30775,126.38134 c 5.59935,-7.48875 5.24652,-17.60867 -0.77608,-22.25888 l -5.78609,-4.467607 c -6.02262,-4.650222 -15.7115,-2.283797 -21.31091,5.204947 l -19.11491,25.56475 c -5.59936,7.48876 -5.24662,17.60868 0.77609,22.25888 l 5.78606,4.46759 c 6.02262,4.65026 15.7115,2.28382 21.31092,-5.20494 l 19.11492,-25.56474 z m -11.49693,-8.41621 c 0.18935,5.43131 -13.4779,23.71034 -18.67803,24.98038 -5.19999,1.27007 -5.12676,1.32662 -5.31613,-4.10473 -0.18936,-5.43136 13.47793,-23.71035 18.67801,-24.98041 5.20004,-1.27005 5.1268,-1.32663 5.31615,4.10476 z" id="path3534" sodipodi:nodetypes="cccccccccczzzz" fill="#ffffff"/>
+ <path sodipodi:nodetypes="cccccccccczzzz" id="path3536" d="m 178.13476,185.55291 c 2.94996,8.40668 11.48811,13.28199 18.77977,10.72335 l -6.90153,1.40149 c 7.29173,-2.55867 10.91132,-11.70018 7.96139,-20.10689 L 187.9041,148.87257 c -2.94992,-8.40667 -11.48805,-13.28211 -18.77976,-10.72335 l 6.90154,-1.4015 c -7.29172,2.55868 -10.91128,11.70014 -7.96139,20.10687 l 10.07027,28.69832 z m 13.53998,-5.11956 c -4.5824,-2.61661 -11.78276,-23.13609 -9.84008,-28.04238 1.9426,-4.90622 -12.05293,-1.01544 -7.47052,1.60115 4.5824,2.61658 11.78277,23.1361 9.8401,28.04235 -1.94264,4.90626 12.05292,1.01546 7.4705,-1.60112 z" fill="#ffffff"/>
+ <g id="g3540" transform="matrix(0.74204582,0,0,0.74204582,67.476143,46.031302)">
+  <g transform="matrix(1.0907181,-0.2914957,0.2914957,1.0907181,-98.8285,72.452649)" id="g3490">
+   <g transform="matrix(0.9826633,-0.1853992,0.1853992,0.9826633,-60.17152,31.061258)" id="g3500">
+    <path sodipodi:nodetypes="cccsszzzssc" id="path3313" d="m 137.92957,221.66212 c -7.58542,0.60458 -11.32119,13.81445 -12.99324,20.91531 -0.79855,11.74113 9.76035,31.84764 15.41118,30.63495 40.72202,-3e-5 66.02183,27.71772 66.02183,68.43978 4e-5,40.72201 -27.11324,70.25322 -67.83529,70.25322 -16.18798,-3e-5 -24.46001,-14.39283 -40.587827,-11.81862 -15.673332,2.50166 -23.662466,9.76279 -28.251302,18.06731 -4.857361,8.79047 -9.926486,22.86389 6.128076,35.08654 16.487744,12.55244 31.261093,13.74345 53.039363,13.74342 67.62255,6e-5 127.14539,-57.70923 127.14531,-125.33187 -4e-5,-67.62265 -50.45552,-119.98994 -118.0781,-119.99004 z" fill="#ffffff"/>
+    <path sodipodi:nodetypes="csccssccc" id="path3325" d="m 133.09373,224.64754 c -64.403852,-4e-5 -117.1032,52.60083 -117.103104,117.00462 3.1e-5,47.37503 23.678013,91.92373 64.401738,110.29016 l 26.601846,-46.2725 c -30.109595,-5.8038 -45.895746,-25.45708 -45.895746,-61.65394 -6.2e-5,-43.94094 30.509229,-77.95879 74.450206,-77.95879 12.23459,3e-5 16.71534,4.92072 29.06145,9.41063 l 11.3262,-42.64562 c -13.2782,-5.25876 -27.74167,-8.17456 -42.84259,-8.17456 z" opacity=".8" fill="#ffffff"/>
+    <path sodipodi:nodetypes="ccsccscc" d="m 156.75706,289.14862 15.23845,10.68689 c 30.42126,23.19058 49.37576,21.86305 67.63242,-3.7246 18.25666,-25.58769 -19.43768,-82.55651 -19.43768,-82.55651 0,0 -0.55988,-0.3995 -0.55988,-0.3995 0,0 -66.13262,-17.11106 -84.38924,8.47659 -18.25666,25.58769 -13.34578,43.94302 18.47989,65.16529 l 15.06289,10.93293" id="path3374" fill="#ffffff" fill-rule="evenodd"/>
+   </g>
+  </g>
+  <path d="m 187.12038,514.0683 c 0,19.4203 -15.74327,35.16356 -35.16356,35.16356 -19.4203,0 -35.16356,-15.74326 -35.16356,-35.16356 0,-19.4203 15.74326,-35.16356 35.16356,-35.16356 19.42029,0 35.16356,15.74326 35.16356,35.16356 z" sodipodi:ry="35.163559" sodipodi:rx="35.163559" sodipodi:cy="514.0683" sodipodi:cx="151.95682" id="path3538" sodipodi:type="arc" fill="#ffffff"/>
+ </g>
+ <g id="g3548" transform="matrix(-0.54186052,0.50697067,0.50697067,0.54186052,241.93057,-91.527701)">
+  <g id="g3550" transform="matrix(1.0907181,-0.2914957,0.2914957,1.0907181,-98.8285,72.452649)">
+   <g id="g3552" transform="matrix(0.9826633,-0.1853992,0.1853992,0.9826633,-60.17152,31.061258)">
+    <path d="m 137.92957,221.66212 c -7.58542,0.60458 -11.32119,13.81445 -12.99324,20.91531 -0.79855,11.74113 9.76035,31.84764 15.41118,30.63495 40.72202,-3e-5 66.02183,27.71772 66.02183,68.43978 4e-5,40.72201 -27.11324,70.25322 -67.83529,70.25322 -16.18798,-3e-5 -24.46001,-14.39283 -40.587827,-11.81862 -15.673332,2.50166 -23.662466,9.76279 -28.251302,18.06731 -4.857361,8.79047 -9.926486,22.86389 6.128076,35.08654 16.487744,12.55244 31.261093,13.74345 53.039363,13.74342 67.62255,6e-5 127.14539,-57.70923 127.14531,-125.33187 -4e-5,-67.62265 -50.45552,-119.98994 -118.0781,-119.99004 z" id="path3554" sodipodi:nodetypes="cccsszzzssc" fill="#ffffff"/>
+    <path d="m 133.09373,224.64754 c -64.403852,-4e-5 -117.1032,52.60083 -117.103104,117.00462 3.1e-5,47.37503 23.678013,91.92373 64.401738,110.29016 l 26.601846,-46.2725 c -30.109595,-5.8038 -45.895746,-25.45708 -45.895746,-61.65394 -6.2e-5,-43.94094 30.509229,-77.95879 74.450206,-77.95879 12.23459,3e-5 16.71534,4.92072 29.06145,9.41063 l 11.3262,-42.64562 c -13.2782,-5.25876 -27.74167,-8.17456 -42.84259,-8.17456 z" id="path3556" sodipodi:nodetypes="csccssccc" opacity=".8" fill="#ffffff"/>
+    <path id="path3558" d="m 156.75706,289.14862 15.23845,10.68689 c 30.42126,23.19058 49.37576,21.86305 67.63242,-3.7246 18.25666,-25.58769 -19.43768,-82.55651 -19.43768,-82.55651 0,0 -0.55988,-0.3995 -0.55988,-0.3995 0,0 -66.13262,-17.11106 -84.38924,8.47659 -18.25666,25.58769 -13.34578,43.94302 18.47989,65.16529 l 15.06289,10.93293" sodipodi:nodetypes="ccsccscc" fill="#ffffff" fill-rule="evenodd"/>
+   </g>
+  </g>
+  <path sodipodi:type="arc" id="path3560" sodipodi:cx="151.95682" sodipodi:cy="514.0683" sodipodi:rx="35.163559" sodipodi:ry="35.163559" d="m 187.12038,514.0683 c 0,19.4203 -15.74327,35.16356 -35.16356,35.16356 -19.4203,0 -35.16356,-15.74326 -35.16356,-35.16356 0,-19.4203 15.74326,-35.16356 35.16356,-35.16356 19.42029,0 35.16356,15.74326 35.16356,35.16356 z" fill="#ffffff"/>
+ </g>
+ <path d="M 287.6875,25.0625 C 272.41161,37.008643 256.01475,48.391322 237.11047,53.712259 201.20204,65.107791 160.7002,60.414033 127.75,42.4375 119.76442,41.891892 115.58812,50.31637 109.23306,53.702178 94.143447,66.235988 78.306382,78.103405 64.125,91.59375 c -2.587389,5.722936 3.816552,10.18596 4.764815,15.5784 13.563158,29.81377 28.3726,62.13252 22.391435,95.7341 -6.105692,42.81579 -32.442664,79.65745 -40.080591,122.14596 -8.492787,54.88025 16.152824,114.42702 63.657481,144.18714 55.0913,38.30318 122.89175,51.32536 180.01686,85.76065 7.67782,3.62806 13.56669,-4.8136 20.00415,-7.38842 54.4043,-32.98846 118.58948,-48.56028 168.99585,-88.64283 28.88568,-21.5948 48.32841,-54.80724 53.78039,-90.48785 5.74572,-33.51024 -0.65606,-68.54754 -16.90555,-98.2645 -15.51203,-33.18508 -33.4428,-68.04724 -30.00081,-105.80243 2.68903,-27.36665 15.23092,-52.46165 24.84472,-77.85147 0.10994,-6.795344 -8.17884,-8.262472 -11.77613,-12.651977 C 486.81365,61.01643 470.13483,46.86311 451.66745,36.163247 c -11.4803,2.505969 -20.74452,11.507531 -32.47995,13.618003 -43.525,14.40095 -94.32737,5.198662 -129.5625,-24.5 -0.59909,-0.283146 -1.28983,-0.348406 -1.9375,-0.21875 z" id="path3610" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16"/>
+ <path sodipodi:nodetypes="cccscccccsccc" d="m 299.36814,552.79365 0,0 c 87.57849,-60.48622 234.86567,-71.30416 236.1719,-209.53289 0.62341,-61.98162 -36.26078,-81.56678 -49.04661,-158.18473 -5.84658,-35.03514 25.93859,-99.834935 25.93859,-99.834935 l -61.067,-46.035909 C 414.77305,62.373172 346.03301,76.290957 288.27326,28.720954 232.49025,78.52803 163.23714,67.171581 125.73251,45.378908 L 66.579838,93.646237 c 0,0 34.391022,63.571493 29.9707,98.797203 -9.666746,77.03468 -45.728329,97.97381 -42.58992,159.88557 6.915079,138.07616 154.530342,143.42038 244.497622,200.61111 l 0,0" id="path4295" opacity=".1" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="9.548"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/amenity/post_box.svg b/vtm-themes/icons/symbols/amenity/post_box.svg
new file mode 100755
index 00000000..7f787525
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/post_box.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 126.19975,188.66899 L 226.02765,288.98257 L 126.19975,388.81046 L 126.19975,188.66899 z M 436.76562,169.86019 L 313.80202,292.35284 C 307.68915,298.46559 299.97235,301.52189 290.6516,301.52176 C 281.0066,301.52189 272.96602,298.3037 266.52985,291.86715 L 144.52289,169.86019 L 436.76562,169.86019 z M 456.06009,388.81046 L 356.23219,288.98257 L 456.06009,188.66899 L 456.06009,388.81046 z M 144.03721,407.61925 L 244.35077,307.79135 L 248.69241,312.13298 C 260.26985,323.38697 274.25623,329.01391 290.6516,329.0138 C 307.04649,329.01391 320.87099,323.38697 332.12515,312.13298 L 336.46676,307.79135 L 436.76562,407.61925 L 144.03721,407.61925 z M 99.193389,434.62562 L 484.0378,434.62562 L 484.0378,142.36816 L 99.193389,142.36816 L 99.193389,434.62562 z" id="flowRoot3192" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/amenity/post_office.svg b/vtm-themes/icons/symbols/amenity/post_office.svg
new file mode 100755
index 00000000..c91b36a6
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/post_office.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 131.79596,192.04629 L 228.24657,288.96614 L 131.79596,385.41673 L 131.79596,192.04629 z M 431.85502,173.87381 L 313.05143,292.22239 C 307.14536,298.12834 299.68963,301.08124 290.68421,301.08111 C 281.36551,301.08124 273.59696,297.97192 267.37853,291.75313 L 149.49921,173.87381 L 431.85502,173.87381 z M 450.49674,385.41673 L 354.04613,288.96614 L 450.49674,192.04629 L 450.49674,385.41673 z M 149.02996,403.5892 L 245.9498,307.1386 L 250.14455,311.33334 C 261.33031,322.2066 274.84352,327.64317 290.68421,327.64306 C 306.52444,327.64317 319.88125,322.2066 330.75466,311.33334 L 334.94939,307.1386 L 431.85502,403.5892 L 149.02996,403.5892 z M 105.70326,429.68191 L 477.52793,429.68191 L 477.52793,147.31187 L 105.70326,147.31187 L 105.70326,429.68191 z" id="flowRoot3192" fill="#ffffff"/>
+ <path sodipodi:type="arc" id="path2207" sodipodi:cx="217.14285" sodipodi:cy="305.71429" sodipodi:rx="288.57144" sodipodi:ry="288.57144" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" transform="matrix(0.9469422,0,0,0.9469422,85.693279,2.9720757)" fill="none" stroke="#ffffff" stroke-width="25.14"/>
+ <path transform="matrix(0.9469422,0,0,0.9469422,85.693279,2.9720757)" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" sodipodi:ry="288.57144" sodipodi:rx="288.57144" sodipodi:cy="305.71429" sodipodi:cx="217.14285" id="path3267" sodipodi:type="arc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-width="25.14"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/prison.svg b/vtm-themes/icons/symbols/amenity/prison.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/prison.svg
rename to vtm-themes/icons/symbols/amenity/prison.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/public_building.svg b/vtm-themes/icons/symbols/amenity/public_building.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/public_building.svg
rename to vtm-themes/icons/symbols/amenity/public_building.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/public_building2.svg b/vtm-themes/icons/symbols/amenity/public_building2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/public_building2.svg
rename to vtm-themes/icons/symbols/amenity/public_building2.svg
diff --git a/vtm-themes/icons/symbols/amenity/recycling.svg b/vtm-themes/icons/symbols/amenity/recycling.svg
new file mode 100755
index 00000000..306860e3
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/recycling.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 215.29767,353.28001 L 153.07069,244.8576 L 27.922348,244.8576 L 78.794486,274.30668 L 47.344036,328.50767 C 44.661797,333.4228 43.320736,338.55563 43.320819,343.90613 C 43.320736,349.25693 44.661797,354.38976 47.344036,359.3046 L 96.847881,445.63 C 99.080577,439.3808 101.31344,434.02333 103.54642,429.5576 L 165.11988,323.83094 L 215.29767,353.28001 z M 122.29416,440.27934 C 118.71329,446.07933 116.92292,452.32177 116.92307,459.00667 C 116.92292,469.27234 120.60575,477.97226 127.97157,485.10646 C 135.33707,492.24067 144.14591,495.80778 154.39813,495.80779 L 277.54508,495.80779 L 277.54508,396.10574 L 147.72002,396.10574 C 146.82124,397.88939 143.47198,403.68933 137.6722,413.5056 L 122.29416,440.27934 z M 288.92035,193.33194 L 413.39474,193.33194 L 476.29567,84.929954 L 425.44395,114.37903 L 393.97307,60.157607 C 388.17267,49.906007 379.25493,44.779997 367.21976,44.779546 L 268.1712,44.779546 C 272.1873,49.232072 275.53656,53.690954 278.21902,58.156212 L 339.09813,163.88287 L 329.07074,169.90746 L 288.92035,193.33194 z M 228.02081,50.130223 C 213.7385,50.130657 203.03039,56.373094 195.89641,68.857531 L 133.66943,175.93207 C 157.30473,189.76511 186.07983,206.27318 219.99482,225.45634 C 240.06293,191.1062 261.69701,153.63117 284.89713,113.03113 L 260.14522,68.857531 C 253.0107,56.373094 242.30259,50.130657 228.02081,50.130223 L 228.02081,50.130223 z M 387.96889,394.75786 L 387.96889,382.70866 L 387.96889,336.55408 L 325.72148,444.95607 L 387.96889,552.70454 L 387.96889,494.48033 L 450.19588,494.48033 C 462.24457,494.48033 471.38698,489.34751 477.62313,479.08186 L 527.14739,392.75646 C 520.46191,394.54011 514.88661,395.43188 510.42147,395.43179 L 387.96889,394.75786 z M 480.31888,211.40574 C 478.08551,212.74027 449.3036,229.24835 393.97307,260.93001 C 421.63812,308.6641 443.50366,346.36377 459.56974,374.02915 L 509.74753,374.02915 C 524.47831,374.02926 535.41108,367.78001 542.54588,355.2814 C 549.2302,343.23233 549.00556,330.96531 541.87193,318.48028 L 480.31888,211.40574 z" id="flowRoot3192" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/survey_point.svg b/vtm-themes/icons/symbols/amenity/survey_point.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/survey_point.svg
rename to vtm-themes/icons/symbols/amenity/survey_point.svg
diff --git a/vtm-themes/icons/symbols/amenity/telephone.svg b/vtm-themes/icons/symbols/amenity/telephone.svg
new file mode 100755
index 00000000..e6407a79
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/telephone.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3634" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3631" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2611">
+   <path id="path1325" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2608">
+   <path id="path1322" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g1331" transform="matrix(0.9537247,0.6649405,-0.6649405,0.9537247,190.65781,-211.89377)">
+  <path d="M 309.337,64.0439 C 286.958,66.5479 205.583,103.742 203.208,295.523 C 200.708,497.548 286.958,540.048 309.578,539.59 L 309.578,406.154 C 290.958,406.154 287.212,385.879 282.958,344.048 C 280.144,316.369 279.324,282.106 282.958,248.048 C 285.51,224.151 289.958,200.825 309.458,200.825 L 309.337,64.0439 z" id="path1333" fill="#ffffff"/>
+  <path d="M 357.583,539.825 C 366.208,539.825 372.394,532.798 372.394,524.923 L 372.456,524.861 C 372.456,524.861 372.394,420.861 372.394,420.798 C 372.394,412.548 365.708,406.044 357.583,406.044 L 319.784,406.044 L 319.784,539.825 C 319.784,539.825 357.491,539.883 357.522,539.852 L 357.583,539.825 z" id="path1335" fill="#ffffff"/>
+  <path d="M 357.583,200.825 C 366.208,200.825 372.394,193.798 372.394,185.923 L 372.456,185.861 C 372.456,185.861 372.394,78.8609 372.394,78.7979 C 372.394,70.5479 365.708,64.0439 357.583,64.0439 L 319.784,64.0439 L 319.784,200.825 C 319.784,200.825 357.491,200.883 357.522,200.852 L 357.583,200.825 z" id="path1337" fill="#ffffff"/>
+ </g>
+</svg>
diff --git a/vtm-themes/icons/symbols/amenity/toilets.svg b/vtm-themes/icons/symbols/amenity/toilets.svg
new file mode 100755
index 00000000..8e015df2
--- /dev/null
+++ b/vtm-themes/icons/symbols/amenity/toilets.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 282.64529,512.4583 L 318.45711,512.4583 L 318.45711,61.17178 L 282.64529,61.17178 L 282.64529,512.4583 z M 174.96393,143.59872 L 102.68057,143.59872 C 91.409786,143.59908 81.273089,147.65375 72.270419,155.76278 C 65.507937,162.05819 61.006552,169.04048 58.766246,176.7097 L 27.675745,280.06296 C 26.782291,282.3173 26.335581,284.34465 26.335632,286.14498 C 26.335581,296.50868 31.510451,301.69043 41.860261,301.69023 C 49.076158,301.69043 53.811209,297.63574 56.065415,289.52617 L 84.434463,194.93518 L 99.959105,194.93518 L 53.343962,363.14964 L 98.618995,363.14964 L 98.618995,494.21221 C 98.61888,505.92269 104.24733,511.77792 115.50436,511.77794 C 126.76111,511.77792 132.38957,505.92269 132.38972,494.21221 L 132.38972,362.4899 L 149.29569,362.4899 L 149.29569,494.89257 C 149.29553,506.14948 154.92397,511.77792 166.18106,511.77794 C 177.43776,511.77792 183.06622,506.14948 183.06641,494.89257 L 183.06641,363.14964 L 228.32083,363.14964 L 181.04594,194.93518 L 197.25095,194.93518 L 225.62,289.52617 C 227.87388,297.63574 232.60206,301.69043 239.80454,301.69023 C 250.16776,301.69043 255.34951,296.50868 255.34978,286.14498 C 255.34951,283.89107 254.9028,281.86372 254.00968,280.06296 L 222.91917,176.7097 C 220.66479,169.49405 215.48992,162.51175 207.39454,155.76278 C 197.4844,147.65375 186.6742,143.59908 174.96393,143.59872 L 174.96393,143.59872 z M 140.51284,136.15597 C 150.86243,136.15632 159.64183,132.55522 166.85111,125.35263 C 174.06002,118.1508 177.66455,109.59472 177.66475,99.68441 C 177.66455,89.32131 174.06002,80.53845 166.85111,73.33581 C 159.64183,66.13403 150.86243,62.53293 140.51284,62.5325 C 130.60277,62.53293 122.04326,66.13403 114.8343,73.33581 C 107.62508,80.53845 104.02054,89.32131 104.02065,99.68441 C 104.02054,109.59472 107.62508,118.1508 114.8343,125.35263 C 122.04326,132.55522 130.60277,136.15632 140.51284,136.15597 L 140.51284,136.15597 z M 456.528,135.49621 C 466.43739,135.49658 474.9969,131.89203 482.20653,124.68258 C 489.41507,117.47387 493.01961,108.91436 493.02017,99.00405 C 493.01961,88.65469 489.41507,79.98867 482.20653,73.00595 C 474.9969,66.02408 466.43739,62.53293 456.528,62.5325 C 446.61756,62.53293 438.06149,66.02408 430.85977,73.00595 C 423.65706,79.98867 420.05596,88.65469 420.05644,99.00405 C 420.05596,108.91436 423.65706,117.47387 430.85977,124.68258 C 438.06149,131.89203 446.61756,135.49658 456.528,135.49621 L 456.528,135.49621 z M 504.50386,142.91837 L 407.89239,142.91837 C 394.83447,142.9187 383.68753,147.53693 374.45153,156.77301 C 365.21467,166.00978 360.59646,177.3835 360.59688,190.89423 L 360.59688,303.03034 C 360.59646,313.8476 365.55141,319.25613 375.46177,319.25595 C 384.91767,319.25613 389.64585,313.8476 389.64631,303.03034 L 389.64631,193.59506 L 407.21203,193.59506 L 407.21203,490.85163 C 407.21155,504.36266 413.96707,511.11818 427.47858,511.1182 C 440.98911,511.11818 447.74462,504.36266 447.74513,490.85163 L 447.74513,318.57559 L 465.31086,318.57559 L 465.31086,490.85163 C 465.31033,504.36266 472.06584,511.11818 485.57741,511.1182 C 499.54147,511.11818 506.52377,504.36266 506.52433,490.85163 L 506.52433,193.59506 L 523.4097,193.59506 L 523.4097,303.03034 C 523.40911,314.28743 528.13728,319.91587 537.59423,319.91571 C 547.06371,319.91587 551.79875,314.28743 551.79936,303.03034 L 551.79936,191.55397 C 551.79875,178.49682 547.40733,167.12653 538.62508,157.44307 C 529.84162,147.76028 518.4679,142.9187 504.50386,142.91837 L 504.50386,142.91837 z" id="flowRoot3192" sodipodi:nodetypes="ccccccccccssccccccsccccsccccccssccccccssssssscccsccssscccccsccsccccsccccsccccsccccc" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/toilets_disabled.svg b/vtm-themes/icons/symbols/amenity/toilets_disabled.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/toilets_disabled.svg
rename to vtm-themes/icons/symbols/amenity/toilets_disabled.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/toilets_men.svg b/vtm-themes/icons/symbols/amenity/toilets_men.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/toilets_men.svg
rename to vtm-themes/icons/symbols/amenity/toilets_men.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/toilets_women.svg b/vtm-themes/icons/symbols/amenity/toilets_women.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/toilets_women.svg
rename to vtm-themes/icons/symbols/amenity/toilets_women.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/town_hall.svg b/vtm-themes/icons/symbols/amenity/town_hall.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/town_hall.svg
rename to vtm-themes/icons/symbols/amenity/town_hall.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/town_hall2.svg b/vtm-themes/icons/symbols/amenity/town_hall2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/town_hall2.svg
rename to vtm-themes/icons/symbols/amenity/town_hall2.svg
diff --git a/vtm-themes/resources/assets/symbols/amenity/waste_bin.svg b/vtm-themes/icons/symbols/amenity/waste_bin.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/amenity/waste_bin.svg
rename to vtm-themes/icons/symbols/amenity/waste_bin.svg
diff --git a/vtm-themes/icons/symbols/barrier/blocks.svg b/vtm-themes/icons/symbols/barrier/blocks.svg
new file mode 100755
index 00000000..f615a37a
--- /dev/null
+++ b/vtm-themes/icons/symbols/barrier/blocks.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <g transform="translate(9.478562,-37.590682)" id="g2325" fill="#ffffff" stroke="#ffffff" stroke-width="5.2">
+  <path d="m 235.146,477.418 c 0,14.09 -11.422,25.512 -25.512,25.512 l -121.976,0 c -14.09,0 -25.512,-11.422 -25.512,-25.512 l 0,-260.974 c 0,-14.09 9.252043,-29.85191 25.512,-25.512 l 115.06098,37.77455 C 220.6064,234.67394 227.146,242.841 227.146,256.931 l 8,220.487 z" id="path6056" sodipodi:nodetypes="ccccccccc"/>
+  <path d="m 522.145,477.418 c 0,14.09 -11.422,25.512 -25.512,25.512 l -121.976,1 c -14.09,0 -25.512,-11.422 -25.512,-25.512 l 14.488,-186.975 c 0,-14.09 11.422,-25.512 25.512,-25.512 l 105.488,7.487 c 14.09,0 25.512,11.422 25.512,25.512 l 2,178.488 z" id="path6058"/>
+ </g>
+</svg>
diff --git a/vtm-themes/icons/symbols/barrier/bollard.svg b/vtm-themes/icons/symbols/barrier/bollard.svg
new file mode 100755
index 00000000..bda0142e
--- /dev/null
+++ b/vtm-themes/icons/symbols/barrier/bollard.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <defs id="defs22">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
+   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
+   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
+   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
+   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 290,109.625 C 267.00676,109.97494 244.29858,119.7799 228.27689,136.27588 C 212.2552,152.77185 203.11669,175.75633 203.4375,198.75 L 203.4375,433.53125 C 222.81381,454.75952 359.10328,456.65758 379.21875,433.53125 L 379.21875,198.75 C 379.54566,175.3137 370.02902,151.8952 353.44673,135.33033 C 336.86444,118.76547 313.43595,109.27345 290,109.625 z" id="path4689" sodipodi:nodetypes="csccccsc" color="#000000" stroke-width="175.8" fill="#ffffff"/>
+ <path d="M 293.09375,407.82285 C 259.66039,408.11377 223.34681,407.4427 194.125,415.46045 C 184.39475,418.23702 180.32117,422.97243 180.15538,427.85232 C 179.97524,433.15469 180.68429,448.12305 180.38851,460.9171 C 181.15967,469.35513 250.85878,446.48184 277.561,447.51498 C 313.91784,447.97152 403.73843,469.07255 403.32856,461.81048 C 403.31787,450.18896 403.4126,439.16108 403.26436,427.95697 C 403.22474,424.96229 401.82055,422.00164 397.40625,419.47885 C 384.65837,411.42986 359.97963,409.82547 338.91317,408.70425 C 323.7189,407.92177 308.38624,407.7491 293.09375,407.82285 z" id="path4725" sodipodi:nodetypes="ccscccsccc" color="#000000" stroke-width="35" fill="#ffffff"/>
+ <path id="path4739" d="M 293.09375,441.82285 C 259.66039,442.11377 223.34681,441.4427 194.125,449.46045 C 173.80517,455.25881 176.02811,470.40474 198.1875,474.94133 C 221.58608,481.25804 250.85878,480.48184 277.561,481.51498 C 313.91784,481.97152 352.03125,481.68257 385.5625,475.12761 C 401.67721,470.7495 409.51982,460.40181 397.40625,453.47885 C 384.65837,445.42986 359.97963,443.82547 338.91317,442.70425 C 323.7189,441.92177 308.38624,441.7491 293.09375,441.82285 z" color="#000000" stroke-width="35" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/cattle_grid.svg b/vtm-themes/icons/symbols/barrier/cattle_grid.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/barrier/cattle_grid.svg
rename to vtm-themes/icons/symbols/barrier/cattle_grid.svg
diff --git a/vtm-themes/icons/symbols/barrier/cycle_barrier.svg b/vtm-themes/icons/symbols/barrier/cycle_barrier.svg
new file mode 100755
index 00000000..c7661bc7
--- /dev/null
+++ b/vtm-themes/icons/symbols/barrier/cycle_barrier.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <g transform="translate(-9.2012672,4.4650424)" id="g2325">
+  <line x1="221.75" y1="147" x2="155.75" y2="491.86" id="line6215" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="50"/>
+  <line x1="79.945" y1="499.45" x2="79.945" y2="211.91" id="line6217" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
+  <line x1="82.15" y1="255.08" x2="207.54" y2="255.08" id="line6219" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
+  <line x1="382.55" y1="147" x2="448.55" y2="491.86" id="line6221" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="50"/>
+  <line x1="524.35" y1="499.45" x2="524.35" y2="211.91" id="line6223" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
+  <line x1="522.15" y1="255.08" x2="396.75" y2="255.08" id="line6225" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/entrance.svg b/vtm-themes/icons/symbols/barrier/entrance.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/barrier/entrance.svg
rename to vtm-themes/icons/symbols/barrier/entrance.svg
diff --git a/vtm-themes/resources/assets/symbols/barrier/exit.svg b/vtm-themes/icons/symbols/barrier/exit.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/barrier/exit.svg
rename to vtm-themes/icons/symbols/barrier/exit.svg
diff --git a/vtm-themes/icons/symbols/barrier/gate.svg b/vtm-themes/icons/symbols/barrier/gate.svg
new file mode 100755
index 00000000..1824fa5c
--- /dev/null
+++ b/vtm-themes/icons/symbols/barrier/gate.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <defs id="defs22">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
+   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
+   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
+   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
+   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 68.690452,226.50324 451.760378,0" id="path2900" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
+ <path sodipodi:nodetypes="cc" id="path3730" d="m 68.690452,360.07403 451.760378,0" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
+ <path sodipodi:nodetypes="cc" d="M 132.37824,443.67778 452.51615,144.52914" id="path3732" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/kissing_gate.svg b/vtm-themes/icons/symbols/barrier/kissing_gate.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/barrier/kissing_gate.svg
rename to vtm-themes/icons/symbols/barrier/kissing_gate.svg
diff --git a/vtm-themes/icons/symbols/barrier/lift_gate.svg b/vtm-themes/icons/symbols/barrier/lift_gate.svg
new file mode 100755
index 00000000..3e4da860
--- /dev/null
+++ b/vtm-themes/icons/symbols/barrier/lift_gate.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <defs id="defs22">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
+   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
+   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
+   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
+   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path sodipodi:nodetypes="cc" d="M 124.72631,239.07157 494.25422,156.69163" id="path3732" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
+ <path d="m 458.25,264.90625 c -3.72291,-0.002 -7.42352,1.53023 -10.05602,4.16273 -2.6325,2.6325 -4.16438,6.33311 -4.16273,10.05602 l 0,170.53125 c -0.002,3.72291 1.53023,7.42352 4.16273,10.05602 2.6325,2.6325 6.33311,4.16438 10.05602,4.16273 l 51.84375,0 c 3.72291,0.002 7.42352,-1.53023 10.05602,-4.16273 2.6325,-2.6325 4.16438,-6.33311 4.16273,-10.05602 l 0,-170.53125 c 0.002,-3.72291 -1.53023,-7.42352 -4.16273,-10.05602 -2.6325,-2.6325 -6.33311,-4.16438 -10.05602,-4.16273 l -51.84375,0 z" id="rect3827" sodipodi:nodetypes="csccsccsccscc" opacity=".75" color="#000000" stroke-width="28.422" fill="#ffffff"/>
+ <path d="M 81.75 121.90625 C 77.111289 121.90642 72.498814 123.81369 69.21875 127.09375 C 65.938686 130.37382 64.031422 134.98629 64.03125 139.625 L 64.03125 446.15625 C 64.031422 450.79496 65.938686 455.40743 69.21875 458.6875 C 72.498814 461.96756 77.111289 463.87483 81.75 463.875 L 126.59375 463.875 C 131.23246 463.87483 135.84493 461.96756 139.125 458.6875 C 142.40506 455.40743 144.31233 450.79496 144.3125 446.15625 L 144.3125 291.6875 C 121.89709 298.56987 95.011402 292.47356 80.53125 273.4375 C 58.570596 247.16863 69.775915 200.74817 102.15625 188.5 C 116.20582 185.24621 130.2603 182.02206 144.3125 178.78125 L 144.3125 139.625 C 144.31233 134.98629 142.40506 130.37382 139.125 127.09375 C 135.84493 123.81369 131.23246 121.90642 126.59375 121.90625 L 81.75 121.90625 z " id="rect3925" opacity=".75" color="#000000" stroke-width="35.435" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/steps.svg b/vtm-themes/icons/symbols/barrier/steps.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/barrier/steps.svg
rename to vtm-themes/icons/symbols/barrier/steps.svg
diff --git a/vtm-themes/icons/symbols/barrier/stile.svg b/vtm-themes/icons/symbols/barrier/stile.svg
new file mode 100755
index 00000000..2a627a3d
--- /dev/null
+++ b/vtm-themes/icons/symbols/barrier/stile.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <defs id="defs22">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
+   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
+   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
+   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
+   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 97.6875,138.375 C 92.456765,138.45674 87.300035,140.68383 83.65625,144.4375 C 80.012464,148.19118 77.926326,153.4254 78,158.65625 L 78,178.65625 L 78,187.5 L 68.6875,187.5 C 62.083592,187.4066 55.484286,190.0505 50.78125,194.6875 C 46.078213,199.3245 43.34375,205.89543 43.34375,212.5 C 43.34375,219.10457 46.078213,225.6755 50.78125,230.3125 C 55.484286,234.9495 62.083592,237.5934 68.6875,237.5 L 78,237.5 L 78,313.0625 L 68.6875,313.0625 C 62.083592,312.9691 55.484286,315.613 50.78125,320.25 C 46.078213,324.887 43.34375,331.45793 43.34375,338.0625 C 43.34375,344.66707 46.078213,351.238 50.78125,355.875 C 55.484286,360.512 62.083592,363.1559 68.6875,363.0625 L 78,363.0625 L 78,409.34375 L 78,429.34375 L 78,449.34375 L 118,449.34375 L 118,429.34375 L 118,409.34375 L 118,363.0625 L 212.3125,363.0625 L 212.3125,335 L 212.3125,334 L 212.3125,333 L 387.6875,333 L 387.6875,363.0625 L 474,363.0625 L 474,409.34375 L 474,429.34375 L 474,449.34375 L 514,449.34375 L 514,429.34375 L 514,409.34375 L 514,363.0625 L 520.4375,363.0625 C 527.04141,363.1559 533.64071,360.512 538.34375,355.875 C 543.04679,351.238 545.78125,344.66707 545.78125,338.0625 C 545.78125,331.45793 543.04679,324.887 538.34375,320.25 C 533.64071,315.613 527.04141,312.9691 520.4375,313.0625 L 514,313.0625 L 514,237.5 L 520.4375,237.5 C 527.04141,237.5934 533.64071,234.9495 538.34375,230.3125 C 543.04679,225.6755 545.78125,219.10457 545.78125,212.5 C 545.78125,205.89543 543.04679,199.3245 538.34375,194.6875 C 533.64071,190.0505 527.04141,187.4066 520.4375,187.5 L 514,187.5 L 514,178.65625 L 514,158.65625 C 514.07514,153.32123 511.9007,147.98864 508.125,144.21875 C 504.3493,140.44885 499.02239,138.29164 493.6875,138.375 C 488.45677,138.45674 483.30004,140.68383 479.65625,144.4375 C 476.01247,148.19118 473.92633,153.4254 474,158.65625 L 474,178.65625 L 474,187.5 L 118,187.5 L 118,178.65625 L 118,158.65625 C 118.07514,153.32123 115.9007,147.98864 112.125,144.21875 C 108.3493,140.44885 103.02239,138.29164 97.6875,138.375 z M 118,237.5 L 474,237.5 L 474,313.0625 L 118,313.0625 L 118,237.5 z" id="path2900" sodipodi:nodetypes="csccccsssccccsssccccccccccccccccccccccccsssccccsssccccsssccccccscccccc" opacity=".75" color="#000000" stroke-width="50" fill="#ffffff"/>
+ <path d="M 232,468 L 372,468" id="path4403" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-width="50"/>
+ <path id="path4405" d="M 240.31579,386 L 359.68421,386" fill="none" stroke="#ffffff" stroke-width="50"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/toll_booth.svg b/vtm-themes/icons/symbols/barrier/toll_booth.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/barrier/toll_booth.svg
rename to vtm-themes/icons/symbols/barrier/toll_booth.svg
diff --git a/vtm-themes/resources/assets/symbols/education/college.svg b/vtm-themes/icons/symbols/education/college.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/education/college.svg
rename to vtm-themes/icons/symbols/education/college.svg
diff --git a/vtm-themes/resources/assets/symbols/education/college_vocational.svg b/vtm-themes/icons/symbols/education/college_vocational.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/education/college_vocational.svg
rename to vtm-themes/icons/symbols/education/college_vocational.svg
diff --git a/vtm-themes/resources/assets/symbols/education/nursery.svg b/vtm-themes/icons/symbols/education/nursery.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/education/nursery.svg
rename to vtm-themes/icons/symbols/education/nursery.svg
diff --git a/vtm-themes/resources/assets/symbols/education/nursery2.svg b/vtm-themes/icons/symbols/education/nursery2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/education/nursery2.svg
rename to vtm-themes/icons/symbols/education/nursery2.svg
diff --git a/vtm-themes/icons/symbols/education/nursery3.svg b/vtm-themes/icons/symbols/education/nursery3.svg
new file mode 100755
index 00000000..31424b77
--- /dev/null
+++ b/vtm-themes/icons/symbols/education/nursery3.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <defs id="defs22">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
+   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
+   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#39AC39" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 68.564095,150.51046 318.30511,232.32214 313.99924,528.35134 85.78763,423.9338 68.564095,150.51046 z" id="path3933" sodipodi:nodetypes="ccccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30.447"/>
+ <path d="M 514.22263,131.13401 318.30511,232.32214 315.0757,529.42783 494.84619,405.63379 514.22263,131.13401 z" id="path3935" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30.447"/>
+ <path d="M 273.09339,62.239925 70.986184,148.08842 318.30511,231.24568 512.06968,129.25014 273.09339,62.239925 z" id="path3937" sodipodi:nodetypes="ccccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30.447"/>
+ <path d="m 68.837859,135.30745 c -4.195247,-0.0822 -8.386918,1.63409 -11.288544,4.66517 -2.901644,3.03108 -4.469507,7.33125 -4.204406,11.51892 l 17.220788,273.40161 c 0.341089,5.47059 3.883904,10.62375 8.86957,12.9012 L 307.68271,542.21337 c 4.58364,2.09005 10.20101,1.71741 14.45624,-0.9791 4.25524,-2.6965 7.01696,-7.6336 7.08414,-12.67082 l 4.3196,-296.03629 c 0.0923,-6.43689 -4.36479,-12.68188 -10.48222,-14.68663 L 73.330238,136.05618 c -1.44873,-0.47251 -2.968712,-0.72584 -4.492379,-0.74873 z m 68.883151,102.92157 c 4.73153,-0.10724 10.61429,0.74335 17.68155,2.53417 9.4229,2.38795 19.70104,6.03411 30.75552,11.00057 17.74515,7.97282 31.99031,15.52983 42.85039,22.63468 10.8598,7.10515 20.04867,15.8446 27.53022,26.26314 5.25385,7.24653 9.54633,16.05482 12.8436,26.49352 3.29692,10.43883 5.11851,19.86225 5.47149,28.16377 l 3.28289,77.81031 c 0.35257,8.30151 1.12482,15.09753 2.24619,20.21571 1.12093,5.11807 3.38258,11.97679 6.79616,20.67647 l -55.57879,-24.93847 c -2.42329,-5.54036 -4.00057,-9.64058 -4.78036,-12.32525 -0.78006,-2.68497 -1.63913,-6.75576 -2.53416,-12.15246 -7.39539,5.03762 -14.84151,7.62199 -22.34671,7.83287 -10.26572,0.16495 -22.30299,-2.81228 -36.16941,-9.04236 -18.4241,-8.27766 -32.65475,-19.43063 -42.62001,-33.46246 -9.96535,-14.03191 -15.2318,-28.22606 -15.83852,-42.50483 -0.56913,-13.39322 2.40926,-22.85367 8.92716,-28.39414 6.51787,-5.54034 18.92139,-6.24609 37.26372,-2.131 21.9894,4.88518 36.22826,7.78205 42.7352,8.69679 6.50675,0.91489 13.39025,1.39192 20.61887,1.38227 -0.35287,-8.3015 -2.09409,-14.79574 -5.24111,-19.46698 -3.14727,-4.67112 -8.50543,-8.69657 -16.0689,-12.09487 -9.69692,-4.35658 -16.9001,-5.85596 -21.59798,-4.49238 -3.66427,1.06818 -6.52135,4.86954 -8.524,11.46133 l -56.84588,-32.25298 c 1.65353,-10.33155 4.3142,-17.79453 8.06325,-22.4619 3.74905,-4.66704 9.34109,-7.68084 16.70243,-9.04235 1.3211,-0.24784 2.80002,-0.36741 4.37719,-0.40317 z m 41.00736,118.93287 c -3.72921,0.0927 -6.36578,0.67569 -7.89046,1.72784 -3.14179,2.17144 -4.57481,5.60299 -4.37719,10.25184 0.22568,5.31303 2.0219,10.36956 5.4139,15.20498 3.39181,4.83551 8.21079,8.68707 14.51384,11.51892 6.5938,2.96254 12.68233,3.86853 18.19989,2.76454 5.51735,-1.10423 9.30888,-3.75782 11.46133,-7.94805 2.1522,-4.19033 3.06431,-10.47874 2.70695,-18.89104 l -0.46076,-10.77019 c -8.00436,-0.33897 -16.33781,-1.28822 -25.05365,-2.70695 -5.9345,-0.87477 -10.78463,-1.24461 -14.51385,-1.15189 z" id="path4040" opacity=".9" color="#000000" stroke-width="16.52" fill="#ffffff"/>
+ <path d="M 513.3125 115.9375 C 511.20609 116.0615 509.12687 116.62954 507.25 117.59375 L 311.3125 218.78125 C 306.4314 221.31096 303.14522 226.65881 303.09375 232.15625 L 299.84375 529.25 C 299.77435 534.8007 303.00695 540.26503 307.90625 542.875 C 312.80556 545.48497 319.15082 545.12297 323.71875 541.96875 L 503.46875 418.1875 C 507.22329 415.60673 509.70863 411.26329 510.03125 406.71875 L 529.40625 132.21875 C 529.71345 127.91179 528.09798 123.50835 525.0625 120.4375 C 522.02702 117.36665 517.62273 115.68021 513.3125 115.9375 z M 461.5625 269.53125 C 462.25094 269.52983 462.915 269.54579 463.5625 269.59375 C 473.92225 270.36154 480.77761 276.20573 484.03125 287.21875 L 437.34375 319.40625 C 436.34014 315.08976 434.0598 312.71018 430.46875 312.28125 C 426.87744 311.85265 421.86377 313.51522 415.4375 317.1875 C 407.32415 321.82408 400.52348 328.27279 395.03125 336.625 C 389.53887 344.97748 386.30011 354.72607 385.34375 365.84375 C 384.49134 375.75152 386.33691 381.85958 390.875 384.15625 C 395.41293 386.45311 401.56952 385.40699 409.28125 381 C 415.7075 377.32766 421.23019 372.6653 425.875 367.0625 C 430.51961 361.45985 434.21548 354.82445 436.9375 347.15625 L 483.09375 325.5 C 479.73578 336.12048 474.84597 346.48689 468.40625 356.53125 C 461.96625 366.57577 454.06108 376.05257 444.625 384.96875 C 435.18869 393.88494 423.43257 402.34162 409.375 410.375 C 395.79924 418.13306 384.61333 423.37433 375.78125 426.15625 C 366.94909 428.93826 359.48545 429.55123 353.4375 427.9375 C 347.38945 426.32392 342.82704 422.97961 339.75 417.90625 C 336.67293 412.83298 335.63473 404.34292 336.65625 392.46875 C 337.72328 380.06531 340.85484 368.47086 346.0625 357.65625 C 349.87648 349.72378 354.85217 341.7182 360.96875 333.65625 C 367.08529 325.59445 373.27355 318.6626 379.5 312.875 C 389.37796 303.70646 401.77739 294.85106 416.71875 286.3125 C 436.29897 275.12323 451.23586 269.55251 461.5625 269.53125 z " id="path4042" opacity=".6" color="#000000" stroke-width="30.447" fill="#ffffff"/>
+ <path d="M 272.6875 47.03125 C 270.79129 47.07792 268.90452 47.482987 267.15625 48.21875 L 65.03125 134.0625 C 59.373254 136.44928 55.514248 142.55121 55.75 148.6875 C 55.985752 154.82379 60.300556 160.58562 66.125 162.53125 L 313.46875 245.6875 C 317.35931 246.99091 321.77677 246.63243 325.40625 244.71875 L 519.15625 142.71875 C 524.50425 139.90126 527.82203 133.66764 527.1875 127.65625 C 526.55296 121.64487 522.00589 116.23257 516.1875 114.59375 L 277.21875 47.59375 C 275.74798 47.180323 274.21472 46.989986 272.6875 47.03125 z M 315.15625 111.25 C 316.30703 111.25571 317.47734 111.28437 318.65625 111.3125 C 337.51877 111.76271 357.44413 115.62593 378.4375 122.9375 C 392.43299 127.81202 403.01991 132.89652 410.1875 138.1875 C 417.35489 143.47859 420.49283 148.43682 419.59375 153.0625 C 418.69437 157.68824 414.49029 161.72165 406.96875 165.125 C 400.53017 168.03834 392.77409 170.05297 383.71875 171.1875 C 376.7916 172.00325 366.96664 172.09121 354.25 171.46875 L 373.21875 178.0625 L 338.8125 193.625 L 161.9375 132.03125 L 199.03125 115.25 L 260.34375 136.59375 C 258.86662 133.14006 259.16056 129.91284 261.25 126.90625 C 263.33953 123.8997 267.21881 121.12195 272.875 118.5625 C 283.81904 113.61065 297.8945 111.16428 315.15625 111.25 z M 313.21875 134.03125 C 306.8919 133.98402 301.88295 134.79371 298.25 136.4375 C 293.25566 138.69738 291.64996 141.37903 293.4375 144.53125 C 295.2252 147.68357 301.16452 151.02956 311.21875 154.53125 C 322.23824 158.36919 331.76691 160.42938 339.8125 160.75 C 347.85812 161.07074 354.24633 160.18222 359 158.03125 C 363.39262 156.0437 364.63768 153.5114 362.75 150.46875 C 360.86228 147.42622 354.18956 143.9123 342.6875 139.90625 C 332.55278 136.37654 323.66401 134.45737 316 134.125 C 315.042 134.08347 314.12259 134.038 313.21875 134.03125 z " id="path4044" opacity=".75" color="#000000" stroke-width="30.447" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/education/school_primary.svg b/vtm-themes/icons/symbols/education/school.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/education/school_primary.svg
rename to vtm-themes/icons/symbols/education/school.svg
diff --git a/vtm-themes/icons/symbols/education/school_primary.svg b/vtm-themes/icons/symbols/education/school_primary.svg
new file mode 100755
index 00000000..f671c546
--- /dev/null
+++ b/vtm-themes/icons/symbols/education/school_primary.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3634" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3631" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2611">
+   <path id="path1325" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2608">
+   <path id="path1322" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#39AC39" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path id="path3526" d="M 109.53419,508.69651 L 154.37168,400.14257 L 221.63981,361.34754 L 223.27508,214.21996 L 241.78563,173.98248 L 289.0426,62.097177 M 471.71115,508.69651 L 437.81131,426.6232 L 329.70819,251.33902 L 333.85002,160.40114 L 292.20274,62.097177" sodipodi:nodetypes="ccccccccccc" opacity=".75" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="30.787"/>
+ <path d="M 73.249534,149.81914 L 73.249534,423.82196 L 510.99983,423.82196 L 510.99983,149.81914 L 73.249534,149.81914 z M 143.22544,175.69932 C 155.48659,175.69942 165.32433,176.41043 172.76156,177.78385 C 180.19859,179.15747 186.40374,182.02353 191.36194,186.37851 C 194.84589,189.39366 197.59367,193.64677 199.60383,199.17429 C 201.61375,204.70197 202.61825,209.99166 202.61838,215.01668 L 202.61838,262.12694 C 202.61825,267.15205 202.94382,271.11311 203.58046,273.96064 C 204.21686,276.80821 205.60535,280.44218 207.74951,284.86431 L 169.36218,284.86431 C 167.82105,282.11721 166.81655,280.01918 166.34763,278.57867 C 165.87853,277.13804 165.4055,274.86202 164.93658,271.7799 C 159.57642,276.93901 154.22685,280.63292 148.93383,282.84392 C 141.69764,285.79195 133.30825,287.26953 123.72712,287.26953 C 110.99685,287.26953 101.33578,284.3144 94.736179,278.41832 C 88.136549,272.52217 84.826659,265.25415 84.826667,256.61097 C 84.826657,248.50385 87.221095,241.82567 91.978192,236.59953 C 96.735261,231.37349 105.51008,227.50436 118.30735,224.95826 C 133.65058,221.87626 143.57595,219.71979 148.13209,218.4802 C 152.6881,217.24074 157.53539,215.61572 162.62756,213.60561 C 162.62748,208.58061 161.59376,205.06483 159.51681,203.05471 C 157.43967,201.04476 153.77502,200.04025 148.549,200.04016 C 141.84883,200.04024 136.82629,201.10317 133.47627,203.24713 C 130.86318,204.92224 128.73448,208.08465 127.12649,212.70767 L 88.033629,208.57068 C 89.507642,201.73664 91.634918,196.35934 94.415483,192.43967 C 97.196016,188.5202 101.21547,185.12267 106.44159,182.24153 C 110.19362,180.1646 115.33299,178.5702 121.89915,177.43109 C 128.46522,176.29217 135.58725,175.69943 143.22544,175.69932 z M 424.18737,175.69932 C 441.6076,175.69943 454.87206,178.83264 464.01784,185.06365 C 473.16339,191.29486 479.60649,200.39383 483.29168,212.38697 L 444.77607,217.51811 C 443.56996,212.96209 441.38426,209.53538 438.2018,207.22376 C 435.01915,204.91231 430.73397,203.76033 425.37395,203.76024 C 418.60677,203.76032 413.14181,206.18253 408.9543,211.04004 C 404.76667,215.8977 402.66861,223.25482 402.66866,233.10394 C 402.6686,241.88114 404.73603,248.52728 408.89017,253.08331 C 413.04419,257.63943 418.36451,259.94624 424.7967,259.94621 C 430.1567,259.94624 434.64636,258.55631 438.298,255.80923 C 441.94948,253.0622 444.69871,248.83688 446.50782,243.14174 L 485.37621,247.56734 C 483.23204,255.67452 479.71627,262.70749 474.8253,268.63708 C 469.9341,274.56667 463.70117,279.17598 456.09664,282.45909 C 448.49191,285.74209 438.83084,287.36574 427.10571,287.36574 C 415.78245,287.36574 406.35789,286.30139 398.8203,284.19084 C 391.28263,282.08031 384.78112,278.68426 379.35405,273.96064 C 373.92691,269.23708 369.67237,263.68164 366.59033,257.31651 C 363.50826,250.95142 361.9723,242.50074 361.97232,231.9815 C 361.97232,220.99336 363.83241,211.86519 367.58449,204.56198 C 370.33151,199.20198 374.08382,194.38532 378.84093,190.13066 C 383.598,185.87615 388.50369,182.71519 393.52881,180.63805 C 401.50191,177.35509 411.72509,175.69943 424.18737,175.69932 z M 162.62756,234.19431 C 156.99938,236.20439 151.11837,237.97688 145.02134,239.51786 C 136.71313,241.72896 131.45408,243.91607 129.24309,246.06007 C 126.96498,248.27115 125.84366,250.78241 125.84371,253.59643 C 125.84367,256.81252 126.96642,259.44205 129.21102,261.48555 C 131.4555,263.52911 134.73332,264.56426 139.08846,264.56424 C 143.64448,264.56426 147.90045,263.44006 151.8201,261.229 C 155.73958,259.01799 158.51659,256.33004 160.1582,253.14746 C 161.79965,249.96493 162.62748,245.82865 162.62756,240.73651 L 162.62756,234.19431 z M 240.42845,255.13577 L 281.73413,255.13577 L 281.73413,306.1906 C 285.82115,301.90263 290.45969,298.68179 295.65234,296.53765 C 300.84488,294.3937 306.57553,293.3308 312.87373,293.33068 C 325.87187,293.3308 336.62649,297.99854 345.13576,307.34511 C 353.64479,316.69185 357.89934,330.10523 357.89947,347.59248 C 357.89934,359.25073 355.94874,369.53376 352.0628,378.41138 C 348.1766,387.28906 342.79929,393.90588 335.93178,398.29455 C 329.06404,402.68312 321.4412,404.90089 313.06614,404.90089 C 305.89693,404.90089 299.33843,403.33287 293.3754,400.2508 C 288.88626,397.83885 284.01261,393.31853 278.71958,386.68535 L 278.71958,402.4636 L 240.42845,402.4636 L 240.42845,255.13577 z M 300.30244,323.89303 C 294.74129,323.8931 290.22243,325.92991 286.70491,330.0504 C 283.18732,334.17104 281.41338,340.43603 281.41343,348.81113 C 281.41338,357.99034 283.15809,364.6379 286.60871,368.75843 C 290.05922,372.87903 294.39995,374.9479 299.69311,374.94787 C 304.58412,374.9479 308.6912,372.90824 312.00784,368.85464 C 315.32432,364.8011 317.01062,357.97544 317.01071,348.39422 C 317.01063,339.95211 315.38559,333.77905 312.13612,329.82592 C 308.88648,325.87292 304.92545,323.89311 300.30244,323.89303 z" id="rect3530" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+ <rect y="149.82" x="73.26" height="273.99" width="437.75" id="rect3544" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.525"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/education/school_secondary.svg b/vtm-themes/icons/symbols/education/school_secondary.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/education/school_secondary.svg
rename to vtm-themes/icons/symbols/education/school_secondary.svg
diff --git a/vtm-themes/icons/symbols/education/university.svg b/vtm-themes/icons/symbols/education/university.svg
new file mode 100755
index 00000000..977404e3
--- /dev/null
+++ b/vtm-themes/icons/symbols/education/university.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3634" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3631" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2611">
+   <path id="path1325" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2608">
+   <path id="path1322" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 272.88678,135.49087 L 24.554768,260.20708 L 334.04076,264.35727 L 559.5004,146.80474 L 272.88678,135.49087 z" id="path2662" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 127.2667,365.3754 L 154.09984,286.09352 L 341.09332,291.42596 L 465.59678,223.64726 L 515.40623,281.48345 C 515.40623,281.48345 452.5225,288.41485 425.1209,305.43773 C 397.7193,322.4606 362.17606,363.44383 362.17606,363.44383 C 362.17606,363.44383 284.79228,336.638 249.00949,336.03614 C 180.69074,334.88703 131.50867,364.45854 127.2667,365.3754 z" id="path2664" sodipodi:nodetypes="cccccscsc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 134.25,280.09375 L 104.21875,280.53125 C 100.02835,287.5158 97.009988,296.28576 93.78125,306.71875 C 89.128683,321.75255 85.191392,339.76671 82.875,357.71875 C 74.146268,425.36641 74.125,456.65625 74.125,456.65625 L 94.125,456.65625 C 94.125,456.65625 94.08782,427.17095 102.71875,360.28125 C 104.88395,343.50095 108.62408,326.36097 112.875,312.625 C 117.12592,298.88903 123.05253,288.10333 124.5625,286.625 C 128.09983,283.16179 131.17852,281.42336 133.1875,280.53125 C 133.63538,280.33236 133.96818,280.20769 134.25,280.09375 z" id="path2666" fill="#ffffff" fill-rule="evenodd" stroke-width="20"/>
+ <path d="M 106.46373,433.24868 C 106.46373,446.35545 91.82635,480.99284 78.719573,480.99284 C 65.612797,480.99284 58.975414,446.35545 58.975414,433.24868 C 58.975414,420.1419 69.612797,409.50452 82.719573,409.50452 C 95.82635,409.50452 106.46373,420.1419 106.46373,433.24868 z" id="path3462" sodipodi:nodetypes="csssc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="15.475"/>
+ <path id="path3466" d="M 81.949709,438.15162 L 69.214311,492.79019 L 81.949709,438.15162 z" sodipodi:nodetypes="ccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 106.41283,437.87281 L 88.618917,496.4658 L 106.41283,437.87281 z" id="path3468" sodipodi:nodetypes="ccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path sodipodi:nodetypes="ccc" id="path3471" d="M 56.079496,432.50244 L 51.793515,485.72506 L 56.079496,432.50244 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path sodipodi:nodetypes="ccc" id="path3482" d="M 65.682673,436.61091 L 61.396692,489.83353 L 65.682673,436.61091 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path sodipodi:nodetypes="ccc" d="M 91.949709,440.15162 L 79.214311,494.79019 L 91.949709,440.15162 z" id="path3484" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/example/blank.svg b/vtm-themes/icons/symbols/example/blank.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/example/blank.svg
rename to vtm-themes/icons/symbols/example/blank.svg
diff --git a/vtm-themes/resources/assets/symbols/example/font.svg b/vtm-themes/icons/symbols/example/font.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/example/font.svg
rename to vtm-themes/icons/symbols/example/font.svg
diff --git a/vtm-themes/icons/symbols/food/bar.svg b/vtm-themes/icons/symbols/food/bar.svg
new file mode 100755
index 00000000..17b1e051
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/bar.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" id="path1329" inkscape:connector-curvature="0" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 468.232,97.93 -0.251,0 c 0.287,-0.248 0.445,-0.498 0.445,-0.75 0,-5.937 -81.067,-10.75 -181.07,-10.75 -100.002,0 -181.07,4.813 -181.07,10.75 0,0.252 0.158,0.502 0.446,0.75 l -0.446,0 160.474,148.535 0,168.073 -103.962,74.32 0.255,0 c -0.5,0.27 -0.765,0.544 -0.765,0.821 0,4.102 55.996,7.425 125.07,7.425 69.075,0 125.07,-3.323 125.07,-7.425 0,-0.277 -0.266,-0.552 -0.765,-0.821 l 0.06,0 -103.962,-74.32 0,-168.072 L 468.232,97.93 z m -175.71,119.639 c -2.895,2.679 -7.631,2.679 -10.526,0 l -77.535,-71.768 c -2.895,-2.679 -2.036,-4.872 1.909,-4.872 l 161.779,0 c 3.944,0 4.804,2.192 1.909,4.872 l -77.536,71.768 z" id="path2209" inkscape:connector-curvature="0" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/food/biergarten.svg b/vtm-themes/icons/symbols/food/biergarten.svg
new file mode 100755
index 00000000..2c343bbe
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/biergarten.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 116.54107,83.44698 119.71194,-21.335331 132.2871,13.796881 8.04386,363.39512 18.58841,29.06501 c 0,0 -60.31626,57.03706 -152.88947,58.17487 C 149.7097,527.68134 96.478545,469.75328 96.478545,469.75328 L 119.96006,433.80197 116.54107,83.44698 z" id="path2381" sodipodi:nodetypes="ccccczccc" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 236.0545,60.223867 c -40.46871,0.891164 -80.28965,3.700653 -119.25773,17.024737 l 4.51683,354.207986 -0.31085,0.003 c -14.38283,9.26374 -22.611953,25.14847 -22.502276,36.74159 0.308947,32.65614 67.030646,58.51127 148.992656,57.73585 81.96211,-0.77541 148.1049,-27.88751 147.79595,-60.54364 -0.0969,-10.24616 -6.75576,-24.79773 -18.34426,-33.0909 l -2.89526,-2.07107 2.15553,-355.436922 C 328.6489,61.788933 281.91903,59.213884 236.0545,60.223867 z" id="path3839" sodipodi:nodetypes="ccccssscccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
+ <path d="m 380.69607,125.54711 93.65276,-3.97915 c 15.19172,2.89537 23.02298,11.79419 23.60885,26.60258 l -23.30581,194.30227 c -0.64884,14.16236 -9.75565,20.02526 -22.23803,22.57588 l -69.37862,7.74857" id="path3841" sodipodi:nodetypes="cccccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.869"/>
+ <path d="m 120.54369,427.06113 c 28.30307,37.63947 80.60541,47.8991 127.81719,46.37248 45.92112,-1.48489 100.95684,-11.12188 126.58999,-44.12023" id="path3931" sodipodi:nodetypes="csc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.06"/>
+ <path sodipodi:nodetypes="csc" id="path3933" d="m 116.33786,427.88444 c 28.30307,37.63946 84.81124,47.8991 132.02302,46.37248 45.92112,-1.48489 102.95684,-13.12188 128.58999,-46.12023" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30"/>
+ <path sodipodi:nodetypes="cccccc" id="path3935" d="m 380.69607,134.37041 87.03527,-3.97914 c 15.19172,2.89537 23.02298,11.79419 23.60886,26.60258 L 470.24022,335.6495 c -0.64884,14.16236 -9.75566,20.02526 -22.23804,22.57588 l -64.96696,7.9544" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30"/>
+ <path d="m 245.74265,64.718609 c -85.4416,0 -132.63699,21.786771 -132.63699,26.859331 0,0.21533 0.10677,0.41537 0.35283,0.62725 l -0.35283,0 -5.55379,108.31282 18.58344,0 -2.7062,-76.48516 c 81.23408,56.30948 134.6429,-7.65863 241.05961,-2.15618 l 0.067,78.64134 19.18158,0 -7.72041,-114.9303 -0.23522,0 c 0.24521,-0.21188 0.39203,-0.41193 0.39203,-0.62725 0,-5.07256 -44.98869,-20.241851 -130.43116,-20.241851 l 6e-5,0 z" id="path2209" sodipodi:nodetypes="csccccccccccscc" opacity=".75" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/food/cafe.svg b/vtm-themes/icons/symbols/food/cafe.svg
new file mode 100755
index 00000000..97956b35
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/cafe.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 85.437235,125.05685 C 85.437236,125.05685 41.418849,463.35286 234.35797,462.61634 C 239.06615,462.87529 243.54307,462.94955 247.80099,462.87822 C 252.05891,462.94955 256.53583,462.87529 261.24401,462.61634 C 454.18314,463.35286 410.16476,125.05685 410.16475,125.05685 L 247.80099,125.72609 L 85.437235,125.05685 z" id="path3407" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="18.622"/>
+ <path d="M 387.14691,197.01015 C 387.14691,197.01015 432.10304,162.99107 467.64668,162.99107 C 503.19055,162.99107 519.49033,218.37096 518.73421,255.55454 C 517.97787,292.73815 490.75292,383.71961 358.40927,385.30186 C 226.06585,386.88412 387.90303,197.01015 387.14691,197.01015 z" id="path3409" sodipodi:nodetypes="csssc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="45.627"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/food/drinkingtap.svg b/vtm-themes/icons/symbols/food/drinkingtap.svg
new file mode 100755
index 00000000..57fe6a7d
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/drinkingtap.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g3353" transform="translate(20,12)">
+  <path sodipodi:nodetypes="csscc" id="path3340" d="M 391.67731,24.490931 C 380.01379,28.852545 364.03205,35.340717 358.04297,35.340717 C 352.05389,35.340717 347.19318,30.480013 347.19318,24.490931 C 347.19318,18.501848 352.05389,13.641144 358.04297,13.641144 C 363.75134,13.860335 380.34891,20.605806 391.67731,24.490931 z" transform="translate(15.189701,15.189701)" opacity=".985" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="15"/>
+  <path d="M 396.38288,39.680632 C 408.0464,44.042246 424.02814,50.530418 430.01722,50.530418 C 436.0063,50.530418 440.86701,45.669714 440.86701,39.680632 C 440.86701,33.691549 436.0063,28.830845 430.01722,28.830845 C 424.30885,29.050036 407.71128,35.795507 396.38288,39.680632 z" id="path3345" sodipodi:nodetypes="csscc" opacity=".985" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="15"/>
+  <path id="path3347" d="M 401.4421,39.138141 L 401.4421,105.32184 L 402.25584,131.09008" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="30"/>
+  <path d="M 424.22666,125.39394 A 22.784552,45.569103 0 1 1 378.65756,125.39394 A 22.784552,45.569103 0 1 1 424.22666,125.39394 z" sodipodi:ry="45.569103" sodipodi:rx="22.784552" sodipodi:cy="125.39394" sodipodi:cx="401.44211" id="path3349" sodipodi:type="arc" opacity=".985" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30"/>
+  <path sodipodi:nodetypes="cccc" id="path3351" d="M 522.95971,130.81884 L 345.02276,129.81355 L 330.91849,129.73386 C 261.47986,128.64888 265.81977,193.7476 265.81977,193.7476" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="50"/>
+ </g>
+ <path d="M 401.20335,264.66519 L 401.04559,264.66519 C 401.22597,264.50932 401.32527,264.3522 401.32527,264.19382 C 401.32527,260.46245 350.37519,257.43751 287.52395,257.43751 C 224.67334,257.43751 173.72263,260.46245 173.72263,264.19382 C 173.72263,264.3522 173.82193,264.50932 174.00293,264.66519 L 173.72263,264.66519 L 209.24005,535.50065 L 209.40032,535.50065 C 209.08607,535.67034 208.91952,535.84255 208.91952,536.01664 C 208.91952,538.59472 244.11264,540.68321 287.52521,540.68321 C 330.9384,540.68321 366.13089,538.59472 366.13089,536.01664 C 366.13089,535.84255 365.96371,535.66971 365.6501,535.50065 L 401.20335,264.66519 z M 342.84592,515.69968 C 341.02644,517.38341 233.11052,516.59439 231.29103,514.91066 L 197.55212,281.06395 C 255.13772,281.25585 296.60788,284.11814 374.88771,279.48591 L 342.84592,515.69968 z" id="path2209" sodipodi:nodetypes="ccsssccccsssccccccc" fill="#ffffff"/>
+ <path d="M 188.1914,276.64338 L 383.07881,278.22142 L 351.5181,527.7707 L 218.17408,529.34874 L 188.1914,276.64338 z" id="path2381" sodipodi:nodetypes="ccccc" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/food/fastfood.svg b/vtm-themes/icons/symbols/food/fastfood.svg
new file mode 100755
index 00000000..5fc1c3bd
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/fastfood.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path transform="matrix(14.685839,0,0,14.685839,577.76584,1150.0639)" d="M -4.9023438,-73.108887 L -7.0227051,-65.628418 L -17.822266,-65.628418 L -15.222168,-44.98877 L -6.3830566,-44.98877 L -3.7426758,-65.628418 L -5.7421875,-65.628418 L -3.6621094,-72.748779 L -4.9023438,-73.108887 z M -19.102783,-53.588623 C -18.889587,-55.455476 -20.302753,-56.468658 -23.342285,-56.628174 L -30.662842,-56.628174 C -33.702398,-56.468658 -35.128992,-55.455476 -34.942627,-53.588623 L -19.102783,-53.588623 z M -34.942627,-47.988037 C -35.128992,-46.121989 -33.702398,-45.122234 -30.662842,-44.98877 L -23.342285,-44.98877 C -20.302753,-45.122234 -18.889587,-46.121989 -19.102783,-47.988037 L -34.942627,-47.988037 z M -19.782715,-52.148193 L -34.302979,-52.148193 C -34.675704,-52.148187 -34.995528,-52.014927 -35.262451,-51.748413 C -35.529382,-51.481888 -35.662845,-51.175288 -35.662842,-50.828613 C -35.662845,-50.428218 -35.529382,-50.101477 -35.262451,-49.848389 C -34.995528,-49.595293 -34.675704,-49.468747 -34.302979,-49.46875 L -19.782715,-49.46875 C -19.409199,-49.468747 -19.089172,-49.595293 -18.822632,-49.848389 C -18.556132,-50.101477 -18.422872,-50.428218 -18.422852,-50.828613 C -18.422872,-51.175288 -18.556132,-51.481888 -18.822632,-51.748413 C -19.089172,-52.014927 -19.409199,-52.148187 -19.782715,-52.148193 L -19.782715,-52.148193 z" id="flowRoot3192" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/food/fastfood2.svg b/vtm-themes/icons/symbols/food/fastfood2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/food/fastfood2.svg
rename to vtm-themes/icons/symbols/food/fastfood2.svg
diff --git a/vtm-themes/resources/assets/symbols/food/fastfood_pizza.svg b/vtm-themes/icons/symbols/food/fastfood_pizza.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/food/fastfood_pizza.svg
rename to vtm-themes/icons/symbols/food/fastfood_pizza.svg
diff --git a/vtm-themes/resources/assets/symbols/food/ice_cream.svg b/vtm-themes/icons/symbols/food/ice_cream.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/food/ice_cream.svg
rename to vtm-themes/icons/symbols/food/ice_cream.svg
diff --git a/vtm-themes/resources/assets/symbols/food/pizza.svg b/vtm-themes/icons/symbols/food/pizza.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/food/pizza.svg
rename to vtm-themes/icons/symbols/food/pizza.svg
diff --git a/vtm-themes/icons/symbols/food/pub.svg b/vtm-themes/icons/symbols/food/pub.svg
new file mode 100755
index 00000000..982d02b9
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/pub.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 468.232,77.93 L 467.981,77.93 C 468.268,77.682 468.426,77.432 468.426,77.18 C 468.426,71.243 387.359,66.43 287.356,66.43 C 187.354,66.43 106.286,71.243 106.286,77.18 C 106.286,77.432 106.444,77.682 106.732,77.93 L 106.286,77.93 L 162.798,508.858 L 163.053,508.858 C 162.553,509.128 162.288,509.402 162.288,509.679 C 162.288,513.781 218.284,517.104 287.358,517.104 C 356.433,517.104 412.428,513.781 412.428,509.679 C 412.428,509.402 412.162,509.127 411.663,508.858 L 468.232,77.93 z M 375.37914,477.35255 C 372.48414,480.03155 200.77845,478.77614 197.88345,476.09714 L 144.20126,135.84429 C 239.2787,201.74966 301.8095,126.89331 426.36103,133.33347 L 375.37914,477.35255 z" id="path2209" sodipodi:nodetypes="ccsssccccsssccccccc" fill="#ffffff"/>
+ <path d="M 129.30736,119.26407 L 439.39394,121.77489 L 389.17749,493.37662 L 177.01299,495.88745 L 129.30736,119.26407 z" id="path2381" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/food/restaurant.svg b/vtm-themes/icons/symbols/food/restaurant.svg
new file mode 100755
index 00000000..be06a73f
--- /dev/null
+++ b/vtm-themes/icons/symbols/food/restaurant.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" id="path1329" inkscape:connector-curvature="0" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 203.725,338.602 c 37.643,-17.466 64.864,-67.996 64.864,-127.642 0,-74.115 -61.834,-155.247 -93.849,-155.247 -32.014,0 -93.85,81.132 -93.85,155.247 0,59.646 27.223,110.176 64.865,127.642 l -7.792,176.545 73.553,0 -7.791,-176.545 z" id="path2110" inkscape:connector-curvature="0" fill="#ffffff"/>
+ <path d="m 430.231,368.602 c 37.642,-17.466 51.389,-39.928 51.389,-99.574 L 471.839,66.214 c 0,-3.875 -3.142,-7.017 -7.018,-7.017 l -4.607,0 c -3.873,0 -7.016,3.141 -7.016,7.017 l 3.26,202.814 -20.259,0 -5.132,-204.789 c 0,-3.875 -3.142,-7.017 -7.018,-7.017 l -5.995,0 c -3.874,0 -7.016,3.142 -7.016,7.017 l 2.775,204.789 -25.137,0 2.775,-204.789 c 0,-3.875 -3.142,-7.017 -7.017,-7.017 l -5.996,0 c -3.875,0 -7.016,3.142 -7.016,7.017 l -5.132,204.789 -19.835,0 3.26,-202.789 c 0,-3.875 -3.142,-7.017 -7.017,-7.017 l -4.606,0 c -3.875,0 -7.018,3.142 -7.018,7.017 L 320.9,269.028 c 0,59.646 13.715,82.108 51.356,99.574 l -7.791,146.545 73.554,0 -7.788,-146.545 z" id="path2112" inkscape:connector-curvature="0" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/health/dentist.svg b/vtm-themes/icons/symbols/health/dentist.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/dentist.svg
rename to vtm-themes/icons/symbols/health/dentist.svg
diff --git a/vtm-themes/resources/assets/symbols/health/doctors.svg b/vtm-themes/icons/symbols/health/doctors.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/doctors.svg
rename to vtm-themes/icons/symbols/health/doctors.svg
diff --git a/vtm-themes/icons/symbols/health/doctors2.svg b/vtm-themes/icons/symbols/health/doctors2.svg
new file mode 100755
index 00000000..052cfc82
--- /dev/null
+++ b/vtm-themes/icons/symbols/health/doctors2.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#DA0092" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m -732.625,360.28125 c -3.15679,0.0498 -5.96241,1.58503 -8.34375,5.375 9.92802,97.45851 14.02511,234.3311 15.75,387.15625 l -6.1875,-7.65625 c -11.5498,-7.26223 -44.05826,-6.14705 -34.875,15.8125 7.60119,18.17637 28.79619,73.09169 42.03125,132 0.34476,88.63854 0.29544,180.00725 0.40625,270.21875 -1.90669,-1.6483 -17.84053,-2.2788 -14.15625,6.5313 2.59156,6.1971 9.03813,22.8648 14.25,42.1874 0.1447,67.2248 0.41897,133.4029 1.125,196.8438 0,0 65.77787,-30.8072 49,-46.9375 -4.47247,-4.2999 -3.29845,-145.101 0.71875,-318.1563 6.82883,-36.2012 20.67953,-72.14009 25.3125,-83.2187 5.03871,-12.04886 -17.26786,-10.9609 -19.125,-8.65625 l -4,4.96875 c 1.5252,-56.6314 3.28085,-114.67006 5.1875,-171.125 5.78164,-16.19006 10.80185,-28.82523 13.75,-35.875 4.45304,-10.64837 -2.81737,-15.65681 -11.875,-17.53125 6.61255,-182.73455 14.55117,-335.76846 20.65625,-342.0625 4.51271,-20.09519 -22.64946,-9.48434 -43.9375,-8.28125 -15.80912,0.89345 -33.30318,-21.78931 -45.6875,-21.59375 z" id="path2885" sodipodi:nodetypes="ccccsccsccscscccsccsc" opacity=".716" fill="#6800ff" stroke="#000000"/>
+ <path id="path3807" d="m -704.25,435.0625 c -54.95052,-0.0687 -99.68039,31.03352 -101.03125,101.0625 1.23723,94.2574 170.3066,118.99012 171.46875,213.3125 1.16215,94.32239 -162.20132,152.83791 -163.3125,245.96875 -1.11118,93.13085 159.41746,117.11685 161.28125,175.53125 1.86379,58.4144 -114.78196,113.0786 -187.8125,153.0937 7.74238,14.0876 225.7718,-67.3607 230.65625,-150.0312 4.88444,-82.6705 -149.36999,-121.1772 -152.0625,-183.71875 -2.69251,-62.54155 165.66636,-126.66989 164.3125,-253.09375 -1.35386,-126.42386 -157.39343,-135.66566 -163.28125,-202.09375 -2.29607,-17.64831 8.6114,-34.12367 25.5,-33.6875 16.8886,0.43617 20.94605,11.58271 37.59375,27.34375 8.70077,8.23736 23.84742,12.64826 32.84375,15.03125 8.99633,2.38299 12.97123,1.23561 20.15625,-0.875 4.79208,-1.40768 -5.3163,-18.96908 -1.34375,-22.09375 3.39472,-2.67017 21.03982,9.33449 23,5.34375 2.24636,-4.57338 3.17435,-10.0965 2.0625,-16.59375 2.71835,-29.24031 -45.08073,-74.4313 -100.03125,-74.5 z m 49.78125,31.15625 c 6.81017,0.10238 12.48229,6.54591 11.28125,13.4375 -0.80708,9.21346 -13.70166,13.40323 -19.8125,6.53125 -7.07698,-6.40673 -2.34923,-19.46521 7.15625,-19.90625 0.46243,-0.0513 0.92099,-0.0693 1.375,-0.0625 z" opacity=".644" fill="#6800ff" stroke="#000000" stroke-width="10.2"/>
+ <g id="g3968" transform="matrix(0.78859506,0,0,0.69871963,-395.86191,-81.602608)">
+  <path d="m 851.53939,136.02034 c -7.2794,0.7683 -10.241,9.42997 -7.8438,15.5625 0.649,8.42856 1.2521,16.86793 1.8125,25.3125 9.2386,-1.66742 18.5775,-2.62175 27.875,-2.8125 13.1446,-0.32648 26.5743,0.0939 39.8437,1.6875 0.0939,-1.14643 0.1855,-2.29126 0.2813,-3.4375 0.5744,-6.60122 5.5164,-15.90252 -1.5,-20.8125 -10.9233,-6.91295 -24.0583,4.54804 -35.1875,-0.78125 -8.6126,-4.53785 -14.6296,-14.84694 -25.2812,-14.71875 z m 14.1874,136.40625 c -5.2173,0.13046 -10.4053,0.91388 -15.4062,2.34375 0.4434,13.11965 0.8052,26.23059 1.125,39.34375 7.0777,4.1154 14.6739,7.5153 22.0312,10.7187 10.2474,4.3589 20.7672,8.3836 31.3126,12.4063 0.5106,-14.8585 1.0526,-29.7091 1.6562,-44.5625 -6.4412,-6.79634 -12.9773,-13.46027 -21.4062,-17.75 -6.1838,-1.82287 -12.7567,-2.66393 -19.3126,-2.5 z m -23.9374,151.8438 c -6.7184,0.1614 -13.3014,3.0662 -15.75,9.5312 -2.4296,10.4945 5.1443,19.8377 7.0312,29.8125 4.1554,13.2777 8.2467,26.6333 11.8438,40.0937 18.4977,-6.6035 37.3536,-12.3287 55.2187,-20.3124 0.3032,-7.5589 0.6303,-15.1084 1.0625,-22.6563 1.2729,-5.5242 3.5894,-10.9183 5.5938,-16.375 -3.8385,-1.5928 -7.7213,-3.0528 -11.4376,-4.5625 -13.843,-5.1668 -28.0928,-9.885 -42.2187,-14.9375 0.006,0.6348 0.0257,1.2715 0.0313,1.9063 -3.264,-1.7119 -7.3441,-2.5969 -11.375,-2.5 z m 55.75,155.8124 c -14.6061,5.5037 -29.2011,10.9927 -43.3438,17.5626 0.022,9.1885 0.0424,18.3734 0.0625,27.5624 14.0792,7.6653 28.9132,13.9054 43.875,19.9063 3.8011,-18.0074 9.7386,-35.5459 14.75,-53.1875 -0.049,-7.4384 -9.2099,-10.5162 -15.4375,-8.9062 0.0308,-0.9793 0.0642,-1.9582 0.0938,-2.9376 z m -43.3126,144.25 c -0.0237,6.2325 -0.0571,12.4574 -0.0937,18.6876 -6.1947,-0.2789 -11.9955,6.3962 -8.5,12.2812 4.8981,14.0989 9.8051,28.5053 9.0313,43.5312 13.2997,-4.5583 26.462,-9.4574 39.125,-15.5 0.2202,-14.4943 0.4872,-28.9768 0.6562,-43.4687 -6.8026,-2.8947 -13.7839,-5.4643 -20.6875,-8 -6.446,-2.5374 -12.978,-5.0297 -19.5313,-7.5313 z m 39.5,138.5938 c -12.8216,4.1797 -25.8438,7.7842 -39,10.8438 0.1288,20.3445 0.2848,40.6871 0.4688,61.0312 15.1416,-9.3449 33.1646,-17.3789 41.4375,-34.125 2.1524,-6.1532 -3.4687,-11.4544 -2.25,-17.6875 -0.2808,-6.6903 -0.5014,-13.3704 -0.6563,-20.0625 z" id="path3964" fill="#ffffff" stroke="#ffffff" stroke-width=".705"/>
+  <path d="M 298.21875 53.875 C 245.30728 53.825688 195.0259 81.279455 194.09375 124.09375 C 197.484 209.92112 349.0874 200.55153 352 237.8125 C 355.81972 286.67837 199.51039 272.06577 202.09375 349.96875 C 204.05033 409.97989 349.58609 415.57646 349.6875 447.09375 C 349.80051 483.62386 244.99782 493.94691 187.40625 521.90625 C 193.51187 531.74953 392.39879 508.87487 393.03125 445.40625 C 393.60779 387.54437 245.65566 380.03901 245.9375 344.5625 C 246.2057 310.80072 400.59885 308.16089 399.53125 236.625 C 398.46365 165.08911 247.01809 169.78959 242.375 123.375 C 242.17407 99.633569 276.20249 92.405189 301.59375 95.5625 C 314.78718 97.203052 326.18421 110.0812 339.3125 121.09375 C 346.17383 126.84936 358.12431 129.92874 365.21875 131.59375 C 372.31319 133.2588 375.42762 132.44354 381.09375 130.96875 C 384.8727 129.98521 376.89856 117.71452 380.03125 115.53125 C 382.70829 113.66555 396.6417 122.06966 398.1875 119.28125 C 399.959 116.08574 400.68934 112.22726 399.8125 107.6875 C 401.95622 87.256721 364.23994 55.673002 320.90625 55.625 C 313.37674 54.460151 305.77753 53.882045 298.21875 53.875 z M 359.40625 71.9375 C 368.17508 71.9375 375.28125 79.043675 375.28125 87.8125 C 375.28125 96.581325 368.17508 103.6875 359.40625 103.6875 C 350.63743 103.6875 343.53125 96.581325 343.53125 87.8125 C 343.53125 79.043675 350.63743 71.9375 359.40625 71.9375 z " transform="matrix(1.2680779,0,0,1.4311892,501.98376,116.78877)" id="path3966" fill="#ffffff" stroke="#ffffff" stroke-width="7.571"/>
+ </g>
+</svg>
diff --git a/vtm-themes/icons/symbols/health/hospital.svg b/vtm-themes/icons/symbols/health/hospital.svg
new file mode 100755
index 00000000..1de1a23a
--- /dev/null
+++ b/vtm-themes/icons/symbols/health/hospital.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#DA0092" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path sodipodi:type="arc" id="path2207" sodipodi:cx="217.14285" sodipodi:cy="305.71429" sodipodi:rx="288.57144" sodipodi:ry="288.57144" d="m 505.71429,305.71429 a 288.57144,288.57144 0 1 1 -577.142879,0 288.57144,288.57144 0 1 1 577.142879,0 z" transform="matrix(0.86047263,0,0,0.86047263,100.67386,22.912007)" fill="none" stroke="#ffffff" stroke-width="25.14"/>
+ <rect transform="scale(-1,-1)" id="rect3180" width="362.27" height="81.84" x="-468.66" y="-326.89" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="20"/>
+ <rect y="246.6" x="-467.11" height="81.84" width="362.27" id="rect3182" transform="matrix(0,-1,1,0,0,0)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="20"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/health/hospital_emergency.svg b/vtm-themes/icons/symbols/health/hospital_emergency.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/hospital_emergency.svg
rename to vtm-themes/icons/symbols/health/hospital_emergency.svg
diff --git a/vtm-themes/resources/assets/symbols/health/hospital_emergency2.svg b/vtm-themes/icons/symbols/health/hospital_emergency2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/hospital_emergency2.svg
rename to vtm-themes/icons/symbols/health/hospital_emergency2.svg
diff --git a/vtm-themes/resources/assets/symbols/health/opticians.svg b/vtm-themes/icons/symbols/health/opticians.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/opticians.svg
rename to vtm-themes/icons/symbols/health/opticians.svg
diff --git a/vtm-themes/icons/symbols/health/pharmacy.svg b/vtm-themes/icons/symbols/health/pharmacy.svg
new file mode 100755
index 00000000..b7166661
--- /dev/null
+++ b/vtm-themes/icons/symbols/health/pharmacy.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#DA0092" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect2160" width="285.71" height="122.86" x="154.19" y="223.46" fill="#ffffff" stroke-width="10"/>
+ <rect id="rect3184" width="371.96" height="371.96" x="111.07" y="98.91" fill="none" stroke="#ffffff" stroke-width="21.17"/>
+ <rect y="-358.48" x="142.03" height="122.86" width="285.71" id="rect3186" transform="matrix(0,1,-1,0,0,0)" fill="#ffffff" stroke-width="10"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/health/pharmacy_dispencing.svg b/vtm-themes/icons/symbols/health/pharmacy_dispencing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/pharmacy_dispencing.svg
rename to vtm-themes/icons/symbols/health/pharmacy_dispencing.svg
diff --git a/vtm-themes/resources/assets/symbols/health/veterinary.svg b/vtm-themes/icons/symbols/health/veterinary.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/health/veterinary.svg
rename to vtm-themes/icons/symbols/health/veterinary.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/coniferous.svg b/vtm-themes/icons/symbols/landuse/coniferous.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/coniferous.svg
rename to vtm-themes/icons/symbols/landuse/coniferous.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/coniferous_and_deciduous.svg b/vtm-themes/icons/symbols/landuse/coniferous_and_deciduous.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/coniferous_and_deciduous.svg
rename to vtm-themes/icons/symbols/landuse/coniferous_and_deciduous.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/deciduous.svg b/vtm-themes/icons/symbols/landuse/deciduous.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/deciduous.svg
rename to vtm-themes/icons/symbols/landuse/deciduous.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/grass.svg b/vtm-themes/icons/symbols/landuse/grass.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/grass.svg
rename to vtm-themes/icons/symbols/landuse/grass.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/hills.svg b/vtm-themes/icons/symbols/landuse/hills.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/hills.svg
rename to vtm-themes/icons/symbols/landuse/hills.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/quary.svg b/vtm-themes/icons/symbols/landuse/quary.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/quary.svg
rename to vtm-themes/icons/symbols/landuse/quary.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/scrub.svg b/vtm-themes/icons/symbols/landuse/scrub.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/scrub.svg
rename to vtm-themes/icons/symbols/landuse/scrub.svg
diff --git a/vtm-themes/resources/assets/symbols/landuse/swamp.svg b/vtm-themes/icons/symbols/landuse/swamp.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/landuse/swamp.svg
rename to vtm-themes/icons/symbols/landuse/swamp.svg
diff --git a/vtm-themes/resources/assets/symbols/money/atm.svg b/vtm-themes/icons/symbols/money/atm.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/money/atm.svg
rename to vtm-themes/icons/symbols/money/atm.svg
diff --git a/vtm-themes/icons/symbols/money/atm2.svg b/vtm-themes/icons/symbols/money/atm2.svg
new file mode 100755
index 00000000..dbe6d36c
--- /dev/null
+++ b/vtm-themes/icons/symbols/money/atm2.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 159.27583,112.17164 C 157.44425,122.79359 59.489534,541.93811 59.489534,541.93811 L 520.92471,538.03892 L 420.90596,110.43556 L 159.27583,112.17164 z" id="path3243" sodipodi:nodetypes="ccccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="22.853"/>
+ <path sodipodi:nodetypes="ccccc" id="path3163" d="M 159.27583,112.17164 C 157.44425,122.79359 59.489534,541.93811 59.489534,541.93811 L 520.92471,538.03892 L 420.90596,110.43556 L 159.27583,112.17164 z" opacity=".1" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.853"/>
+ <g id="g5004" transform="matrix(1.2993468,0,0,1.1426251,-301.5384,133.33861)">
+  <path id="text2413" d="M 428.26872,167.17928 C 428.479,167.2846 429.26793,167.49498 430.63551,167.81042 C 452.19943,172.01817 468.39875,179.69707 479.23351,190.84714 C 490.06797,201.99743 495.48528,216.61889 495.48544,234.71157 C 495.48528,253.22514 489.54202,269.26668 477.65565,282.83622 C 465.76899,296.40579 449.3067,303.76912 428.26872,304.92622 L 428.26872,333.64322 L 411.38565,333.64322 L 411.38565,305.24179 C 389.92673,302.82241 373.46443,295.85354 361.99871,284.33518 C 350.53293,272.81685 344.06372,256.69643 342.59107,235.97386 L 370.9925,230.92471 C 373.20146,246.49296 377.67205,258.48466 384.40429,266.89986 C 391.13642,275.31512 400.1302,280.10129 411.38565,281.25836 L 411.38565,190.84714 C 390.03192,186.21887 374.04298,178.48738 363.41879,167.65264 C 352.79452,156.81816 347.48241,142.88043 347.48243,125.83942 C 347.48241,108.90394 352.74193,94.361371 363.261,82.211664 C 373.78001,70.062393 389.82154,63.040935 411.38565,61.147269 L 411.38565,47.577696 L 428.26872,47.577696 L 428.26872,61.147269 C 446.15099,62.935745 460.2465,68.616025 470.5553,78.188128 C 480.86381,87.760674 487.33302,101.17245 489.96294,118.42349 L 460.45701,122.6837 C 458.77383,111.95446 455.24996,103.46034 449.88537,97.201308 C 444.52054,90.942683 437.315,86.919151 428.26872,85.1307 L 428.26872,167.17928 z M 411.38565,163.70799 L 411.38565,84.815128 C 399.91981,86.813961 391.13642,91.41604 385.03543,98.621379 C 378.93433,105.82712 375.88381,114.16346 375.88386,123.63042 C 375.88381,134.4652 379.03952,143.01192 385.351,149.2706 C 391.66237,155.52958 400.34058,160.34204 411.38565,163.70799 L 411.38565,163.70799 z M 428.26872,281.25836 C 439.31361,279.57533 448.41258,274.76287 455.56565,266.82097 C 462.71847,258.87913 466.29494,248.85974 466.29508,236.76278 C 466.29494,226.13862 463.58629,217.5919 458.16912,211.1226 C 452.75168,204.65348 442.78489,199.15729 428.26872,194.634 L 428.26872,281.25836 z" transform="scale(1.0867055,0.9202125)" fill="#ffffff"/>
+ </g>
+ <path d="M 290.15306,178.9597 L 290.15306,481.80532" id="path4370" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="34.28"/>
+ <path d="M 63.8125,49.75 L 63.8125,154.1875 L 147.96875,154.1875 C 154.64654,129.95596 158.94609,94.09998 159.28125,92.15625 L 420.90625,90.4375 L 433.1875,154.1875 L 516.1875,154.1875 L 516.1875,49.75 L 63.8125,49.75 z" id="rect7186" sodipodi:nodetypes="ccccccccc" opacity=".5" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="36.06"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/money/bank.svg b/vtm-themes/icons/symbols/money/bank.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/money/bank.svg
rename to vtm-themes/icons/symbols/money/bank.svg
diff --git a/vtm-themes/icons/symbols/money/bank2.svg b/vtm-themes/icons/symbols/money/bank2.svg
new file mode 100755
index 00000000..a3c0ac75
--- /dev/null
+++ b/vtm-themes/icons/symbols/money/bank2.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 286.94406,44.001595 L 34.884618,235.90902 L 85.296174,235.90902 L 85.296174,543.77001 L 236.53218,543.77001 L 340.81297,543.77001 L 488.59196,543.77001 L 488.59196,235.90902 L 539.00386,235.90902 L 286.94406,44.001595 L 286.94406,44.001595 L 286.94406,44.001595 z" id="path645" sodipodi:nodetypes="cccccccccccc" opacity=".2" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="1.241"/>
+ <g id="g5004" transform="matrix(1.4559912,0,0,1.4559912,-376.41212,64.28652)" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.434">
+  <path id="text2413" d="M 424.47661,167.17928 C 424.68689,167.2846 425.47582,167.49498 426.8434,167.81042 C 448.40732,172.01817 468.39875,179.69707 479.23351,190.84714 C 490.06797,201.99743 495.48528,216.61889 495.48544,234.71157 C 495.48528,253.22514 489.54202,269.26668 477.65565,282.83622 C 465.76899,296.40579 445.51459,303.76912 424.47661,304.92622 L 415.62836,318.71586 L 411.38565,318.71586 L 411.38565,305.24179 C 389.92673,302.82241 373.46443,295.85354 361.99871,284.33518 C 350.53293,272.81685 344.06372,256.69643 342.59107,235.97386 L 370.9925,230.92471 C 373.20146,246.49296 377.67205,258.48466 384.40429,266.89986 C 391.13642,275.31512 400.1302,280.10129 411.38565,281.25836 L 411.38565,190.84714 C 390.03192,186.21887 374.04298,178.48738 363.41879,167.65264 C 352.79452,156.81816 347.48241,142.88043 347.48243,125.83942 C 347.48241,108.90394 352.74193,94.361371 363.261,82.211664 C 373.78001,70.062393 389.82154,63.040935 411.38565,61.147269 L 411.38565,47.577696 L 424.47661,47.577696 L 424.47661,61.147269 C 442.35888,62.935745 460.2465,68.616025 470.5553,78.188128 C 480.86381,87.760674 487.33302,101.17245 489.96294,118.42349 L 460.45701,122.6837 C 458.77383,111.95446 455.24996,103.46034 449.88537,97.201308 C 444.52054,90.942683 433.52289,86.919151 424.47661,85.1307 L 424.47661,167.17928 z M 411.38565,163.70799 L 411.38565,84.815128 C 399.91981,86.813961 391.13642,91.41604 385.03543,98.621379 C 378.93433,105.82712 375.88381,114.16346 375.88386,123.63042 C 375.88381,134.4652 379.03952,143.01192 385.351,149.2706 C 391.66237,155.52958 400.34058,160.34204 411.38565,163.70799 L 411.38565,163.70799 z M 424.47661,281.25836 C 435.5215,279.57533 448.41258,274.76287 455.56565,266.82097 C 462.71847,258.87913 466.29494,248.85974 466.29508,236.76278 C 466.29494,226.13862 463.58629,217.5919 458.16912,211.1226 C 452.75168,204.65348 438.99278,199.15729 424.47661,194.634 L 424.47661,281.25836 z" transform="scale(1.0867055,0.9202125)" sodipodi:nodetypes="ccccsccccsccsccssscccccccsccccssscccssscc" stroke-width="3.434" fill="#ffffff"/>
+ </g>
+ <path d="M 287.42618,131.3132 L 287.42618,493.62063" id="path4370" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="46.16"/>
+ <path sodipodi:nodetypes="cccccccccccc" id="path3198" d="M 286.94406,34.001595 L 34.884618,225.90902 L 85.296174,225.90902 L 85.296174,543.77001 L 236.53218,543.77001 L 340.81297,543.77001 L 488.59196,543.77001 L 488.59196,225.90902 L 539.00386,225.90902 L 286.94406,34.001595 L 286.94406,34.001595 L 286.94406,34.001595 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="20"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/money/currency_exchange.svg b/vtm-themes/icons/symbols/money/currency_exchange.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/money/currency_exchange.svg
rename to vtm-themes/icons/symbols/money/currency_exchange.svg
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/bahai.svg b/vtm-themes/icons/symbols/place_of_worship/bahai.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/bahai.svg
rename to vtm-themes/icons/symbols/place_of_worship/bahai.svg
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/bahai3.svg b/vtm-themes/icons/symbols/place_of_worship/bahai3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/bahai3.svg
rename to vtm-themes/icons/symbols/place_of_worship/bahai3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/buddhist.svg b/vtm-themes/icons/symbols/place_of_worship/buddhist.svg
new file mode 100755
index 00000000..21f11798
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/buddhist.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <path sodipodi:nodetypes="cccccsscccsscscssssssscccsccsscscccccscccccccccscccccccsccssssccccccsccssssccccssccccccccc" id="path1873" d="M 280.45232,351.0856 C 277.43419,348.06748 275.84773,343.41129 275.84773,337.57138 L 275.84773,328.66173 L 262.49006,326.03378 C 210.65689,315.83622 164.81361,262.10766 153.68952,206.43494 C 150.29668,206.17303 148.4207,206.04102 144.83531,206.04102 C 133.62187,206.04102 126.19856,198.55847 126.19856,187.25554 C 126.19856,176.9815 132.51373,170.9715 144.03881,170.2774 L 152.67495,169.75729 L 156.75091,153.94029 C 163.55106,127.55203 173.64828,110.19179 194.09024,89.74248 C 215.04145,68.783745 232.57775,58.258482 257.89376,51.986409 C 265.58571,50.080707 266.17636,51.550653 274.83479,49.61912 C 275.9787,37.59131 274.93659,24.177035 293.32587,24.807587 C 307.86077,25.314645 309.24834,34.189669 309.30829,48.915792 C 314.29299,49.404247 315.91109,49.551548 324.53991,51.325857 C 376.42237,61.994255 423.01288,108.80083 432.10404,161.14627 C 433.54291,169.43096 434.31524,170.28327 439.79753,169.63646 C 447.03415,168.78268 458.88851,174.41686 460.90347,179.66777 C 465.89432,192.67376 458.5776,203.84919 443.76989,205.83729 C 434.07561,207.13887 433.61582,207.56019 432.0836,216.5463 C 429.68392,230.61981 420.26767,252.17141 409.75408,267.65333 C 391.2241,294.93995 362.33756,315.24426 328.80051,324.5555 L 311.5333,329.34959 L 310.78772,338.49087 C 310.37764,343.51858 308.40402,349.44521 306.40187,351.66117 C 301.27825,357.33196 286.36795,357.00123 280.45232,351.0856 z M 275.84773,262.44725 C 275.84773,246.61897 275.04784,233.66856 274.07017,233.66856 C 273.09252,233.66856 263.53913,242.46775 252.84043,253.22232 C 242.07301,264.04596 235.99284,270.69222 233.73277,273.95455 C 236.51863,275.99429 241.40894,281.49231 253.64702,286.52338 C 263.9013,290.7389 272.35289,291.94646 276.22088,292.52977 C 275.58128,287.71997 275.84773,280.5058 275.84773,262.44725 z M 344.98854,281.11621 L 355.00988,274.93805 L 334.47074,254.30331 C 323.17421,242.9542 313.13298,233.66856 312.15687,233.66856 C 311.18077,233.66856 310.38215,246.74847 310.38215,262.73503 L 310.38215,291.80151 L 322.67468,289.54793 C 326.79003,288.72619 336.83126,284.93192 344.98854,281.11621 z M 229.78493,226.1861 L 251.11797,206.04102 L 220.63418,206.04102 L 190.15037,206.04102 L 191.71119,214.36094 C 193.49657,223.87782 204.71227,247.84015 206.95733,246.93424 C 207.77932,246.60255 218.05174,237.26589 229.78493,226.1861 z M 390.57154,231.57402 C 394.17463,223.65988 395.74077,217.12035 396.52721,213.63813 L 397.95707,206.04102 L 367.45581,206.04102 L 336.95455,206.04102 L 357.5792,226.76167 C 368.92276,238.15803 379.05691,247.48233 380.09953,247.48233 C 381.14215,247.48233 386.96847,239.48816 390.57154,231.57402 z M 301.74569,208.81137 C 305.70527,206.7638 312.20453,199.93948 314.12191,195.35057 C 317.17795,188.03643 315.30759,180.29542 309.56753,174.00175 C 300.41372,163.96508 288.52246,163.90495 278.36549,173.47529 C 268.45404,182.81427 270.88066,195.78289 276.50825,202.36851 C 282.96265,209.92168 293.40678,213.12359 301.74569,208.81137 z M 248.22019,169.1563 C 248.22019,168.49676 239.03905,158.81856 227.81766,147.64916 L 207.41514,127.34117 L 202.50423,135.28717 C 196.98717,144.21395 193.4476,153.85771 190.40965,170.41333 C 191.92862,170.62714 194.41671,170.35545 219.4415,170.35545 C 235.26978,170.35545 248.22019,169.81584 248.22019,169.1563 z M 396.07391,164.15525 C 395.7017,161.12675 393.91968,151.85361 390.1968,143.55202 C 386.43526,135.16423 380.72932,127.76299 379.73128,127.76299 C 378.06665,127.76299 338.00983,167.50426 338.00932,169.1563 C 338.00911,169.81584 351.21853,170.13991 367.36358,169.87646 C 396.44209,169.40198 396.71215,169.34817 396.07391,164.15525 z M 275.84773,113.90536 L 275.84773,83.931672 L 269.51641,85.361535 C 257.97835,85.866428 233.8459,99.206293 234.40642,101.69567 C 234.7583,103.2584 273.67415,143.87906 275.22415,143.87906 C 275.56712,143.87906 275.84773,130.3909 275.84773,113.90536 z M 338.93109,91.669754 C 330.33285,87.633647 320.45469,86.285999 317.28903,85.890188 L 311.5333,85.170537 L 310.89377,115.10037 L 310.25421,145.0302 L 332.28266,123.1584 L 354.31109,101.2866 L 338.93109,91.669754 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/buddhist3.svg b/vtm-themes/icons/symbols/place_of_worship/buddhist3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/buddhist3.svg
rename to vtm-themes/icons/symbols/place_of_worship/buddhist3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/christian.svg b/vtm-themes/icons/symbols/place_of_worship/christian.svg
new file mode 100755
index 00000000..8c4794cd
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/christian.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path sodipodi:nodetypes="ccccccccccccccc" id="path1873" d="M 252.87907,338.30209 L 251.58366,187.28894 L 174.48428,186.77133 L 174.48428,147.45456 L 174.48428,110.13779 L 251.1406,108.74859 L 252.52983,24.092246 L 330.93978,22.722169 L 330.93978,108.87899 L 408.9853,108.87899 L 408.9853,147.45456 L 408.9853,186.03012 L 330.93978,186.03012 L 330.93978,340.05081 C 306.13967,337.1988 277.0394,344.69682 252.87907,338.30209 z" fill="#ffffff"/>
+ <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <path d="M 330.59051,338.30209 L 331.88592,187.28894 L 408.9853,186.77133 L 408.9853,147.45456 L 408.9853,110.13779 L 332.32898,108.74859 L 330.93975,24.092246 L 252.5298,22.722169 L 252.5298,108.87899 L 174.48428,108.87899 L 174.48428,147.45456 L 174.48428,186.03012 L 252.5298,186.03012 L 252.5298,340.05081 C 277.32991,337.1988 306.43018,344.69682 330.59051,338.30209 z" id="path4237" sodipodi:nodetypes="ccccccccccccccc" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/christian3.svg b/vtm-themes/icons/symbols/place_of_worship/christian3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/christian3.svg
rename to vtm-themes/icons/symbols/place_of_worship/christian3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/hindu.svg b/vtm-themes/icons/symbols/place_of_worship/hindu.svg
new file mode 100755
index 00000000..2c9af0e8
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/hindu.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <path sodipodi:nodetypes="csssssscccsssssssssssssssssssssscccsccsscccssccsssssssssccscccsccc" id="path1873" d="M 233.54049,347.62872 C 213.75971,342.46687 196.65989,332.13347 180.58034,315.62495 C 154.96822,289.32955 140.97921,261.18805 132.69544,219.29547 C 127.97071,195.40161 127.96268,194.82006 132.3137,191.6385 C 141.22682,185.12106 144.74973,187.46976 147.73968,201.92289 C 163.32192,277.24567 212.13578,326.21161 259.62247,314.15426 C 273.78502,310.55824 287.29626,296.96205 291.36071,282.21644 C 296.60146,263.20329 287.36895,230.34773 271.32042,210.89935 L 265.61709,203.9878 L 255.97615,213.92213 C 245.78068,224.42787 233.21595,233.08707 228.14604,233.10173 C 225.0976,233.11056 211.17953,204.95934 211.17953,198.78466 C 211.17953,196.97637 217.79955,192.4703 225.89069,188.77121 C 248.59692,178.39041 258.25522,166.69799 258.25522,149.59045 C 258.25522,138.45705 256.29252,134.57469 248.67174,130.63384 C 238.85908,125.55951 222.52035,126.42735 202.71829,133.07469 C 193.07707,136.31115 184.6372,138.95916 183.96301,138.95916 C 182.22773,138.95916 168.81141,108.59734 168.81141,104.67031 C 168.81141,97.933468 183.36218,93.32916 207.64886,92.380938 C 229.92373,91.511261 231.87902,91.825962 244.08949,98.246192 C 259.43529,106.31499 270.84413,120.28571 275.84826,137.13646 C 279.92965,150.87997 280.51704,168.77094 277.17544,177.56002 C 273.61654,186.92062 278.14282,186.99335 290.2264,177.76974 C 303.42934,167.69173 312.36023,163.74225 326.86536,161.56707 C 337.32426,159.99867 337.84033,159.54234 340.69796,149.33584 C 347.51869,124.97462 365.58474,110.59457 389.80101,110.2512 C 407.87841,109.99487 418.04158,113.71169 428.47247,124.39389 C 442.24256,138.49574 447.17416,155.51904 448.37539,193.0962 C 449.86642,239.73936 443.6022,264.9502 425.35879,285.72833 C 409.63346,303.63849 384.89655,310.25808 365.59648,301.72074 C 349.30862,294.51585 345.01212,283.33618 343.14263,243.29515 C 341.9417,217.57316 340.94094,211.45534 337.27083,207.39994 C 331.59195,201.12484 328.10423,201.2696 312.74898,208.41785 L 300.15989,214.2784 L 305.21177,221.92914 C 338.0315,271.63231 331.2354,325.75439 289.87721,344.04908 C 276.85241,349.81056 248.74542,351.59649 233.54049,347.62872 z M 403.65009,263.70594 C 420.619,253.35996 431.85542,224.27909 429.3899,197.08899 C 427.77836,179.31651 417.43214,158.36747 406.78402,151.31652 C 392.36822,141.7707 372.56646,144.91301 359.58642,158.8062 L 353.82045,164.97782 L 358.34454,172.56409 C 362.109,178.87656 362.99412,185.68354 363.61587,213.10337 C 364.48889,251.60321 364.84749,253.87543 371.35657,262.1504 C 377.5611,270.03817 392.11453,270.73919 403.65009,263.70594 z M 286.51333,104.43384 C 280.69468,102.3981 271.52115,97.696372 266.12772,93.985583 C 255.35849,86.576176 234.71738,64.131051 234.71738,59.830052 C 234.71738,58.338482 237.4288,55.341526 240.74274,53.170136 C 246.64092,49.305504 246.96939,49.403987 256.30229,57.835714 C 268.66992,69.009129 280.06803,73.66515 295.13521,73.698644 C 308.63506,73.728655 324.89286,65.904416 333.15448,55.401453 C 335.701,52.164081 338.57709,49.515344 339.54579,49.515344 C 341.41947,49.515344 366.46173,70.11995 369.51958,74.177569 C 372.46744,78.089229 348.05053,98.475051 334.21934,103.64999 C 319.26122,109.24653 301.12096,109.54459 286.51333,104.43384 z M 287.34106,51.792348 C 281.0532,45.171317 275.61335,38.946216 275.25249,37.95878 C 274.89161,36.971344 280.01963,31.090578 286.6481,24.890427 L 298.69986,13.617424 L 311.23557,25.997436 C 318.13023,32.80644 323.20372,39.559471 322.50999,41.004154 C 321.81628,42.448859 316.19177,48.175805 310.01111,53.730737 L 298.77353,63.830567 L 287.34106,51.792348 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/hindu3.svg b/vtm-themes/icons/symbols/place_of_worship/hindu3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/hindu3.svg
rename to vtm-themes/icons/symbols/place_of_worship/hindu3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/islamic.svg b/vtm-themes/icons/symbols/place_of_worship/islamic.svg
new file mode 100755
index 00000000..bfc5a018
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/islamic.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <path sodipodi:nodetypes="csssssssssssssssccsssscccscccssssssssc" id="path1873" d="M 266.27191,338.46746 C 260.59781,337.33925 249.57157,334.17247 241.76917,331.43013 C 201.78148,317.3756 163.16711,277.79592 148.75805,236.09385 C 143.73116,221.54535 140.48848,205.70356 140.67929,184.37152 C 140.86558,163.02439 143.73116,149.32924 148.75805,134.78074 C 162.49521,95.023282 197.24218,57.65041 235.55736,41.421818 C 249.47682,35.52616 280.3977,29.792141 298.27076,29.792141 C 324.90997,29.792141 375.34975,46.634001 385.56168,58.938612 C 390.78237,65.229172 385.92607,65.442393 360.19952,60.052157 C 339.61098,55.738445 332.78127,55.340611 316.86214,57.527798 C 271.02557,63.825407 229.79036,98.368958 213.31063,144.27494 C 205.53652,165.9305 205.50676,204.87477 213.24788,226.39196 C 229.27444,270.9394 269.87117,305.7759 314.70812,313.45615 C 328.62302,315.83966 335.00407,315.45669 357.83937,310.86755 C 372.57953,307.90528 385.59713,306.40329 386.76734,307.5298 C 389.49226,310.15296 377.23466,318.87595 359.26055,327.1048 C 332.72077,339.25509 294.01832,343.98431 266.27191,338.46746 z M 351.41797,235.96429 C 350.63745,234.70138 352.87283,225.21819 356.38549,214.89056 C 359.89816,204.5629 362.77217,195.79541 362.77217,195.40725 C 362.77217,195.01912 355.24717,189.33182 346.04996,182.76882 C 336.85274,176.20581 329.32775,169.82683 329.32775,168.5933 C 329.32775,167.35979 338.8787,166.0143 350.55208,165.60331 L 371.77643,164.85612 L 378.46418,145.69028 C 382.14248,135.14904 386.3693,126.11863 387.8572,125.62268 C 389.34506,125.12673 393.66624,134.04077 397.45975,145.43168 L 404.35705,166.14244 L 426.22769,166.14244 C 438.29125,166.14244 447.71377,167.19303 447.24074,168.48537 C 446.76909,169.77399 439.14763,176.1389 430.30415,182.62961 C 421.46068,189.12035 414.22511,195.40977 414.22511,196.60613 C 414.22511,197.80252 416.54049,205.51112 419.3704,213.73642 C 424.32555,228.13884 425.91344,238.17656 423.2366,238.17656 C 422.53308,238.17656 414.88075,232.96695 406.23137,226.59965 C 397.58201,220.23234 389.42548,215.02274 388.10577,215.02274 C 386.78605,215.02274 379.67785,219.4393 372.30974,224.83734 C 354.49622,237.88789 353.07472,238.64497 351.41797,235.96429 z" fill="#ffffff"/>
+ <path d="M 387.4375,123.65625 C 381.9531,127.60512 380.89728,135.34418 378,141.125 C 375.36376,148.34765 372.91789,155.65438 370.34375,162.90625 C 356.47025,164.08839 341.77081,162.26619 328.4375,166.59375 C 325.07115,170.56663 331.93173,173.67364 334.1875,176.25 C 342.68511,183.22024 351.94092,189.14692 360.53125,196.03125 C 356.87709,209.35922 350.13773,222.26102 349.375,236.15625 C 351.66797,242.32246 358.67537,237.27017 361.88369,234.83559 C 370.64752,229.04986 378.84257,221.46546 388.28125,217.15625 C 400.34968,223.6092 410.60543,233.44285 422.65625,240.09375 C 428.04045,240.24825 426.48082,232.65466 425.84375,229.21875 C 423.85538,218.16155 418.32773,207.39487 416.53125,196.625 C 426.43346,186.43615 439.58583,180.04072 449.03125,169.40625 C 449.63724,164.0692 441.80016,165.35879 438.40625,164.53125 C 427.54631,163.83454 416.65515,164.28453 405.78125,164.15625 C 400.63022,150.87404 398.27873,135.95555 389.84375,124.34375 C 389.18469,123.8144 388.31764,123.40578 387.4375,123.65625 z" id="path4510" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="14.4"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/islamic3.svg b/vtm-themes/icons/symbols/place_of_worship/islamic3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/islamic3.svg
rename to vtm-themes/icons/symbols/place_of_worship/islamic3.svg
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/jain.svg b/vtm-themes/icons/symbols/place_of_worship/jain.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/jain.svg
rename to vtm-themes/icons/symbols/place_of_worship/jain.svg
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/jain3.svg b/vtm-themes/icons/symbols/place_of_worship/jain3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/jain3.svg
rename to vtm-themes/icons/symbols/place_of_worship/jain3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/jewish.svg b/vtm-themes/icons/symbols/place_of_worship/jewish.svg
new file mode 100755
index 00000000..076bad86
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/jewish.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <path sodipodi:nodetypes="cccssssscccscccscccscccsccssssccscccccccccccccssccccsccccccccccsccccccsccsssc" id="path3648" d="M 267.25388,312.96961 L 243.50018,271.75598 L 196.76546,271.73457 C 167.64023,271.72125 149.43529,270.74975 148.45046,269.15626 C 147.5813,267.74993 157.20372,248.63359 169.83363,226.67547 C 185.49472,199.44739 192.26459,185.35198 191.12264,182.35014 C 190.20169,179.92931 179.95029,161.53267 168.3417,141.46876 C 156.73314,121.40482 147.23522,103.68331 147.23522,102.08764 C 147.23522,99.98685 160.5147,99.18547 195.3677,99.18301 L 243.50018,99.17964 L 267.18791,57.926604 C 280.21616,35.237436 291.67258,16.67357 292.64663,16.67357 C 295.31805,16.67357 301.98823,27.018346 323.6819,64.806047 L 343.41943,99.18639 L 391.60004,99.18639 C 428.53593,99.18639 439.75512,99.91582 439.67129,102.31188 C 439.61112,104.03089 429.1092,123.40535 416.33366,145.36624 L 393.10543,185.2951 L 416.44302,225.72565 C 429.27872,247.96244 439.78065,267.40651 439.78065,268.93469 C 439.78065,270.87632 425.26861,271.71321 391.60004,271.71321 L 343.41943,271.71321 L 323.6819,306.09354 C 302.0947,343.6958 295.30915,354.23722 292.7126,354.20467 C 291.77483,354.19289 280.3184,335.6371 267.25388,312.96961 z M 302.0758,288.28645 C 306.30236,280.89917 309.76047,274.14813 309.76047,273.28411 C 309.76047,272.4201 302.44684,271.71321 293.50795,271.71321 C 284.56905,271.71321 277.25543,272.4201 277.25543,273.28411 C 277.25543,275.31743 292.34571,301.71786 293.50795,301.71786 C 293.99369,301.71786 297.84923,295.67372 302.0758,288.28645 z M 219.21941,229.23627 C 214.69606,221.00129 210.43254,214.2636 209.74493,214.2636 C 209.05732,214.2636 204.79381,221.00129 200.27046,229.23627 L 192.04618,244.20892 L 209.74493,244.20892 L 227.44367,244.20892 L 219.21941,229.23627 z M 336.8524,227.3313 C 342.2478,218.0486 349.8393,204.72596 353.72243,197.72543 L 360.78262,184.99717 L 344.58501,156.46902 L 328.38742,127.94086 L 293.61926,127.94086 L 258.85111,127.94086 L 243.04939,155.15188 C 234.35843,170.11793 227.24765,183.5484 227.24765,184.99733 C 227.24765,187.5882 253.17193,234.97716 257.92974,241.08344 C 259.66134,243.30579 269.99853,244.20892 293.7038,244.20892 L 327.04261,244.20892 L 336.8524,227.3313 z M 386.74541,229.23627 C 382.22206,221.00129 377.95855,214.2636 377.27094,214.2636 C 376.58333,214.2636 372.31981,221.00129 367.79646,229.23627 L 359.57222,244.20892 L 377.27094,244.20892 L 394.96969,244.20892 L 386.74541,229.23627 z M 219.05473,141.65139 L 227.11433,126.69066 L 209.58026,126.69066 L 192.04618,126.69066 L 200.27046,141.66334 C 204.79381,149.8983 209.05732,156.63061 209.74493,156.62403 C 210.43254,156.61746 214.62194,149.87977 219.05473,141.65139 z M 386.58073,141.65139 L 394.64034,126.69066 L 377.10627,126.69066 L 359.57222,126.69066 L 367.79646,141.66334 C 372.31981,149.8983 376.58333,156.63061 377.27094,156.62403 C 377.95855,156.61746 382.14794,149.87977 386.58073,141.65139 z M 309.76047,97.61547 C 309.76047,95.582157 294.67018,69.181728 293.50795,69.181728 C 292.34571,69.181728 277.25543,95.582157 277.25543,97.61547 C 277.25543,98.47948 284.56905,99.18639 293.50795,99.18639 C 302.44684,99.18639 309.76047,98.47948 309.76047,97.61547 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/jewish3.svg b/vtm-themes/icons/symbols/place_of_worship/jewish3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/jewish3.svg
rename to vtm-themes/icons/symbols/place_of_worship/jewish3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/shinto.svg b/vtm-themes/icons/symbols/place_of_worship/shinto.svg
new file mode 100755
index 00000000..c334d042
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/shinto.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
+ <path sodipodi:nodetypes="cssscccsssssssssssssssssssssssssssscccscccssssscccsssccccssccccscccccc" id="path1873" d="M 209.96733,335.29027 C 208.30625,332.18651 207.57342,309.98368 207.82929,270.51277 C 208.1617,219.23366 207.66852,209.3939 204.45437,203.17841 C 199.51298,193.62282 199.54544,193.49666 207.67456,190.66285 C 214.23378,188.37627 214.65898,187.48718 214.65898,176.05766 L 214.65898,163.88727 L 191.95962,163.35121 C 179.47497,163.05638 168.53446,162.08766 167.64737,161.1985 C 165.51954,159.06564 164.55584,136.65311 166.4595,133.57289 C 167.36997,132.09976 174.66941,131.60124 185.32028,132.28475 C 199.9076,133.22092 203.57298,132.69861 208.16246,129.02978 C 217.45488,121.60148 213.99357,117.13478 197.65038,115.46432 C 166.23882,112.25367 166.36997,112.30117 164.72641,103.54033 C 163.90278,99.150045 162.20627,95.557981 160.95636,95.557981 C 159.70645,95.557981 154.49163,92.783747 149.36789,89.393022 C 142.10996,84.589931 139.48566,80.978893 137.4883,73.046642 C 136.07826,67.446862 131.87518,58.655645 128.14813,53.510596 C 124.42108,48.365548 121.99372,43.149468 122.754,41.919302 C 124.85843,38.514281 134.88909,39.245993 142.90069,43.388964 C 151.80587,47.994 170.3657,53.585865 180.35593,54.673781 C 184.49711,55.124765 199.9335,57.288654 214.65898,59.482436 C 236.74345,62.772564 252.64573,63.271763 305.45641,62.332615 C 340.66952,61.706439 374.19473,60.067359 379.95687,58.690264 C 385.71902,57.313147 397.10611,55.132634 405.26152,53.844637 C 413.41692,52.556641 426.66939,48.423751 434.71143,44.66043 C 454.24671,35.518758 460.2053,40.703199 449.79235,57.781987 C 447.2362,61.974477 445.14478,67.865113 445.14478,70.872277 C 445.14478,76.246694 427.02482,95.557981 421.98198,95.557981 C 420.70948,95.557981 418.79477,98.929313 417.72704,103.04984 C 415.58858,111.30239 410.83268,113.56358 394.79877,113.95102 C 380.55092,114.29531 370.64432,116.73055 370.64432,119.88865 C 370.64432,121.42608 373.05289,124.94674 375.99671,127.71231 C 380.9179,132.33553 382.65286,132.57919 397.532,130.7368 C 407.47795,129.50526 414.78614,129.58637 416.49446,130.94726 C 419.29603,133.17908 418.22373,155.43335 415.14772,158.89655 C 414.34517,159.80012 403.42941,160.71283 390.89047,160.92478 L 368.09242,161.31011 L 368.78632,173.25074 C 369.43646,184.43775 369.95789,185.34572 377.04842,187.63762 C 389.27292,191.58898 390.30688,194.07779 383.22193,202.49776 L 376.91213,209.99653 L 378.2554,269.79368 C 379.08783,306.85 378.7374,331.12984 377.33395,333.63766 C 374.54202,338.62654 353.9858,339.36712 350.04666,334.62076 C 348.44332,332.68885 346.93093,308.82186 345.95277,270.0149 C 345.0996,236.16671 343.39931,206.52686 342.17434,204.14855 C 340.69499,201.27635 340.80132,198.97018 342.49097,197.28054 C 343.89006,195.88144 345.03574,187.3507 345.0369,178.32334 L 345.03905,161.90995 L 292.08846,162.66928 C 262.96566,163.0869 238.7758,163.79067 238.33327,164.23323 C 237.89074,164.67576 236.95922,202.57375 236.26327,248.451 C 235.56732,294.32822 234.0516,333.69754 232.89501,335.93838 C 229.75494,342.02216 213.32151,341.55759 209.96733,335.29027 z M 277.51874,125.82379 L 277.51874,116.51123 L 260.17338,116.51123 C 246.45626,116.51123 242.37712,117.31694 240.67244,120.36305 C 239.05403,123.25498 240.04052,125.55739 244.631,129.60204 C 249.4779,133.87266 253.5197,135.00446 264.13193,135.06278 L 277.51874,135.13635 L 277.51874,125.82379 z M 338.02376,128.79859 C 340.59935,126.59332 342.70664,122.92649 342.70664,120.65011 C 342.70664,117.05159 340.42693,116.51123 325.2456,116.51123 L 307.78456,116.51123 L 307.78456,124.65973 L 307.78456,132.80821 L 320.56271,132.80821 C 329.28911,132.80821 334.82573,131.53681 338.02376,128.79859 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/shinto3.svg b/vtm-themes/icons/symbols/place_of_worship/shinto3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/shinto3.svg
rename to vtm-themes/icons/symbols/place_of_worship/shinto3.svg
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/sikh.svg b/vtm-themes/icons/symbols/place_of_worship/sikh.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/sikh.svg
rename to vtm-themes/icons/symbols/place_of_worship/sikh.svg
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/sikh3.svg b/vtm-themes/icons/symbols/place_of_worship/sikh3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/sikh3.svg
rename to vtm-themes/icons/symbols/place_of_worship/sikh3.svg
diff --git a/vtm-themes/icons/symbols/place_of_worship/unknown.svg b/vtm-themes/icons/symbols/place_of_worship/unknown.svg
new file mode 100755
index 00000000..a50ab3bf
--- /dev/null
+++ b/vtm-themes/icons/symbols/place_of_worship/unknown.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#111111" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 336.04092,228.20338 32.60294,127.78375" id="path4817" sodipodi:nodetypes="cc" fill="#d53b3b" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="128.99"/>
+ <path d="M 327.15153,205.27243 201.86022,223.14418 128.4406,135.72436" id="path5329" sodipodi:nodetypes="ccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="56.673"/>
+ <path d="m 419.18715,496.11435 -173.27583,1.87442" id="path5331" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="71.797"/>
+ <path d="m 395.95938,373.03073 -149.108,110.5251" id="path5333" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="78.4"/>
+ <path id="path5339" d="m 282.62127,81.430196 c -16.39627,0.74391 -22.85159,24.391444 -9.28973,33.410414 12.35231,10.18832 32.79976,-2.15972 29.44467,-17.927534 -1.48092,-9.45077 -10.60853,-16.54984 -20.15494,-15.48288 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="78.4"/>
+ <path sodipodi:nodetypes="cc" id="path4057" d="M 381.59627,361.98219 246.85138,483.55583" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="78.4"/>
+ <path sodipodi:nodetypes="ccc" id="path4059" d="M 327.15153,215.27243 201.86022,223.14418 128.4406,135.72436" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="56.673"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/unknown3.svg b/vtm-themes/icons/symbols/place_of_worship/unknown3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/place_of_worship/unknown3.svg
rename to vtm-themes/icons/symbols/place_of_worship/unknown3.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/boundary_administrative.svg b/vtm-themes/icons/symbols/poi/boundary_administrative.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/boundary_administrative.svg
rename to vtm-themes/icons/symbols/poi/boundary_administrative.svg
diff --git a/vtm-themes/icons/symbols/poi/cave.svg b/vtm-themes/icons/symbols/poi/cave.svg
new file mode 100755
index 00000000..2b38c063
--- /dev/null
+++ b/vtm-themes/icons/symbols/poi/cave.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#111111" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="m 34.702986,408.13437 c 2.367196,-5.48093 32.404879,-47.87543 66.750284,-94.2099 49.25528,-66.44891 74.61409,-89.47895 120.04961,-109.0248 71.12554,-30.59742 142.32874,-32.35525 168.26002,-4.15402 61.33558,66.70455 124.63054,142.87846 142.85807,171.92632 25.68601,40.93369 12.60173,60.07407 -14.50984,21.22601 C 507.42352,378.58371 477.4635,342.01325 451.53328,312.63007 340.43961,186.74287 340.10029,186.61322 236.90791,230.57389 186.18922,252.18048 166.47754,270.06043 123.61005,333.34337 95.06701,375.47997 62.417798,411.78794 51.05624,414.0276 39.69479,416.26738 32.3358,413.61508 34.702986,408.13437 z" id="path2838" sodipodi:nodetypes="csssssssssc" fill="#ffffff"/>
+ <path sodipodi:nodetypes="cssscccc" id="path3593" d="m 34.702986,408.13437 c 2.367196,-5.48093 32.404879,-47.87543 66.750284,-94.2099 49.25528,-66.44891 74.61409,-89.47895 120.04961,-109.0248 71.12554,-30.59742 142.32874,-32.35525 168.26002,-4.15402 61.33558,66.70455 124.63054,142.87846 142.85807,171.92632 34.40213,55.71502 -22.68994,62.23235 -174.08769,65.9581 -80.61454,2.31281 -85.24178,0.87361 -168.92323,1.7133 -39.07364,-1.12238 -156.361399,-19.74053 -154.907064,-32.209 z" opacity=".1" fill="#ffffff"/>
+ <path sodipodi:nodetypes="cssssc" id="path3638" d="m 150.97846,415.18101 c 0,-32.36715 90.19166,-134.76949 118.69935,-134.76949 45.60596,0 92.84717,28.28822 127.25562,76.20114 20.30607,28.27572 36.92016,54.52123 36.92016,58.32343 0,3.80207 -63.64691,6.91299 -141.43757,6.91299 -77.79065,0 -141.43756,-3.00059 -141.43756,-6.66807 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/poi/crane.svg b/vtm-themes/icons/symbols/poi/crane.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/crane.svg
rename to vtm-themes/icons/symbols/poi/crane.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/embassy.svg b/vtm-themes/icons/symbols/poi/embassy.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/embassy.svg
rename to vtm-themes/icons/symbols/poi/embassy.svg
diff --git a/vtm-themes/icons/symbols/poi/embassy2.svg b/vtm-themes/icons/symbols/poi/embassy2.svg
new file mode 100755
index 00000000..0990bc58
--- /dev/null
+++ b/vtm-themes/icons/symbols/poi/embassy2.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <linearGradient id="linearGradient2936">
+   <stop id="stop2938" stop-color="#8acf6b"/>
+   <stop offset="1" id="stop2940" stop-color="#368912"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2952">
+   <stop id="stop2954" stop-color="#c0d50d"/>
+   <stop offset="1" id="stop2956" stop-color="#eef2cd"/>
+  </linearGradient>
+  <marker inkscape:stockid="RazorWire" id="RazorWire" orient="auto">
+       style="overflow:visible"&gt;
+         <path id="path4286" transform="scale(0.8,0.8)" d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+  <marker inkscape:stockid="DiamondS" orient="auto" refY="0.0" refX="0.0" id="DiamondS">
+   <path id="path4202" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " transform="scale(0.2)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Arrow2Sstart" orient="auto" refY="0.0" refX="0.0" id="Arrow2Sstart">
+   <path id="path4146" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.3) translate(-2.3,0)" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker inkscape:stockid="StopS" orient="auto" refY="0.0" refX="0.0" id="StopS">
+   <path id="path4229" d="M 0.0,5.65 L 0.0,-5.65" transform="scale(0.2)" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="InfiniteLineStart" id="InfiniteLineStart" orient="auto">
+   <g id="g4298" transform="translate(-13,0)">
+    <circle id="circle4300" r=".8" cx="3"/>
+    <circle id="circle4302" r=".8" cx="6.5"/>
+    <circle id="circle4304" r=".8" cx="10"/>
+   </g>
+  </marker>
+  <marker inkscape:stockid="CurveIn" orient="auto" refY="0.0" refX="0.0" id="CurveIn">
+   <path id="path4238" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" transform="scale(0.6)" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="TriangleOutS" orient="auto" refY="0.0" refX="0.0" id="TriangleOutS">
+   <path id="path4220" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " transform="scale(0.2)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Arrow2Send" orient="auto" refY="0.0" refX="0.0" id="Arrow2Send">
+   <path id="path4149" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.3) rotate(180) translate(-2.3,0)" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker inkscape:stockid="SemiCircleOut" orient="auto" refY="0.0" refX="0.0" id="SemiCircleOut">
+   <path id="path4235" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " transform="scale(0.6) translate(7.125493,0.763446)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Arrow1Send" orient="auto" refY="0.0" refX="0.0" id="Arrow1Send">
+   <path id="path4131" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.2) rotate(180) translate(6,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Arrow1Sstart" orient="auto" refY="0.0" refX="0.0" id="Arrow1Sstart">
+   <path id="path4128" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.2) translate(6,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Tail" orient="auto" refY="0.0" refX="0.0" id="Tail">
+   <g id="g4152" transform="scale(-1.2)">
+    <path id="path4154" d="M -3.8048674,-3.9585227 L 0.54352094,0" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path id="path4156" d="M -1.2866832,-3.9585227 L 3.0617053,0" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path id="path4158" d="M 1.3053582,-3.9585227 L 5.6537466,0" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path id="path4160" d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path id="path4162" d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path id="path4164" d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker inkscape:stockid="Arrow1Lend" orient="auto" refY="0.0" refX="0.0" id="Arrow1Lend">
+   <path id="path4119" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.8) rotate(180) translate(12.5,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="TriangleOutL" orient="auto" refY="0.0" refX="0.0" id="TriangleOutL">
+   <path id="path4214" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " transform="scale(0.8)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Arrow1Mend" orient="auto" refY="0.0" refX="0.0" id="Arrow1Mend">
+   <path id="path4125" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.4) rotate(180) translate(10,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker inkscape:stockid="Arrow2Lend" orient="auto" refY="0.0" refX="0.0" id="Arrow2Lend">
+   <path id="path4137" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(1.1) rotate(180) translate(1,0)" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <symbol id="symbol14628" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path14630"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path14632"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path14634"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path14636"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 45.40739,51.732619 c 0,0 -16.350222,50.048161 11.143019,86.686211 13.994406,21.23491 49.465031,43.56226 81.749971,53.83063 l 47.95323,52.58841 c -8.96271,-5.88003 -19.79708,-11.67254 -32.42157,-16.19633 -41.40787,-14.83785 -97.049733,2.87969 -96.292972,1.21744 0,0 19.575307,56.0518 62.645422,71.64639 24.63542,10.662 77.12792,7.08512 94.35704,-23.24054 29.42478,34.57551 55.98994,55.92576 80.33889,70.00034 -27.72792,-3.28483 -55.79358,-4.07231 -83.55771,-1.11373 -37.64168,5.84064 -57.78739,32.18574 -97.37167,53.5952 -2.8719,1.93327 -12.93841,11.64264 -16.472125,12.07729 36.804325,21.5252 73.154445,55.12801 108.281415,59.15653 69.07118,7.92139 133.60026,-43.00233 131.69336,-104.53024 14.58598,4.94693 28.36106,8.29604 41.52072,11.8495 24.42151,6.59444 40.50898,13.93993 63.59551,33.478 23.08652,19.53807 41.28913,51.66297 68.31834,108.38335 l 23.29251,-5.41654 c -27.48504,-57.67671 -52.60463,-91.41713 -77.54695,-112.52582 -24.94249,-21.1087 -49.51276,-29.18239 -74.35217,-35.88969 -11.34547,-3.06359 -8.81076,0.16193 -20.58845,-3.4489 57.26934,-33.5127 48.17776,-180.2404 -63.52277,-227.61601 -34.70391,98.09383 -3.50573,169.43318 38.28669,218.46383 -30.17504,-12.98586 -77.42856,-41.65556 -117.33588,-90.24747 60.90387,-61.86154 42.90909,-131.81273 -36.09796,-195.880868 -36.70745,77.340058 -18.1936,123.238578 10.35771,165.615288 l -43.00949,-47.238 c -0.0153,-14.61261 -2.61204,-45.44792 -22.07298,-71.2039 C 101.78157,80.678551 43.863781,52.708899 45.40739,51.732619 z" id="path5095" sodipodi:nodetypes="ccccscccccccscssccsscccccccsc" color="#000000" stroke-width="4.217" stroke-linecap="round" fill="#ffffff" stroke-linejoin="round" stroke="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/poi/military_bunker.svg b/vtm-themes/icons/symbols/poi/military_bunker.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/military_bunker.svg
rename to vtm-themes/icons/symbols/poi/military_bunker.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/mine.svg b/vtm-themes/icons/symbols/poi/mine.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/mine.svg
rename to vtm-themes/icons/symbols/poi/mine.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/mine_abandoned.svg b/vtm-themes/icons/symbols/poi/mine_abandoned.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/mine_abandoned.svg
rename to vtm-themes/icons/symbols/poi/mine_abandoned.svg
diff --git a/vtm-themes/icons/symbols/poi/mountain_pass.svg b/vtm-themes/icons/symbols/poi/mountain_pass.svg
new file mode 100755
index 00000000..9d6c5d11
--- /dev/null
+++ b/vtm-themes/icons/symbols/poi/mountain_pass.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 332.15321,34.355309 1.24602,77.253011 -221.79091,221.79091 -77.253011,0" id="path3068" inkscape:connector-curvature="0" fill="none" stroke="#ffffff" stroke-width="60"/>
+ <path d="m 540,242.2021 -77.25301,-1.24602 -221.79091,221.79091 0,77.25301" id="path3068-9" inkscape:connector-curvature="0" fill="none" stroke="#ffffff" stroke-width="60"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/poi/peak.svg b/vtm-themes/icons/symbols/poi/peak.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/peak.svg
rename to vtm-themes/icons/symbols/poi/peak.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/peak2.svg b/vtm-themes/icons/symbols/poi/peak2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/peak2.svg
rename to vtm-themes/icons/symbols/poi/peak2.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/place_city.svg b/vtm-themes/icons/symbols/poi/place_city.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/place_city.svg
rename to vtm-themes/icons/symbols/poi/place_city.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/place_hamlet.svg b/vtm-themes/icons/symbols/poi/place_hamlet.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/place_hamlet.svg
rename to vtm-themes/icons/symbols/poi/place_hamlet.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/place_suburb.svg b/vtm-themes/icons/symbols/poi/place_suburb.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/place_suburb.svg
rename to vtm-themes/icons/symbols/poi/place_suburb.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/place_town.svg b/vtm-themes/icons/symbols/poi/place_town.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/place_town.svg
rename to vtm-themes/icons/symbols/poi/place_town.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/place_village.svg b/vtm-themes/icons/symbols/poi/place_village.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/place_village.svg
rename to vtm-themes/icons/symbols/poi/place_village.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/point_of_interest.svg b/vtm-themes/icons/symbols/poi/point_of_interest.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/point_of_interest.svg
rename to vtm-themes/icons/symbols/poi/point_of_interest.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/tower_communications.svg b/vtm-themes/icons/symbols/poi/tower_communications.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/tower_communications.svg
rename to vtm-themes/icons/symbols/poi/tower_communications.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/tower_lookout.svg b/vtm-themes/icons/symbols/poi/tower_lookout.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/tower_lookout.svg
rename to vtm-themes/icons/symbols/poi/tower_lookout.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/tower_power.svg b/vtm-themes/icons/symbols/poi/tower_power.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/tower_power.svg
rename to vtm-themes/icons/symbols/poi/tower_power.svg
diff --git a/vtm-themes/resources/assets/symbols/poi/tower_water.svg b/vtm-themes/icons/symbols/poi/tower_water.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/poi/tower_water.svg
rename to vtm-themes/icons/symbols/poi/tower_water.svg
diff --git a/vtm-themes/resources/assets/symbols/power/station_coal.svg b/vtm-themes/icons/symbols/power/station_coal.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/station_coal.svg
rename to vtm-themes/icons/symbols/power/station_coal.svg
diff --git a/vtm-themes/resources/assets/symbols/power/station_gas.svg b/vtm-themes/icons/symbols/power/station_gas.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/station_gas.svg
rename to vtm-themes/icons/symbols/power/station_gas.svg
diff --git a/vtm-themes/resources/assets/symbols/power/station_solar.svg b/vtm-themes/icons/symbols/power/station_solar.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/station_solar.svg
rename to vtm-themes/icons/symbols/power/station_solar.svg
diff --git a/vtm-themes/resources/assets/symbols/power/station_water.svg b/vtm-themes/icons/symbols/power/station_water.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/station_water.svg
rename to vtm-themes/icons/symbols/power/station_water.svg
diff --git a/vtm-themes/resources/assets/symbols/power/station_wind.svg b/vtm-themes/icons/symbols/power/station_wind.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/station_wind.svg
rename to vtm-themes/icons/symbols/power/station_wind.svg
diff --git a/vtm-themes/resources/assets/symbols/power/substation.svg b/vtm-themes/icons/symbols/power/substation.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/substation.svg
rename to vtm-themes/icons/symbols/power/substation.svg
diff --git a/vtm-themes/resources/assets/symbols/power/tower_high.svg b/vtm-themes/icons/symbols/power/tower_high.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/tower_high.svg
rename to vtm-themes/icons/symbols/power/tower_high.svg
diff --git a/vtm-themes/resources/assets/symbols/power/tower_high2.svg b/vtm-themes/icons/symbols/power/tower_high2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/tower_high2.svg
rename to vtm-themes/icons/symbols/power/tower_high2.svg
diff --git a/vtm-themes/resources/assets/symbols/power/tower_low.svg b/vtm-themes/icons/symbols/power/tower_low.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/tower_low.svg
rename to vtm-themes/icons/symbols/power/tower_low.svg
diff --git a/vtm-themes/resources/assets/symbols/power/transformer.svg b/vtm-themes/icons/symbols/power/transformer.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/power/transformer.svg
rename to vtm-themes/icons/symbols/power/transformer.svg
diff --git a/vtm-themes/icons/symbols/shopping/alcohol.svg b/vtm-themes/icons/symbols/shopping/alcohol.svg
new file mode 100755
index 00000000..340b43bf
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/alcohol.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g7010" transform="matrix(1.0014414,0,0,1.0543874,-15.580879,-16.459021)">
+  <path sodipodi:nodetypes="ccccc" id="rect3771" d="m 146.7393,44.009621 37.8387,0 0,124.859569 -37.8387,0 0,-124.859569 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.298"/>
+  <path sodipodi:nodetypes="czcccc" id="path6978" d="m 110.17519,187.41423 c -1.68505,-9.49469 40.14927,-29.33844 55.65658,-29.35966 15.50731,-0.0212 55.77161,22.48985 58.71582,29.35966 l 0,316.95169 c -28.66921,14.88115 -97.94359,12.00125 -114.3724,0 l 0,-316.95169 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="46.24"/>
+ </g>
+ <path d="M 401.39916,397.29099 L 401.39916,519.88932" id="path3845" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="24"/>
+ <path sodipodi:type="arc" id="path3878" sodipodi:cx="519.16229" sodipodi:cy="502.69528" sodipodi:rx="45.569103" sodipodi:ry="12.748499" d="M 564.7314,502.69528 A 45.569103,12.748499 0 1 1 473.59319,502.69528 A 45.569103,12.748499 0 1 1 564.7314,502.69528 z" transform="matrix(1.4302812,0,0,1.8342213,-341.58987,-395.38818)" fill="#ffffff"/>
+ <g id="g4243" transform="matrix(1.1990081,0,0,1.2591238,-72.990402,-108.62601)">
+  <path sodipodi:nodetypes="csssccc" id="path3840-8" d="M 339.85,317.23424 C 339.8178,318.53216 339.7999,319.83312 339.7999,321.14408 C 339.7999,373.07071 365.37652,415.14047 396.92055,415.14047 C 428.46458,415.14047 454.0412,373.07071 454.0412,321.14408 C 454.0412,319.83312 454.0235,318.53216 453.9911,317.23424 C 411.89595,306.93245 365.98943,310.45437 339.84988,317.23424 L 339.84994,317.23424 z" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.129"/>
+  <path sodipodi:nodetypes="csssccc" id="path3840" d="M 339.43634,317.79387 C 339.40404,319.09179 339.38624,320.39276 339.38624,321.7037 C 339.38624,373.63032 364.96287,415.7001 396.50689,415.7001 C 428.05092,415.7001 453.62755,373.63032 453.62755,321.7037 C 453.62755,320.39276 453.60985,319.09179 453.57745,317.79387 C 421.72547,327.70601 387.70424,334.14737 339.43623,317.79387 L 339.4363,317.79387 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="0"/>
+ </g>
+ <g transform="matrix(25.818296,0,0,25.818296,-7603.868,-1626.0059)" id="flowRoot6831" fill="#ffffff">
+  <path d="m 307.37375,64.57625 c -1.01,0 -1.66,0.770001 -1.66,2.09 0,1.329999 0.64,2.11 1.66,2.11 1.02,0 1.67,-0.790001 1.67,-2.11 0,-1.309999 -0.66,-2.09 -1.67,-2.09 m 4.18,0.12 -4.18,6.71 0.7,0 4.18,-6.71 -0.7,0 m -4.21,0.33 c 0.45,0 0.7,0.550001 0.7,1.64 0,1.099999 -0.25,1.65 -0.7,1.65 -0.45,0 -0.68,-0.550001 -0.68,-1.65 0,-1.089999 0.24,-1.64 0.68,-1.64 m 4.96,2.31 c -1.01,0 -1.67,0.770001 -1.67,2.09 0,1.329999 0.65,2.1 1.67,2.1 1.02,0 1.67,-0.780001 1.67,-2.1 0,-1.299999 -0.66,-2.09 -1.67,-2.09 m -0.02,0.44 c 0.45,0 0.69,0.560001 0.69,1.65 0,1.099999 -0.23,1.65 -0.69,1.65 -0.45,0 -0.69,-0.560001 -0.69,-1.65 0,-1.089999 0.25,-1.65 0.69,-1.65" id="path6840"/>
+ </g>
+</svg>
diff --git a/vtm-themes/icons/symbols/shopping/bakery.svg b/vtm-themes/icons/symbols/shopping/bakery.svg
new file mode 100755
index 00000000..b8490d1e
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/bakery.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327" transform="translate(-1.0849787,-4.3399146)">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 200.53148,120.55983 C 179.75461,120.81544 158.93331,125.73309 139.69951,135.49446 C 139.48328,135.59414 139.28186,135.71043 139.06644,135.81099 C 138.78234,135.95703 138.48655,136.06568 138.20317,136.21385 L 138.20317,136.24263 C 56.909305,174.84645 33.632664,276.90265 71.41461,352.11845 C 123.88789,461.93242 258.13839,499.47648 365.73317,464.80436 C 464.39383,437.56553 546.64649,340.44254 526.21563,230.74225 C 526.0886,230.06015 526.00533,229.38223 525.87032,228.69917 L 525.81277,228.69917 C 514.31342,152.46885 436.09489,106.71422 364.06418,124.64599 C 338.17194,131.09305 315.10898,141.8068 294.51314,155.49362 C 268.22865,132.18091 234.49669,120.14198 200.53148,120.55983 z M 399.91878,139.92593 C 402.48288,139.74553 404.89869,141.38217 405.61639,143.95453 L 411.31399,164.32778 C 411.35183,164.44702 411.39945,164.58032 411.42909,164.70186 C 412.14955,167.66966 410.31073,170.65737 407.34293,171.37784 C 404.37513,172.0983 401.38741,170.25949 400.66695,167.29168 L 394.96935,146.91844 C 394.14913,143.9786 395.8567,140.94758 398.79653,140.12736 C 399.16401,140.02483 399.55248,139.9517 399.91878,139.92593 z M 239.81041,152.7887 C 242.86175,152.66156 245.43842,155.03208 245.56556,158.08344 C 245.6927,161.13478 243.32217,163.71144 240.27082,163.83859 L 219.17818,165.45003 C 216.13478,165.68047 213.48081,163.40011 213.25037,160.35672 C 213.01994,157.31332 215.30028,154.65934 218.34368,154.42891 L 239.43632,152.81747 C 239.56065,152.80365 239.68542,152.79404 239.81041,152.7887 z M 137.33989,163.1192 C 137.70703,163.12665 138.06124,163.17901 138.43337,163.26308 L 159.09438,167.89597 C 159.21729,167.91923 159.31863,167.95074 159.43968,167.9823 C 162.39408,168.7559 164.18434,171.79021 163.41074,174.74461 C 162.63716,177.699 159.60283,179.46048 156.64844,178.68689 L 136.01621,174.02521 C 133.03911,173.35271 131.17122,170.41266 131.84372,167.43556 C 132.43218,164.8306 134.76998,163.06697 137.33989,163.1192 z M 332.66981,169.21966 C 334.44491,169.23033 336.18616,170.10635 337.24516,171.69438 C 338.93956,174.23522 338.2609,177.65433 335.72004,179.34873 L 318.51213,191.69353 C 316.03176,193.47205 312.60754,192.90779 310.829,190.4274 C 309.0505,187.94702 309.61477,184.49402 312.09514,182.71549 L 329.27427,170.37069 C 329.37331,170.29427 329.45805,170.23878 329.56203,170.16926 C 330.51485,169.53386 331.60475,169.21325 332.66981,169.21966 z M 484.77853,181.96732 C 487.82987,181.84019 490.40654,184.21072 490.53368,187.26207 C 490.66082,190.31341 488.29028,192.89008 485.23894,193.01722 L 464.1463,194.62866 C 461.1029,194.8591 458.44893,192.57875 458.21849,189.53535 C 457.98806,186.49195 460.2684,183.83798 463.3118,183.60754 L 484.40444,181.9961 C 484.52877,181.98228 484.65354,181.97267 484.77853,181.96732 z M 201.9415,188.09656 C 216.54729,188.15691 231.23013,192.41564 243.23472,200.47014 C 209.86378,237.60493 181.34731,290.27666 162.77751,331.80309 C 157.62325,342.79891 158.79323,355.70735 165.85651,365.58584 C 172.9198,375.46433 184.77618,380.77687 196.84802,379.45576 C 208.91984,378.13465 219.33914,370.39874 224.09867,359.2264 C 241.38694,320.56578 267.21524,274.70892 294.31171,244.92871 C 319.24692,271.4648 346.98733,314.64576 358.59712,348.4932 C 362.35813,360.01861 372.03311,368.6111 383.91979,370.99585 C 395.80649,373.38061 408.06043,369.18632 415.976,360.00351 C 423.89158,350.8207 426.24504,338.08643 422.13401,326.68117 C 407.76693,284.79504 376.44644,234.97259 347.11525,202.80098 C 357.61428,197.23609 368.62483,192.75739 380.29371,189.85189 C 384.60839,188.77776 389.00464,188.20588 393.41546,188.09656 C 424.29122,187.33131 455.55058,209.19145 459.6285,239.66274 L 459.77238,240.69867 L 459.97381,241.7346 C 473.59796,310.66853 414.60784,381.66113 346.51096,400.46174 L 345.82034,400.66317 L 345.12972,400.8646 C 267.5288,425.87128 166.83755,395.98007 131.7574,322.56573 L 131.61352,322.27797 L 131.46964,321.96144 C 109.9663,279.15287 124.82774,216.31489 167.81343,196.49909 L 168.5616,196.15378 L 169.30977,195.75092 C 179.26521,190.54551 190.58143,188.04963 201.9415,188.09656 z M 103.06796,225.15975 C 104.77066,225.23261 106.42259,226.10598 107.44187,227.63447 C 109.13627,230.17531 108.45761,233.6232 105.91676,235.3176 L 88.737623,247.6624 C 86.257249,249.44092 82.804234,248.84787 81.025717,246.3675 C 79.247204,243.88712 79.811475,240.43411 82.291851,238.65559 L 99.470985,226.33956 C 99.570021,226.26314 99.683518,226.17888 99.787518,226.10935 C 100.58153,225.57985 101.46054,225.26912 102.34856,225.18853 C 102.59277,225.16637 102.82471,225.14935 103.06796,225.15975 z M 357.12922,242.45399 C 359.48646,242.47698 361.6526,244.01978 362.36641,246.39627 C 363.24496,249.32116 361.57924,252.42392 358.65433,253.30246 L 338.6264,260.06476 C 335.73476,261.04142 332.58177,259.50331 331.60511,256.61167 C 330.62846,253.72004 332.19535,250.59582 335.08698,249.61916 L 355.11491,242.82808 C 355.23194,242.78391 355.34047,242.74908 355.46022,242.71297 C 356.00864,242.54825 356.58524,242.44869 357.12922,242.45399 z M 255.29177,245.70565 C 258.34312,245.57851 260.91979,247.94904 261.04692,251.00039 C 261.17406,254.05174 258.80353,256.6284 255.75218,256.75555 L 234.65954,258.36699 C 231.61615,258.59743 228.96217,256.31707 228.73174,253.27368 C 228.5013,250.23028 230.78165,247.5763 233.82505,247.34587 L 254.91769,245.73443 C 255.04202,245.72061 255.16679,245.71099 255.29177,245.70565 z M 488.20284,247.89261 C 489.26699,247.86826 490.34783,248.16579 491.31063,248.78466 L 509.12283,260.20864 C 509.23037,260.27254 509.33642,260.339 509.43936,260.41007 C 511.95091,262.1476 512.58689,265.58165 510.84937,268.0932 C 509.11184,270.60475 505.64901,271.24074 503.13747,269.50321 L 485.35404,258.07923 C 482.78658,256.42892 482.03475,252.99235 483.68505,250.42488 C 484.71649,248.82021 486.42926,247.93318 488.20284,247.89261 z M 372.20772,304.75353 C 372.57485,304.76099 372.92907,304.81335 373.3012,304.89741 L 393.93342,309.55908 C 394.05634,309.58234 394.18646,309.5851 394.30751,309.61663 C 397.2619,310.39023 399.02338,313.42456 398.24979,316.37894 C 397.47621,319.33333 394.47066,321.09482 391.51626,320.32122 L 370.88403,315.68832 C 367.90693,315.01582 366.03905,312.04699 366.71155,309.0699 C 367.3,306.46493 369.63782,304.70131 372.20772,304.75353 z M 196.38777,309.61663 C 197.45192,309.59229 198.53276,309.86104 199.49556,310.47991 L 217.30776,321.90389 C 217.4153,321.96778 217.52133,322.03427 217.62429,322.10532 C 220.13584,323.84285 220.74306,327.30568 219.00553,329.81722 C 217.26799,332.32877 213.83395,332.96476 211.3224,331.22724 L 193.5102,319.77448 C 190.94273,318.12417 190.21967,314.71637 191.86998,312.1489 C 192.90142,310.54424 194.61419,309.65721 196.38777,309.61663 z M 103.55714,310.88277 C 106.60849,310.75563 109.18516,313.12616 109.3123,316.17751 C 109.43944,319.22886 107.0689,321.80553 104.01756,321.93266 L 82.924918,323.54411 C 79.88152,323.77454 77.227549,321.49419 76.997109,318.4508 C 76.766669,315.4074 79.047022,312.75342 82.09042,312.52299 L 103.18306,310.91154 C 103.30739,310.89772 103.43216,310.88812 103.55714,310.88277 z M 486.53385,324.58003 C 488.30895,324.59071 490.0502,325.46672 491.1092,327.05475 C 492.8036,329.59559 492.09616,333.01471 489.5553,334.70911 L 472.37617,347.05391 C 469.89579,348.83243 466.44278,348.26816 464.66426,345.78778 C 462.88575,343.3074 463.45001,339.85439 465.9304,338.07587 L 483.13831,325.73107 C 483.23734,325.65465 483.32207,325.59916 483.42607,325.52963 C 484.37889,324.89424 485.46879,324.57363 486.53385,324.58003 z M 125.71448,361.70078 C 128.06936,361.77018 130.19892,363.36954 130.86535,365.75816 L 136.56295,386.1314 C 136.60079,386.25064 136.6484,386.35518 136.67805,386.47671 C 137.39851,389.44451 135.55968,392.43222 132.59189,393.15269 C 129.62409,393.87315 126.63637,392.0631 125.91591,389.09531 L 120.21831,368.72206 C 119.39809,365.78223 121.13443,362.72244 124.07427,361.90221 C 124.62548,361.74842 125.17105,361.68476 125.71448,361.70078 z M 431.42825,374.30456 C 434.47738,374.16962 437.04846,376.55018 437.1834,379.5993 L 438.13301,400.72072 C 438.14293,400.84543 438.16034,400.96971 438.16178,401.0948 C 438.19324,404.14864 435.71944,406.64587 432.66561,406.6773 C 429.61178,406.70876 427.11457,404.26374 427.08311,401.20991 L 426.13351,380.08849 C 425.99856,377.03937 428.37912,374.43951 431.42825,374.30456 z M 180.79131,416.37474 C 181.15844,416.3822 181.54143,416.43455 181.91356,416.51862 L 202.54579,421.18029 C 202.6687,421.20355 202.79882,421.23508 202.91987,421.26662 C 205.87426,422.04021 207.63575,425.04576 206.86215,428.00015 C 206.08857,430.95454 203.05424,432.71603 200.09985,431.94243 L 179.46762,427.30953 C 176.49052,426.63702 174.62263,423.66819 175.29513,420.6911 C 175.88359,418.08614 178.22139,416.32252 180.79131,416.37474 z M 373.76161,425.81319 C 376.81296,425.68605 379.38962,428.05658 379.51676,431.10793 C 379.6439,434.15928 377.27336,436.73595 374.22202,436.86308 L 353.12938,438.47453 C 350.08599,438.70496 347.432,436.42462 347.20158,433.38122 C 346.97114,430.33782 349.25148,427.68384 352.29489,427.45341 L 373.38753,425.84196 C 373.51186,425.82814 373.63662,425.81854 373.76161,425.81319 z M 262.68714,431.16548 C 263.75129,431.14114 264.83212,431.40989 265.79493,432.02876 L 283.60713,443.45274 C 283.71467,443.51663 283.82071,443.58311 283.92366,443.65417 C 286.43521,445.3917 287.04243,448.85452 285.3049,451.36607 C 283.56737,453.87762 280.13333,454.51361 277.62177,452.77608 L 259.80957,441.32333 C 257.2421,439.67302 256.51904,436.26522 258.16935,433.69775 C 259.20079,432.09308 260.91356,431.20605 262.68714,431.16548 z" id="path7165" sodipodi:nodetypes="ccsccccsccccccccssccsccsccsccccccssccsccsccsccsccsccsccccccsscccssccssccccccccccccccsccsccssccsccsccsccsccsccccccssccsccccssccsccccssccsccsccsccccsccsccsccccssccsccccssccccccssccsccsccsccccccssccsc" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="72.954"/>
+ <path d="M 200.69955,120.72558 C 179.92268,120.98119 159.10138,125.89884 139.86758,135.66021 C 139.65135,135.75989 139.44993,135.87618 139.23451,135.97674 C 138.95041,136.12277 138.65462,136.23143 138.37124,136.3796 L 138.37124,136.40838 C 57.07738,175.0122 33.80074,277.0684 71.58268,352.28419 C 124.05596,462.09817 258.30646,499.64223 365.9012,464.9701 C 464.5619,437.73127 546.8146,340.60829 526.3837,230.908 C 526.2566,230.2259 526.1734,229.54798 526.0384,228.86492 L 525.9808,228.86492 C 514.4815,152.6346 436.263,106.87997 364.2322,124.81174 C 338.34,131.2588 315.27705,141.97255 294.68121,155.65937 C 268.39672,132.34666 234.66476,120.30773 200.69955,120.72558 z M 393.5835,188.26231 C 424.4593,187.49706 455.7186,209.3572 459.7966,239.82849 L 459.9405,240.86442 L 460.1419,241.90034 C 473.766,310.83428 414.7759,381.82688 346.679,400.62749 L 345.9884,400.82892 L 345.2978,401.03035 C 267.69687,426.03703 167.00562,396.14581 131.92546,322.73148 L 131.78159,322.44372 L 131.63771,322.12719 C 110.13437,279.31862 124.99581,216.48064 167.9815,196.66484 L 168.72967,196.31953 L 169.47784,195.91667 C 192.23313,184.01858 222.06128,186.31677 243.40279,200.63589 C 210.03185,237.77068 185.51537,282.44241 166.94557,323.96884 C 161.79132,334.96466 162.97305,347.88625 170.03633,357.76474 C 177.09962,367.64323 188.94461,372.9404 201.01644,371.61929 C 213.08828,370.29817 223.50721,362.56449 228.26674,351.39214 C 245.55501,312.73153 267.38331,274.87467 294.47978,245.09446 C 319.41498,271.63055 339.1554,302.81151 350.7652,336.65895 C 354.5262,348.18436 364.2057,356.78902 376.0924,359.17378 C 387.9791,361.55853 400.2285,357.35333 408.1441,348.17052 C 416.0596,338.98771 418.4131,326.25218 414.3021,314.84692 C 399.935,272.96079 376.6145,235.13833 347.2833,202.96673 C 357.7824,197.40184 368.7929,192.92314 380.4618,190.01763 C 384.7765,188.94351 389.1727,188.37163 393.5835,188.26231 z" id="path7219" opacity=".1" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="72.954"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/shopping/bicycle.svg b/vtm-themes/icons/symbols/shopping/bicycle.svg
new file mode 100755
index 00000000..fb6ed7ce
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/bicycle.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path transform="matrix(-0.9834594,0,0,0.9834594,323.42176,-101.89163)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path596" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
+ <path transform="matrix(-0.9834594,0,0,0.9834594,653.78261,-103.3933)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path595" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
+ <path sodipodi:nodetypes="ccccc" id="path594" d="M 395.50064,219.78507 L 197.2842,220.78618 L 127.20771,350.92828 L 261.35419,350.92828 L 401.5072,255.82445" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="20.53"/>
+ <path sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc" id="path593" d="M 387.8839,141.79102 C 398.65069,141.79102 406.78894,141.55079 415.13057,154.29434 C 417.53169,158.54247 418.62948,163.72941 417.74288,168.89256 C 416.6793,174.76358 413.20345,180.53176 409.10585,183.94641 C 403.67995,188.468 398.53061,188.1192 399.36281,192.18386 C 400.43059,197.39931 403.6893,204.64686 407.21088,216.41541 C 410.78555,228.36126 415.03025,242.98187 419.1968,257.38265 C 423.36335,271.7834 427.4534,285.97209 430.69096,297.02835 C 432.30979,302.55645 433.72356,307.30328 434.80924,310.85825 C 435.867,314.32184 436.8009,317.01227 436.71466,316.82046 C 440.08774,322.75515 440.54688,326.62214 446.20457,331.67337 C 452.54809,337.22515 457.71292,341.3265 459.5054,342.57934 C 464.05823,345.88667 466.1748,352.86639 463.77059,356.31512 C 460.74069,361.01519 454.48317,361.73616 449.90974,360.33004 C 445.56716,358.95151 438.6929,356.58361 430.72172,349.98147 L 430.66024,349.88928 L 430.56804,349.8278 C 419.47658,340.31417 415.37321,328.7676 414.95565,328.09953 L 414.3717,327.20826 L 413.97216,326.2248 C 413.01109,323.85899 412.43539,321.77291 411.2984,318.04978 C 410.16138,314.32666 408.72,309.51669 407.08794,303.94329 C 403.82387,292.79653 399.75458,278.58627 395.59378,264.2054 C 391.43295,249.82454 387.19865,235.27838 383.66933,223.48403 C 380.13999,211.68969 377.91028,202.00308 377.08605,199.94246 C 375.0799,194.92714 374.05501,189.51265 375.42644,184.08417 C 376.79786,178.65571 380.89603,174.27446 384.57479,173.256 C 392.97186,170.90677 390.74383,164.86682 386.44779,164.85806 L 350.44729,164.78478 L 350.35855,141.79152 C 350.35878,141.79102 373.72637,141.79102 387.8839,141.79102 z" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="25"/>
+ <path id="path599" d="M 258.78569,346.85349 L 190.82923,180.50178" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="24.586"/>
+ <path id="path600" d="M 282.14699,304.37879 L 241.08743,399.94641" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="8.974"/>
+ <path transform="matrix(-0.2772911,0,0,0.2449148,316.20929,238.03626)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path597" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="31.31"/>
+ <path sodipodi:nodetypes="cc" id="path601" d="M 300.4261,304.42236 L 264.15616,304.75482" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="12.54"/>
+ <path sodipodi:nodetypes="cc" id="path602" d="M 259.57689,398.57363 L 223.30695,398.9061" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="12.539"/>
+ <path sodipodi:nodetypes="cssccc" id="path603" d="M 157.55855,165.63576 L 242.85812,165.63576 C 246.04359,165.63576 250.15505,171.27063 246.04359,175.01517 C 241.59685,179.24723 201.62409,187.93397 201.62409,187.93397 C 201.62409,187.93397 190.65196,190.94246 184.81192,190.2346 C 178.97192,189.52672 158.79734,187.75702 157.55855,165.63576 z" fill="#ffffff" fill-rule="evenodd" stroke-width=".695"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/shopping/book.svg b/vtm-themes/icons/symbols/shopping/book.svg
new file mode 100755
index 00000000..f0f73779
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/book.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 73.931354,159.8883 L 302.43289,419.37306 L 521.25215,293.50359 L 298.56009,35.95529 L 73.931354,159.8883 z" id="path3470" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 61.6534,188.60064 L 286.28195,444.21251 L 287.2502,541.03514 L 60.685154,284.9392 L 61.6534,188.60064 z" id="path3474" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path d="M 519.50933,327.13704 L 313.25992,447.99014 L 313.11567,451.17546 L 519.19198,330.40891 L 519.50933,327.13704 z" id="path3476" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+ <path sodipodi:nodetypes="ccccc" id="path3505" d="M 519.50933,367.13704 L 313.25992,487.99014 L 313.11567,491.17546 L 519.19198,370.40891 L 519.50933,367.13704 z" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+ <path d="M 519.50933,407.13704 L 313.25992,527.99014 L 313.11567,531.17546 L 519.19198,410.40891 L 519.50933,407.13704 z" id="path3507" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/shopping/butcher.svg b/vtm-themes/icons/symbols/shopping/butcher.svg
new file mode 100755
index 00000000..b5a764f0
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/butcher.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <defs id="defs4">
+  <clipPath id="clipoutline2">
+   <path d="M 55.8,12 L 56.56,12.16 C 65.4,9.22 85.24,20.8 80.82,31.12 C 79.7,32.74 79.89,35.62 81.24,37.43 L 56.43,62.25 C 55.04,60.86 51.95,60.89 50.53,62.25 L 9.5,101.63 C 5.76,105.22 8.7,108.27 10.28,109.88 L 17.64,117.24 C 19.25,118.84 23.5,121 26.52,117.8 L 65.24,76.99 C 66.59,75.57 66.6,72.52 65.24,71.12 C 65.24,71.12 65.25,71.1 65.24,71.1 L 90.15,46.2 C 92.78,48.57 95.263827,48.774854 97.62,48.13 C 102.17057,46.884568 104.70725,51.336643 107.43,54.59 L 106.2,55.8 C 104.38,57.64 104.55,60.74 106.59,62.78 C 108.63,64.82 111.74,64.99 113.56,63.17 L 121.7,55.04 C 123.52,53.2 123.35,50.1 121.3,48.07 C 119.46,46.22 116.79,45.98 114.93,47.3 C 109.35,41.04 112.28,40.1 104.92,31.95 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2"/>
+  </clipPath>
+  <clipPath id="clipoutline1">
+   <path d="M 22.42,17.2 L 35.38,30.15 L 32.88,38.93 L 24.1,41.43 L 11.14,28.47 L 5.28,34.33 L 20.17,55.79 L 37.73,52.45 L 99.36,118.07 C 108.8,127.58 121.53,113.32 112.7,105.2 L 46.85,42.92 L 50.86,25.16 L 28.72,10.89 L 22.42,17.2 z M 103.48,109.17 C 105.16,107.49 107.88,107.49 109.56,109.17 C 111.24,110.85 111.24,113.57 109.56,115.25 C 107.88,116.92 105.16,116.92 103.48,115.25 C 101.8,113.57 101.8,110.85 103.48,109.17 z" id="outline1"/>
+  </clipPath>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <g id="g6443" transform="matrix(1.8557014,0,0,1.8557014,-202.40231,-219.83775)">
+  <path sodipodi:nodetypes="ccccssccccccscccczzssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscccsscccc" id="path3" d="M 366.80484,182.59267 C 364.56483,182.59867 362.70184,183.20542 361.17984,183.93642 C 358.51784,185.25541 356.61484,186.95142 354.80484,188.68642 C 352.14084,191.28942 349.79159,194.13392 347.77359,196.37392 C 346.77559,197.48692 345.87909,198.45342 345.21109,199.06142 C 344.88108,199.36642 344.60809,199.58242 344.46109,199.68642 C 344.43609,199.70543 344.41459,199.70667 344.39859,199.71767 L 332.11734,204.99892 C 331.68335,204.99192 331.27709,204.99892 330.83609,204.99892 C 314.0571,205.02192 299.04434,209.89067 284.86734,214.34267 C 269.23834,219.29267 254.31134,225.17467 239.24234,228.09267 C 232.32235,229.45267 224.51934,229.82667 216.36734,230.46767 C 208.22033,231.12767 199.68584,232.02767 191.30484,234.96767 C 183.85183,237.58166 177.54059,240.54717 170.77359,244.78017 C 167.80958,246.65218 165.20309,248.90592 162.71109,250.74892 C 160.2881,252.60393 157.95809,253.90467 157.08609,254.09267 L 153.24234,256.65517 C 153.24234,256.65517 149.77993,259.30104 147.98366,260.84118 L 140.75139,267.0422 C 133.48312,273.27409 131.11334,289.03867 131.11734,297.84267 C 131.11734,297.84368 131.11734,297.84992 131.11734,297.87392 C 131.11734,297.89793 131.11734,297.95492 131.11734,297.99892 C 131.18034,311.48993 135.55684,324.24867 142.55484,335.59267 C 149.58484,346.98467 159.24609,357.05217 170.21109,365.53017 C 192.24209,382.42916 219.90559,393.42617 246.02359,393.53017 C 251.1256,393.52817 256.18934,393.10017 261.11734,392.15517 C 265.72533,391.30918 269.72959,389.11342 272.77359,386.31142 C 274.68758,384.55342 278.25859,382.57392 279.52359,380.49892 C 281.7386,379.49592 281.85084,378.10242 283.55484,376.31142 C 286.06984,373.70342 287.71634,370.82517 289.61734,367.28017 C 292.75435,361.35216 296.57634,355.02867 299.61734,348.21767 C 303.08535,340.35967 304.33259,332.07042 305.52359,324.31142 C 306.67558,316.55341 307.75784,309.29342 309.92984,303.68642 C 312.14284,297.88343 315.98759,293.00042 320.77359,287.81142 C 325.52158,282.62742 331.16634,277.26567 335.99234,270.34267 C 339.74933,264.88866 344.18384,260.06392 348.05484,253.99892 C 351.46083,248.70392 354.22684,242.19367 354.80484,234.34267 L 364.49234,229.24892 L 365.30484,228.40517 C 366.35283,227.36916 367.19759,226.92392 368.52359,226.49892 C 370.48359,225.85993 373.57759,225.73717 377.52359,225.40517 C 381.37559,225.04417 386.53884,224.24592 391.17984,220.49892 C 393.09383,218.94192 394.71309,217.28417 395.96109,215.28017 C 397.20309,213.30116 398.03359,210.86067 398.02359,208.34267 C 398.0306,206.28967 397.46859,204.30367 396.64859,202.71767 C 395.18358,199.91867 393.18709,198.16592 391.21109,196.74892 C 388.21509,194.65492 385.00734,193.29967 381.99234,192.21767 C 380.67934,191.75467 379.39809,191.34092 378.21109,190.99892 C 377.55008,189.53192 376.76909,188.19017 375.71109,186.90517 C 374.7021,185.70117 373.40809,184.57117 371.83609,183.78017 C 370.27309,182.98017 368.44984,182.58167 366.80484,182.59267 z M 366.52359,190.09267 C 368.88965,189.93172 371.00231,191.83152 372.52359,197.28017 C 379.68359,198.89017 398.83708,204.63717 386.46109,214.65517 C 378.84509,220.82117 367.83309,215.16416 359.96109,223.15517 L 347.39859,229.74892 C 347.39159,229.50992 347.37933,229.27318 347.36734,229.03017 C 344.19134,230.18317 340.9306,231.57842 337.64859,232.18642 C 337.17659,228.84642 336.43583,225.59616 335.55484,222.40517 C 333.11284,223.37217 330.1391,224.22017 327.71109,224.65517 C 328.63909,220.13317 329.67334,216.67067 331.99234,213.21767 L 347.52359,206.56142 C 352.61018,204.35054 360.47699,190.50398 366.52359,190.09267 z M 168.80484,261.43642 C 169.37605,261.41885 169.95046,261.43667 170.52359,261.43642 C 184.18759,261.46341 198.45009,266.13492 209.33609,270.24892 C 218.1811,273.61093 225.48959,276.72642 232.14859,281.06142 C 238.80958,285.38843 244.70634,290.93142 250.74234,298.81142 C 260.19735,311.16543 270.03359,326.59967 274.02359,342.71767 C 274.9826,346.63267 275.61534,351.58817 275.61734,356.78017 C 275.60434,362.50817 274.86709,368.51392 272.58609,373.74892 C 270.37808,378.93492 266.09909,383.59217 259.71109,384.78017 C 255.2961,385.62716 250.71684,386.02817 246.05484,386.03017 C 222.08785,385.99016 195.59559,375.61867 174.77359,359.59267 C 154.02959,343.56168 138.68634,321.68192 138.61734,297.87392 C 138.61533,290.14691 140.28459,282.26742 143.89859,274.56142 L 150.17984,267.56142 L 157.11734,263.31142 C 160.8851,262.13017 164.80635,261.55938 168.80484,261.43642 z M 185.55484,296.81142 C 190.19984,296.84442 195.09259,297.89267 198.77359,300.96767 C 200.18359,302.18267 201.88384,304.05992 203.42984,306.37392 C 204.93284,308.69792 206.34659,311.38092 206.39859,314.62392 C 206.40258,315.94893 206.12134,317.40467 205.36734,318.71767 C 204.35134,320.50468 202.68984,321.71367 201.05484,322.34267 C 199.40783,322.98866 197.75259,323.18242 196.14859,323.18642 C 191.78858,323.16441 187.54359,321.75842 185.39859,321.06142 L 185.11734,320.96767 L 175.71109,315.84267 L 175.33609,315.62392 L 174.99234,315.34267 C 172.15834,312.68167 170.40634,309.88642 170.36734,306.68642 C 170.35434,304.83842 171.07034,303.07017 172.11734,301.78017 C 173.16635,300.47517 174.47659,299.55467 175.89859,298.84267 C 178.74959,297.43666 182.10084,296.82342 185.55484,296.81142 z M 185.55484,303.81142 C 183.64084,303.80643 181.79109,304.11067 180.33609,304.59267 C 178.8701,305.06167 177.88409,305.74417 177.58609,306.15517 C 177.37809,306.44018 177.38034,306.50542 177.36734,306.68642 C 177.33035,306.93342 177.60709,308.09317 179.46109,309.90517 L 187.92984,314.53017 C 189.90384,315.18617 193.48559,316.20942 196.14859,316.18642 C 197.16258,316.19241 198.00334,316.04267 198.49234,315.84267 C 198.99535,315.62567 199.11559,315.46967 199.27359,315.21767 C 199.34159,315.09168 199.39459,314.96092 199.39859,314.62392 C 199.4506,313.81193 198.77334,311.93392 197.61734,310.24892 C 196.50434,308.55592 195.00009,306.97142 194.21109,306.31142 C 192.54708,304.82043 189.02084,303.77642 185.55484,303.81142 z" fill="#ffffff" stroke="#ffffff"/>
+  <path id="path6439" d="M 144.94595,333.42528 L 168.60379,360.08201 L 198.92582,378.0753 L 231.58031,387.73836 L 259.56987,389.40441 L 270.56577,382.74023 L 277.89637,370.41149 L 283.22772,330.4264 L 254.90494,277.44616 L 208.58888,258.12003 L 169.93663,254.12152 L 151.94334,260.7857 L 139.28139,272.78123 L 134.61647,292.10736 L 137.28214,315.7652 L 144.94595,333.42528 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+  <path id="path6441" d="M 323.21281,212.13718 L 345.53781,202.47411 L 364.53073,186.14687 L 374.86021,191.14501 L 390.85425,201.8077 L 393.51992,211.47076 L 384.52328,219.46778 L 366.52999,222.46666 L 341.53931,239.12711 L 313.54974,235.46181 L 323.21281,212.13718 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/butcher2.svg b/vtm-themes/icons/symbols/shopping/butcher2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/butcher2.svg
rename to vtm-themes/icons/symbols/shopping/butcher2.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/car.svg b/vtm-themes/icons/symbols/shopping/car.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/car.svg
rename to vtm-themes/icons/symbols/shopping/car.svg
diff --git a/vtm-themes/icons/symbols/shopping/car_repair.svg b/vtm-themes/icons/symbols/shopping/car_repair.svg
new file mode 100755
index 00000000..e3ec71d2
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/car_repair.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <defs id="defs4">
+  <clipPath id="clipoutline2">
+   <path d="M 55.8,12 L 56.56,12.16 C 65.4,9.22 85.24,20.8 80.82,31.12 C 79.7,32.74 79.89,35.62 81.24,37.43 L 56.43,62.25 C 55.04,60.86 51.95,60.89 50.53,62.25 L 9.5,101.63 C 5.76,105.22 8.7,108.27 10.28,109.88 L 17.64,117.24 C 19.25,118.84 23.5,121 26.52,117.8 L 65.24,76.99 C 66.59,75.57 66.6,72.52 65.24,71.12 C 65.24,71.12 65.25,71.1 65.24,71.1 L 90.15,46.2 C 92.78,48.57 95.263827,48.774854 97.62,48.13 C 102.17057,46.884568 104.70725,51.336643 107.43,54.59 L 106.2,55.8 C 104.38,57.64 104.55,60.74 106.59,62.78 C 108.63,64.82 111.74,64.99 113.56,63.17 L 121.7,55.04 C 123.52,53.2 123.35,50.1 121.3,48.07 C 119.46,46.22 116.79,45.98 114.93,47.3 C 109.35,41.04 112.28,40.1 104.92,31.95 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2"/>
+  </clipPath>
+  <clipPath id="clipoutline1">
+   <path d="M 22.42,17.2 L 35.38,30.15 L 32.88,38.93 L 24.1,41.43 L 11.14,28.47 L 5.28,34.33 L 20.17,55.79 L 37.73,52.45 L 99.36,118.07 C 108.8,127.58 121.53,113.32 112.7,105.2 L 46.85,42.92 L 50.86,25.16 L 28.72,10.89 L 22.42,17.2 z M 103.48,109.17 C 105.16,107.49 107.88,107.49 109.56,109.17 C 111.24,110.85 111.24,113.57 109.56,115.25 C 107.88,116.92 105.16,116.92 103.48,115.25 C 101.8,113.57 101.8,110.85 103.48,109.17 z" id="outline1"/>
+  </clipPath>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 141.14967,158.36231 C 119.80221,158.36231 108.47786,170.01662 103.24986,183.65843 L 75.498084,255.31598 C 64.496777,256.72664 44.994807,269.64014 44.994807,294.10338 L 44.994807,385.22859 L 72.006925,385.22859 L 72.006925,414.37092 C 72.006925,450.22454 122.7471,449.80228 122.74711,414.37092 L 122.74711,385.22859 L 214.02027,385.22859 L 214.0499,385.22859 L 305.32301,385.22859 L 305.32301,414.37092 C 305.32301,449.80228 356.06294,450.22454 356.06323,414.37092 L 356.06323,385.22859 L 383.0753,385.22859 L 383.0753,294.10338 C 383.0753,269.64016 363.57346,256.72664 352.57197,255.31598 L 324.79067,183.65843 C 319.56268,170.01662 308.23843,158.36231 286.89082,158.36231 L 247.65972,158.36231 L 180.85418,158.36231 L 141.14967,158.36231 z M 140.82422,184.45726 L 213.9611,184.45726 L 214.02027,184.45726 L 214.0499,184.45726 L 287.21631,184.45726 C 296.36479,184.54244 300.28296,190.26369 302.89693,198.1852 L 323.81428,254.57634 L 214.0499,254.57634 L 214.02027,254.57634 L 213.9611,254.57634 L 104.22621,254.57634 L 125.14358,198.1852 C 127.75759,190.26369 131.67476,184.54244 140.82422,184.45726 z M 98.190635,282.00266 C 111.13564,282.00266 121.62284,292.80323 121.62284,306.14492 C 121.62283,319.48756 111.13564,330.31678 98.190635,330.31678 C 85.246593,330.31678 74.758433,319.48754 74.758433,306.14492 C 74.758433,292.80326 85.246593,282.00266 98.190635,282.00266 z M 329.87947,282.00266 C 342.82447,282.00266 353.31176,292.80326 353.31167,306.14492 C 353.31167,319.48754 342.82447,330.31678 329.87947,330.31678 C 316.93544,330.31678 306.41763,319.48756 306.41763,306.14492 C 306.41763,292.80323 316.93544,282.00266 329.87947,282.00266 z" id="path2301" fill="#ffffff"/>
+ <g id="spanner" transform="matrix(-1.9177282,-1.988248,1.988248,-1.9177282,460.24478,551.21965)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="2.347">
+  <use height="580" width="580" xlink:href="#outline1" id="use4649" stroke-width="2.347"/>
+  <use height="580" width="580" xlink:href="#outline1" id="use4651" stroke-width="2.347"/>
+  <use height="580" width="580" xlink:href="#outline1" id="use4653" stroke-width="2.347"/>
+  <use height="580" width="580" xlink:href="#outline1" clip-path="url(#clipoutline1)" id="use4655" stroke-width="2.347"/>
+  <path d="M 24.33,15.4 L 37.78,28.78 L 34.45,40.47 L 23.5,43.74 L 9.9319417,30 L 5.2,34.54 L 19.4,54.48 L 38.3,50.34 L 100.8,116.7 C 108.3,125 121,114.03 111.94,105.1 L 45.04,42 L 48.9,24.83 L 28.94,10.8 L 24.33,15.4 z M 104.3,108.7 C 105.97,107.03 108.93,106.7 110.6,108.4 C 112.3,110.07 113.66,113.03 111.25,116.24 C 109.25,118.24 106.05,118.16 104.05,116 C 102.37,114.32 102.6,110.4 104.3,108.7 z" id="path4657" stroke-width="2.347"/>
+  <path d="M 24.2,15.42 L 47.67,39.07 L 50.89,25.2 L 28.79,10.8 L 24.2,15.42 z" id="path4659" stroke-width="2.347"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/clothes.svg b/vtm-themes/icons/symbols/shopping/clothes.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/clothes.svg
rename to vtm-themes/icons/symbols/shopping/clothes.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/computer.svg b/vtm-themes/icons/symbols/shopping/computer.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/computer.svg
rename to vtm-themes/icons/symbols/shopping/computer.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/confectionery.svg b/vtm-themes/icons/symbols/shopping/confectionery.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/confectionery.svg
rename to vtm-themes/icons/symbols/shopping/confectionery.svg
diff --git a/vtm-themes/icons/symbols/shopping/convenience.svg b/vtm-themes/icons/symbols/shopping/convenience.svg
new file mode 100755
index 00000000..0c23d830
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/convenience.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g10747" transform="translate(32,66)">
+  <path sodipodi:nodetypes="ccccc" id="path3264" d="M 477.06925,164.57688 L 48.196494,164.57688 L 97.86424,376.40271 L 427.39502,374.94461 L 477.06925,164.57688 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.17"/>
+  <path sodipodi:nodetypes="cc" d="M 128.06871,165.73536 L 128.06871,363.20709" id="path3268" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+  <path id="path3280" d="M 86.424707,243.00115 L 445.19209,243.00115" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+  <path sodipodi:nodetypes="cc" id="path3318" d="M 215.1525,165.73536 L 215.1525,363.25095" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+  <path sodipodi:nodetypes="cc" d="M 306.2363,165.73536 L 306.2363,372.15933" id="path3320" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+  <path sodipodi:nodetypes="cc" id="path3322" d="M 395.3201,165.73536 L 395.3201,373.5219" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+  <path sodipodi:nodetypes="cc" d="M 104.24147,322.08495 L 427.37533,322.08495" id="path3324" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ </g>
+ <path d="M 287.11282,222.95322 L 340.84305,78.558998 L 356.51268,84.389791 L 302.02568,230.81774 L 287.11282,222.95322 z" id="path10756" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/copyshop.svg b/vtm-themes/icons/symbols/shopping/copyshop.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/copyshop.svg
rename to vtm-themes/icons/symbols/shopping/copyshop.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/department_store.svg b/vtm-themes/icons/symbols/shopping/department_store.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/department_store.svg
rename to vtm-themes/icons/symbols/shopping/department_store.svg
diff --git a/vtm-themes/icons/symbols/shopping/diy.svg b/vtm-themes/icons/symbols/shopping/diy.svg
new file mode 100755
index 00000000..d0daad03
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/diy.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r="0.8" id="circle4300"/>
+    <circle cx="6.5" r="0.8" id="circle4302"/>
+    <circle cx="10" r="0.8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity="0.75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+            <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width="0.125"/></marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <filter y="0" x="0" filterUnits="userSpaceOnUse" id="ShadowBlur">
+   <feGaussianBlur id="feGaussianBlur6" stdDeviation="2" in="SourceGraphic"/>
+  </filter>
+  <clipPath id="clipoutline2">
+   <path d="M 55.8,12 L 56.56,12.16 C 65.4,9.22 85.24,20.8 80.82,31.12 C 79.7,32.74 79.89,35.62 81.24,37.43 L 56.43,62.25 C 55.04,60.86 51.95,60.89 50.53,62.25 L 9.5,101.63 C 5.76,105.22 8.7,108.27 10.28,109.88 L 17.64,117.24 C 19.25,118.84 23.5,121 26.52,117.8 L 65.24,76.99 C 66.59,75.57 66.6,72.52 65.24,71.12 C 65.24,71.12 65.25,71.1 65.24,71.1 L 90.15,46.2 C 92.78,48.57 95.263827,48.774854 97.62,48.13 C 102.17057,46.884568 104.70725,51.336643 107.43,54.59 L 106.2,55.8 C 104.38,57.64 104.55,60.74 106.59,62.78 C 108.63,64.82 111.74,64.99 113.56,63.17 L 121.7,55.04 C 123.52,53.2 123.35,50.1 121.3,48.07 C 119.46,46.22 116.79,45.98 114.93,47.3 C 109.35,41.04 112.28,40.1 104.92,31.95 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2"/>
+  </clipPath>
+  <clipPath id="clipoutline1">
+   <path d="M 22.42,17.2 L 35.38,30.15 L 32.88,38.93 L 24.1,41.43 L 11.14,28.47 L 5.28,34.33 L 20.17,55.79 L 37.73,52.45 L 99.36,118.07 C 108.8,127.58 121.53,113.32 112.7,105.2 L 46.85,42.92 L 50.86,25.16 L 28.72,10.89 L 22.42,17.2 z M 103.48,109.17 C 105.16,107.49 107.88,107.49 109.56,109.17 C 111.24,110.85 111.24,113.57 109.56,115.25 C 107.88,116.92 105.16,116.92 103.48,115.25 C 101.8,113.57 101.8,110.85 103.48,109.17 z" id="outline1"/>
+  </clipPath>
+  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.30267,-3.20138)" y2="86.68" x2="84.3" y1="66.2" x1="73.88" id="lgdg" xlink:href="#BlackTransparent"/>
+  <linearGradient gradientTransform="matrix(0.26,0,0,0.26,-106.57,101.57)" gradientUnits="userSpaceOnUse" y2="-241.2" x2="655.42" y1="-137.5" x1="550.96" id="lg55" xlink:href="#WhiteTransparent"/>
+  <linearGradient gradientTransform="matrix(0.2,0,0,0.2,-80.94,88.3)" gradientUnits="userSpaceOnUse" y2="-186.26" x2="607.66" y1="-252.6" x1="646.24" id="lg51" xlink:href="#WhiteTransparent"/>
+  <linearGradient y2="6037.53" x2="2375.5" y1="6145.31" x1="2482.96" id="lg19" xlink:href="#BlackTransparent" gradientUnits="userSpaceOnUse"/>
+  <linearGradient gradientTransform="matrix(7.75e-2,7.75e-2,-0.36,0.36,78.84,-44.8)" gradientUnits="userSpaceOnUse" x2="626.1" x1="577.03" id="lg16" xlink:href="#WhiteTransparent"/>
+  <linearGradient gradientTransform="matrix(0.3,0.3,-9e-2,9e-2,78.84,-44.8)" gradientUnits="userSpaceOnUse" y2="368.27" x2="0" y1="288.57" id="lg12" xlink:href="#WhiteTransparent"/>
+  <linearGradient gradientTransform="matrix(0.33,0.33,-9.44e-2,9.44e-2,9.03,-48.1)" gradientUnits="userSpaceOnUse" y2="-1.72" x2="0" y1="62.74" id="lg09" xlink:href="#WhiteTransparent"/>
+  <linearGradient gradientTransform="matrix(9.98e-2,9.98e-2,-0.28,0.28,78.84,-44.8)" gradientUnits="userSpaceOnUse" x2="419.88" x1="543.1" id="lg05" xlink:href="#BlackTransparent"/>
+  <linearGradient gradientTransform="matrix(8.07e-2,7.75e-2,-0.35,0.36,77.14,-45.89)" gradientUnits="userSpaceOnUse" y2="254.83" x2="615.59" y1="254.36" x1="512.7" id="lg02" xlink:href="#WhiteTransparent"/>
+  <linearGradient gradientTransform="matrix(0.1,0.1,-0.22,0.2,75.6,-33.53)" gradientUnits="userSpaceOnUse" y2="118.3" x2="638.3" y1="69.99" x1="637.03" id="lg1999" xlink:href="#WhiteTransparent"/>
+  <linearGradient id="BlackTransparent">
+   <stop id="stop4625"/>
+   <stop id="stop4627" offset="1" stop-opacity="0"/>
+  </linearGradient>
+  <linearGradient id="WhiteTransparent">
+   <stop id="stop4620" stop-color="#ffffff"/>
+   <stop id="stop4622" offset="1" stop-color="#ffffff" stop-opacity="0"/>
+  </linearGradient>
+  <linearGradient inkscape:collect="always" xlink:href="#BlackTransparent" id="linearGradient4756" gradientUnits="userSpaceOnUse" gradientTransform="matrix(5.1645214,0,0,5.1645214,646.72889,-106.63978)" x1="73.88" y1="66.2" x2="84.3" y2="86.68"/>
+  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4780" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5164521,0.5164521,-1.1361947,1.0329043,1038.7299,-263.27259)" x1="637.03" y1="69.99" x2="638.3" y2="118.3"/>
+  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4784" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.4167769,0.4002504,-1.8075825,1.8592277,1046.6832,-327.10608)" x1="512.7" y1="254.36" x2="615.59" y2="254.83"/>
+  <linearGradient inkscape:collect="always" xlink:href="#BlackTransparent" id="linearGradient4787" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5154192,0.5154192,-1.446066,1.446066,1055.4629,-321.47675)" x1="543.1" x2="419.88"/>
+  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4791" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7042921,1.7042921,-0.4875308,0.4875308,694.92767,-338.51967)" y1="62.74" x2="0" y2="-1.72"/>
+  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4794" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5493564,1.5493564,-0.4648069,0.4648069,1055.4629,-321.47675)" y1="288.57" x2="0" y2="368.27"/>
+  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4798" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.4002504,0.4002504,-1.8592277,1.8592277,1055.4629,-321.47675)" x1="577.03" x2="626.1"/>
+  <linearGradient inkscape:collect="always" xlink:href="#BlackTransparent" id="linearGradient4801" gradientUnits="userSpaceOnUse" x1="2482.96" y1="6145.31" x2="2375.5" y2="6037.53" gradientTransform="matrix(5.1645214,0,0,5.1645214,648.29204,-90.106189)"/>
+  <clipPath id="clipoutline2-1">
+   <path d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2-7"/>
+  </clipPath>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" stroke-width="3.408" stroke="#eee" fill="#ac39ac"/>
+ </g>
+ <g id="spanner" transform="matrix(-2.39037,-2.47827,2.47827,-2.39037,402.26708,618.45764)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="2.347">
+  <use height="580" width="580" xlink:href="#outline1" id="use4649"/>
+  <use height="580" width="580" xlink:href="#outline1" id="use4651"/>
+  <use height="580" width="580" xlink:href="#outline1" id="use4653"/>
+  <use height="580" width="580" xlink:href="#outline1" clip-path="url(#clipoutline1)" id="use4655"/>
+  <path d="M 24.33,15.4 L 37.78,28.78 L 34.45,40.47 L 23.5,43.74 L 9.9319417,30 L 5.2,34.54 L 19.4,54.48 L 38.3,50.34 L 100.8,116.7 C 108.3,125 121,114.03 111.94,105.1 L 45.04,42 L 48.9,24.83 L 28.94,10.8 L 24.33,15.4 z M 104.3,108.7 C 105.97,107.03 108.93,106.7 110.6,108.4 C 112.3,110.07 113.66,113.03 111.25,116.24 C 109.25,118.24 106.05,118.16 104.05,116 C 102.37,114.32 102.6,110.4 104.3,108.7 z" id="path4657"/>
+  <path d="M 24.2,15.42 L 47.67,39.07 L 50.89,25.2 L 28.79,10.8 L 24.2,15.42 z" id="path4659"/>
+ </g>
+ <g id="hammer" transform="matrix(2.5848118,-2.5382215,2.5382215,2.5848118,-128.23765,257.86414)" fill="#ffffff" stroke="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="2.347">
+  <path d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="path5678" inkscape:connector-curvature="0" stroke-width="2.347"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/estateagent.svg b/vtm-themes/icons/symbols/shopping/estateagent.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/estateagent.svg
rename to vtm-themes/icons/symbols/shopping/estateagent.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/estateagent2.svg b/vtm-themes/icons/symbols/shopping/estateagent2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/estateagent2.svg
rename to vtm-themes/icons/symbols/shopping/estateagent2.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/estateagent3.svg b/vtm-themes/icons/symbols/shopping/estateagent3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/estateagent3.svg
rename to vtm-themes/icons/symbols/shopping/estateagent3.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/fish.svg b/vtm-themes/icons/symbols/shopping/fish.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/fish.svg
rename to vtm-themes/icons/symbols/shopping/fish.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/florist.svg b/vtm-themes/icons/symbols/shopping/florist.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/florist.svg
rename to vtm-themes/icons/symbols/shopping/florist.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/garden_centre.svg b/vtm-themes/icons/symbols/shopping/garden_centre.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/garden_centre.svg
rename to vtm-themes/icons/symbols/shopping/garden_centre.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/gift.svg b/vtm-themes/icons/symbols/shopping/gift.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/gift.svg
rename to vtm-themes/icons/symbols/shopping/gift.svg
diff --git a/vtm-themes/icons/symbols/shopping/greengrocer.svg b/vtm-themes/icons/symbols/shopping/greengrocer.svg
new file mode 100755
index 00000000..141100df
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/greengrocer.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.79354273,1.2601716)" xlink:href="#linearGradient829" id="radialGradient874" cx="180.25" cy="198.42" r="101.58"/>
+  <linearGradient id="linearGradient829">
+   <stop id="stop830" stop-color="#ffffff" stop-opacity=".342"/>
+   <stop offset="1" id="stop831" stop-color="#ffffff" stop-opacity="0"/>
+  </linearGradient>
+  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.007004,0.99304475)" xlink:href="#linearGradient829" id="radialGradient832" cx="360.85" cy="167.47" r="46.39"/>
+  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.74491357,1.3424376)" xlink:href="#linearGradient855" id="linearGradient850" x1="465.29" y1="248.24" x2="463.27" y2="405.77"/>
+  <linearGradient id="linearGradient855">
+   <stop id="stop856" stop-color="#ffffff" stop-opacity="0"/>
+   <stop offset="1" id="stop857" stop-color="#ffa617" stop-opacity=".733"/>
+  </linearGradient>
+  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.4586159,0.68558144)" xlink:href="#linearGradient855" id="linearGradient854" x1="157.81" y1="120.96" x2="155.41" y2="231.63"/>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g8499">
+  <path d="M 472.00214,95.129535 C 472.00214,95.129535 434.20859,223.21789 323.16094,185.0368 C 323.14167,185.11689 336.56042,73.44468 472.00214,95.129535 z" id="path6571" fill="#ffffff"/>
+  <path d="M 285.86201,253.57666 C 305.05175,234.59325 331.25716,223.1413 360.3512,223.1413 C 419.05538,223.1413 466.82345,270.703 466.82345,329.5103 C 466.82345,331.67689 466.82345,333.53396 466.72029,335.80372 H 466.51397 C 464.65689,358.81079 457.33177,387.38908 439.999,422.87982 C 439.999,422.87982 410.18268,479.93322 386.24705,506.13857 L 384.08049,508.202 C 372.5254,519.8603 356.2244,527.18541 338.58229,527.18541 C 316.91638,527.18541 297.72663,516.66199 286.06834,500.36102 H 285.75883 C 274.10053,516.66199 254.91079,527.18541 233.24494,527.18541 C 215.3964,527.18541 199.30176,519.96345 187.64347,508.202 L 185.4769,506.13857 C 161.74763,479.93322 131.72495,422.87982 131.72495,422.87982 C 114.39227,387.38908 107.06715,358.60446 105.41641,335.80372 H 104.90056 C 104.59105,333.63715 104.59105,331.78007 104.59105,329.5103 C 104.59105,270.703 152.3591,223.1413 211.26957,223.1413 C 240.26053,223.1413 266.46591,234.59325 285.86201,253.57666" id="path6573" fill="#ffffff"/>
+  <path id="path10957" d="M 128.25883,55.38435 C 128.25883,55.38435 150.71409,167.29081 248.14354,143.21279 C 248.15388,143.28245 245.20296,47.199967 128.25883,55.38435 z" fill="#ffffff"/>
+  <path id="path10959" d="M 282.75941,231.04959 C 282.75941,231.04959 281.6773,116.14689 269.774,86.172268 C 257.8707,56.197648 309.81236,86.172268 309.81236,86.172268 L 282.75941,231.04959 z" fill="#ffffff" stroke="#ffffff" stroke-width="4.836"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/hairdresser.svg b/vtm-themes/icons/symbols/shopping/hairdresser.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/hairdresser.svg
rename to vtm-themes/icons/symbols/shopping/hairdresser.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/hearing_aids.svg b/vtm-themes/icons/symbols/shopping/hearing_aids.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/hearing_aids.svg
rename to vtm-themes/icons/symbols/shopping/hearing_aids.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/hifi.svg b/vtm-themes/icons/symbols/shopping/hifi.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/hifi.svg
rename to vtm-themes/icons/symbols/shopping/hifi.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/jewelry.svg b/vtm-themes/icons/symbols/shopping/jewelry.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/jewelry.svg
rename to vtm-themes/icons/symbols/shopping/jewelry.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/jewelry2.svg b/vtm-themes/icons/symbols/shopping/jewelry2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/jewelry2.svg
rename to vtm-themes/icons/symbols/shopping/jewelry2.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/kiosk.svg b/vtm-themes/icons/symbols/shopping/kiosk.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/kiosk.svg
rename to vtm-themes/icons/symbols/shopping/kiosk.svg
diff --git a/vtm-themes/icons/symbols/shopping/laundrette.svg b/vtm-themes/icons/symbols/shopping/laundrette.svg
new file mode 100755
index 00000000..019ad675
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/laundrette.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 82.4375 65.40625 L 82.4375 520.375 L 494.21875 520.375 L 494.21875 65.40625 L 82.4375 65.40625 z M 286 198.09375 C 341.22173 198.09375 386.03125 242.93453 386.03125 298.15625 C 386.03124 353.37798 341.22172 398.1875 286 398.1875 C 230.77828 398.1875 185.9375 353.37797 185.9375 298.15625 C 185.9375 242.93453 230.77828 198.09375 286 198.09375 z " id="rect7039" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.955"/>
+ <g id="g7055" transform="matrix(1.0477726,0,0,1.0477726,-9.5831747,-13.991926)">
+  <path transform="translate(4.3399146,21.699573)" d="m 373.23267,276.20596 c 0,52.73111 -42.74701,95.47812 -95.47812,95.47812 -52.73111,0 -95.47812,-42.74701 -95.47812,-95.47812 0,-52.73111 42.74701,-95.47812 95.47812,-95.47812 52.73111,0 95.47812,42.74701 95.47812,95.47812 z" sodipodi:ry="95.478119" sodipodi:rx="95.478119" sodipodi:cy="276.20596" sodipodi:cx="277.75455" id="path7043" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+  <path sodipodi:nodetypes="cc" id="path7045" d="M 190.78628,250.19634 L 190.78628,349.95467" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.665"/>
+  <path id="path7047" d="M 370.09478,300.0755 L 350.20059,300.0755" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="39.801"/>
+ </g>
+ <path sodipodi:type="arc" id="path7049" sodipodi:cx="340.68329" sodipodi:cy="124.30897" sodipodi:rx="10.849787" sodipodi:ry="10.849787" d="M 351.53308,124.30897 A 10.849787,10.849787 0 1 1 329.8335,124.30897 A 10.849787,10.849787 0 1 1 351.53308,124.30897 z" transform="matrix(0.853028,0,0,0.853028,92.865028,12.025478)" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
+ <path transform="matrix(0.853028,0,0,0.853028,150.14226,12.025478)" d="M 351.53308,124.30897 A 10.849787,10.849787 0 1 1 329.8335,124.30897 A 10.849787,10.849787 0 1 1 351.53308,124.30897 z" sodipodi:ry="10.849787" sodipodi:rx="10.849787" sodipodi:cy="124.30897" sodipodi:cx="340.68329" id="path7051" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
+ <path transform="matrix(0.853028,0,0,0.853028,35.587804,12.025478)" d="M 351.53308,124.30897 A 10.849787,10.849787 0 1 1 329.8335,124.30897 A 10.849787,10.849787 0 1 1 351.53308,124.30897 z" sodipodi:ry="10.849787" sodipodi:rx="10.849787" sodipodi:cy="124.30897" sodipodi:cx="340.68329" id="path7053" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
+ <path id="path7099" d="M 82.4375,65.40625 L 82.4375,520.375 L 494.21875,520.375 L 494.21875,65.40625 L 82.4375,65.40625 z M 286,198.09375 C 341.22173,198.09375 386.03125,242.93453 386.03125,298.15625 C 386.03124,353.37798 341.22172,398.1875 286,398.1875 C 230.77828,398.1875 185.9375,353.37797 185.9375,298.15625 C 185.9375,242.93453 230.77828,198.09375 286,198.09375 z" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.955"/>
+ <path transform="matrix(1.0477726,0,0,1.0477726,-5.0359311,8.744292)" d="M 373.23267,276.20596 A 95.478119,95.478119 0 1 1 182.27643,276.20596 A 95.478119,95.478119 0 1 1 373.23267,276.20596 z" sodipodi:ry="95.478119" sodipodi:rx="95.478119" sodipodi:cy="276.20596" sodipodi:cx="277.75455" id="path7103" sodipodi:type="arc" opacity=".2" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/shopping/marketplace.svg b/vtm-themes/icons/symbols/shopping/marketplace.svg
new file mode 100755
index 00000000..50b5f76c
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/marketplace.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.79354273,1.2601716)" xlink:href="#linearGradient829" id="radialGradient874" cx="180.25" cy="198.42" r="101.58"/>
+  <linearGradient id="linearGradient829">
+   <stop id="stop830" stop-color="#ffffff" stop-opacity=".342"/>
+   <stop offset="1" id="stop831" stop-color="#ffffff" stop-opacity="0"/>
+  </linearGradient>
+  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.007004,0.99304475)" xlink:href="#linearGradient829" id="radialGradient832" cx="360.85" cy="167.47" r="46.39"/>
+  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.74491357,1.3424376)" xlink:href="#linearGradient855" id="linearGradient850" x1="465.29" y1="248.24" x2="463.27" y2="405.77"/>
+  <linearGradient id="linearGradient855">
+   <stop id="stop856" stop-color="#ffffff" stop-opacity="0"/>
+   <stop offset="1" id="stop857" stop-color="#ffa617" stop-opacity=".733"/>
+  </linearGradient>
+  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.4586159,0.68558144)" xlink:href="#linearGradient855" id="linearGradient854" x1="157.81" y1="120.96" x2="155.41" y2="231.63"/>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 52.563382,155.99203 c 29.546561,13.99402 60.765028,15.58941 94.300788,0 l 29.70446,-102.365016 -74.17088,0 z" id="path3250" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3252" d="m 147.18933,155.99203 c 29.54656,13.99402 60.76502,15.58941 94.30078,0 l 10.19396,-102.365016 -74.17088,0 z" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <path d="m 240.83975,155.99203 c 29.54656,13.99402 60.76502,15.58941 94.30078,0 l -9.31654,-102.365016 -74.17089,0 z" id="path3039" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3041" d="m 335.46569,155.99203 c 29.54656,13.99402 60.76503,15.58941 94.30079,0 l -28.82705,-102.365016 -74.17089,0 z" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <path d="m 429.11611,155.99203 c 29.54656,13.99402 60.76503,15.58941 94.30079,0 l -48.33756,-102.365016 -74.17088,0 z" id="path3043" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <g id="g4244" transform="translate(0,14)">
+  <path inkscape:connector-curvature="0" id="path3834" d="m 88.674599,376.21895 399.655541,0" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.988"/>
+  <path d="m 126.70277,514.91701 0,-130.49777" id="path3846" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
+  <path inkscape:connector-curvature="0" id="path3848" d="m 446.26059,514.91701 0,-130.49777" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
+ </g>
+ <g id="g4238" transform="matrix(1.0962905,0,0,1.0962905,3.593298,-35.169215)">
+  <path d="m 209.74503,225.79765 c 0,0 -10.56174,35.79543 -41.59499,25.12539 -0.005,0.0224 3.7446,-31.18541 41.59499,-25.12539 z" id="path6571" inkscape:connector-curvature="0" fill="#ffffff"/>
+  <path d="m 157.72652,270.07711 c 5.36274,-5.30508 12.68607,-8.50543 20.81666,-8.50543 16.40541,0 29.75463,13.29154 29.75463,29.72577 0,0.60547 0,1.12444 -0.0288,1.75875 h -0.0576 c -0.51898,6.42953 -2.56606,14.41598 -7.40985,24.33419 0,0 -8.33244,15.94407 -15.02146,23.2674 l -0.60547,0.57664 c -3.22916,3.25801 -7.78462,5.30508 -12.71487,5.30508 -6.05474,0 -11.41748,-2.94086 -14.67549,-7.49631 h -0.0865 c -3.25802,4.55545 -8.62076,7.49631 -14.67547,7.49631 -4.98794,0 -9.48572,-2.01824 -12.74374,-5.30508 l -0.60546,-0.57664 c -6.63136,-7.32333 -15.02146,-23.2674 -15.02146,-23.2674 -4.84377,-9.91821 -6.89084,-17.96232 -7.35216,-24.33419 h -0.14415 c -0.0865,-0.60547 -0.0865,-1.12445 -0.0865,-1.75875 0,-16.43423 13.34921,-29.72577 29.81226,-29.72577 8.10178,0 15.42511,3.20035 20.84552,8.50543" id="path6573" inkscape:connector-curvature="0" fill="#ffffff"/>
+  <path id="path10957" d="m 113.68291,214.69051 c 0,0 6.27532,31.27326 33.50285,24.54444 0.003,0.0195 -0.82177,-26.83164 -33.50285,-24.54444 z" inkscape:connector-curvature="0" fill="#ffffff"/>
+  <path id="path10959" d="m 156.85947,263.78173 c 0,0 -0.30241,-32.11059 -3.62889,-40.48726 -3.32648,-8.37667 11.18908,0 11.18908,0 l -7.56019,40.48726 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-width="1.351"/>
+ </g>
+ <g id="g6443" transform="matrix(0.61265013,0,0,0.61265013,223.35252,104.87275)">
+  <path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccssccccccscccczzssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscccsscccc" id="path3" d="m 366.80484,182.59267 c -2.24001,0.006 -4.103,0.61275 -5.625,1.34375 -2.662,1.31899 -4.565,3.015 -6.375,4.75 -2.664,2.603 -5.01325,5.4475 -7.03125,7.6875 -0.998,1.113 -1.8945,2.0795 -2.5625,2.6875 -0.33001,0.305 -0.603,0.521 -0.75,0.625 -0.025,0.019 -0.0465,0.0203 -0.0625,0.0312 l -12.28125,5.28125 c -0.43399,-0.007 -0.84025,0 -1.28125,0 -16.77899,0.023 -31.79175,4.89175 -45.96875,9.34375 -15.629,4.95 -30.556,10.832 -45.625,13.75 -6.91999,1.36 -14.723,1.734 -22.875,2.375 -8.14701,0.66 -16.6815,1.56 -25.0625,4.5 -7.45301,2.61399 -13.76425,5.5795 -20.53125,9.8125 -2.96401,1.87201 -5.5705,4.12575 -8.0625,5.96875 -2.42299,1.85501 -4.753,3.15575 -5.625,3.34375 l -3.84375,2.5625 c 0,0 -3.46241,2.64587 -5.25868,4.18601 l -7.23227,6.20102 c -7.26827,6.23189 -9.63805,21.99647 -9.63405,30.80047 0,10e-4 0,0.007 0,0.0312 0,0.024 0,0.081 0,0.125 0.063,13.49101 4.4395,26.24975 11.4375,37.59375 7.03,11.392 16.69125,21.4595 27.65625,29.9375 22.031,16.89899 49.6945,27.896 75.8125,28 5.10201,-0.002 10.16575,-0.43 15.09375,-1.375 4.60799,-0.84599 8.61225,-3.04175 11.65625,-5.84375 1.91399,-1.758 5.485,-3.7375 6.75,-5.8125 2.21501,-1.003 2.32725,-2.3965 4.03125,-4.1875 2.515,-2.608 4.1615,-5.48625 6.0625,-9.03125 3.13701,-5.92801 6.959,-12.2515 10,-19.0625 3.46801,-7.858 4.71525,-16.14725 5.90625,-23.90625 1.15199,-7.75801 2.23425,-15.018 4.40625,-20.625 2.213,-5.80299 6.05775,-10.686 10.84375,-15.875 4.74799,-5.184 10.39275,-10.54575 15.21875,-17.46875 3.75699,-5.45401 8.1915,-10.27875 12.0625,-16.34375 3.40599,-5.295 6.172,-11.80525 6.75,-19.65625 l 9.6875,-5.09375 0.8125,-0.84375 c 1.04799,-1.03601 1.89275,-1.48125 3.21875,-1.90625 1.96,-0.63899 5.054,-0.76175 9,-1.09375 3.852,-0.361 9.01525,-1.15925 13.65625,-4.90625 1.91399,-1.557 3.53325,-3.21475 4.78125,-5.21875 1.242,-1.97901 2.0725,-4.4195 2.0625,-6.9375 0.007,-2.053 -0.555,-4.039 -1.375,-5.625 -1.46501,-2.799 -3.4615,-4.55175 -5.4375,-5.96875 -2.996,-2.094 -6.20375,-3.44925 -9.21875,-4.53125 -1.313,-0.463 -2.59425,-0.87675 -3.78125,-1.21875 -0.66101,-1.467 -1.442,-2.80875 -2.5,-4.09375 -1.00899,-1.204 -2.303,-2.334 -3.875,-3.125 -1.563,-0.8 -3.38625,-1.1985 -5.03125,-1.1875 z m -0.28125,7.5 c 2.36606,-0.16095 4.47872,1.73885 6,7.1875 7.16,1.61 26.31349,7.357 13.9375,17.375 -7.616,6.166 -18.628,0.50899 -26.5,8.5 l -12.5625,6.59375 c -0.007,-0.239 -0.0193,-0.47574 -0.0312,-0.71875 -3.176,1.153 -6.43674,2.54825 -9.71875,3.15625 -0.472,-3.34 -1.21276,-6.59026 -2.09375,-9.78125 -2.442,0.967 -5.41574,1.815 -7.84375,2.25 0.928,-4.522 1.96225,-7.9845 4.28125,-11.4375 l 15.53125,-6.65625 c 5.08659,-2.21088 12.9534,-16.05744 19,-16.46875 z m -197.71875,71.34375 c 0.57121,-0.0176 1.14562,2.5e-4 1.71875,0 13.664,0.027 27.9265,4.6985 38.8125,8.8125 8.84501,3.36201 16.1535,6.4775 22.8125,10.8125 6.66099,4.32701 12.55775,9.87 18.59375,17.75 9.45501,12.35401 19.29125,27.78825 23.28125,43.90625 0.95901,3.915 1.59175,8.8705 1.59375,14.0625 -0.013,5.728 -0.75025,11.73375 -3.03125,16.96875 -2.20801,5.186 -6.487,9.84325 -12.875,11.03125 -4.41499,0.84699 -8.99425,1.248 -13.65625,1.25 -23.96699,-0.04 -50.45925,-10.4115 -71.28125,-26.4375 -20.744,-16.03099 -36.08725,-37.91075 -36.15625,-61.71875 -0.002,-7.72701 1.66725,-15.6065 5.28125,-23.3125 l 6.28125,-7 6.9375,-4.25 c 3.76776,-1.18125 7.68901,-1.75204 11.6875,-1.875 z m 16.75,35.375 c 4.645,0.033 9.53775,1.08125 13.21875,4.15625 1.41,1.215 3.11025,3.09225 4.65625,5.40625 1.503,2.324 2.91675,5.007 2.96875,8.25 0.004,1.32501 -0.27725,2.78075 -1.03125,4.09375 -1.016,1.78701 -2.6775,2.996 -4.3125,3.625 -1.64701,0.64599 -3.30225,0.83975 -4.90625,0.84375 -4.36001,-0.022 -8.605,-1.428 -10.75,-2.125 l -0.28125,-0.0937 -9.40625,-5.125 -0.375,-0.21875 -0.34375,-0.28125 c -2.834,-2.661 -4.586,-5.45625 -4.625,-8.65625 -0.013,-1.848 0.703,-3.61625 1.75,-4.90625 1.04901,-1.305 2.35925,-2.2255 3.78125,-2.9375 2.851,-1.40601 6.20225,-2.01925 9.65625,-2.03125 z m 0,7 c -1.914,-0.005 -3.76375,0.29925 -5.21875,0.78125 -1.46599,0.469 -2.452,1.1515 -2.75,1.5625 -0.208,0.28501 -0.20575,0.35025 -0.21875,0.53125 -0.037,0.247 0.23975,1.40675 2.09375,3.21875 l 8.46875,4.625 c 1.974,0.656 5.55575,1.67925 8.21875,1.65625 1.01399,0.006 1.85475,-0.14375 2.34375,-0.34375 0.50301,-0.217 0.62325,-0.373 0.78125,-0.625 0.068,-0.12599 0.121,-0.25675 0.125,-0.59375 0.052,-0.81199 -0.62525,-2.69 -1.78125,-4.375 -1.113,-1.693 -2.61725,-3.2775 -3.40625,-3.9375 -1.66401,-1.49099 -5.19025,-2.535 -8.65625,-2.5 z" fill="#ffffff" stroke="#ffffff"/>
+  <path inkscape:connector-curvature="0" id="path6439" d="m 144.94595,333.42528 23.65784,26.65673 30.32203,17.99329 32.65449,9.66306 27.98956,1.66605 10.9959,-6.66418 7.3306,-12.32874 5.33135,-39.98509 -28.32278,-52.98024 -46.31606,-19.32613 -38.65225,-3.99851 -17.99329,6.66418 -12.66195,11.99553 -4.66492,19.32613 2.66567,23.65784 7.66381,17.66008 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+  <path inkscape:connector-curvature="0" id="path6441" d="m 323.21281,212.13718 22.325,-9.66307 18.99292,-16.32724 10.32948,4.99814 15.99404,10.66269 2.66567,9.66306 -8.99664,7.99702 -17.99329,2.99888 -24.99068,16.66045 -27.98957,-3.6653 9.66307,-23.32463 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+ </g>
+ <path d="m 147.18933,155.99203 c 29.54656,13.99402 60.76502,15.58941 94.30078,0 l 10.19396,-102.365016 -74.17088,0 z" id="path4254" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <path d="m 335.46569,155.99203 c 29.54656,13.99402 60.76503,15.58941 94.30079,0 l -28.82705,-102.365016 -74.17089,0 z" id="path4256" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/mobile_phone.svg b/vtm-themes/icons/symbols/shopping/mobile_phone.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/mobile_phone.svg
rename to vtm-themes/icons/symbols/shopping/mobile_phone.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/motorcycle.svg b/vtm-themes/icons/symbols/shopping/motorcycle.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/motorcycle.svg
rename to vtm-themes/icons/symbols/shopping/motorcycle.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/music.svg b/vtm-themes/icons/symbols/shopping/music.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/music.svg
rename to vtm-themes/icons/symbols/shopping/music.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/newspaper.svg b/vtm-themes/icons/symbols/shopping/newspaper.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/newspaper.svg
rename to vtm-themes/icons/symbols/shopping/newspaper.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/pet.svg b/vtm-themes/icons/symbols/shopping/pet.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/pet.svg
rename to vtm-themes/icons/symbols/shopping/pet.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/pet2.svg b/vtm-themes/icons/symbols/shopping/pet2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/pet2.svg
rename to vtm-themes/icons/symbols/shopping/pet2.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/photo.svg b/vtm-themes/icons/symbols/shopping/photo.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/photo.svg
rename to vtm-themes/icons/symbols/shopping/photo.svg
diff --git a/vtm-themes/icons/symbols/shopping/supermarket.svg b/vtm-themes/icons/symbols/shopping/supermarket.svg
new file mode 100755
index 00000000..7d7f9cc6
--- /dev/null
+++ b/vtm-themes/icons/symbols/shopping/supermarket.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 538.75588,90.924252 L 489.34651,118.92063 L 426.02351,388.57001 L 426.02351,445.69918 L 137.1468,445.69918" id="path2492" sodipodi:nodetypes="ccccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.17"/>
+ <path d="M 479.06925,164.57688 L 56.196494,164.57688 L 105.86424,358.40271 L 425.39502,402.94461 L 479.06925,164.57688 z" id="path3264" sodipodi:nodetypes="ccccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.17"/>
+ <path id="path3268" d="M 128.06871,165.73536 L 128.06871,343.20709" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ <path sodipodi:nodetypes="cc" d="M 86.424707,243.00115 L 445.19209,243.00115" id="path3280" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ <path transform="matrix(1.0862609,0,0,1.1358574,373.78132,-86.8033)" sodipodi:open="true" sodipodi:end="6.2832427" sodipodi:start="0.00024710373" d="M -184.12699,498.68445 A 29.153439,29.153439 0 1 1 -184.12699,498.67892" sodipodi:ry="29.153439" sodipodi:rx="29.153439" sodipodi:cy="498.67725" sodipodi:cx="-213.28043" id="path3284" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+ <path transform="matrix(1.0862609,0,0,1.1358574,618.76176,-84.803297)" sodipodi:open="true" sodipodi:end="6.2832427" sodipodi:start="0.00024710373" d="M -184.12699,498.68445 A 29.153439,29.153439 0 1 1 -184.12699,498.67892" sodipodi:ry="29.153439" sodipodi:rx="29.153439" sodipodi:cy="498.67725" sodipodi:cx="-213.28043" id="path3316" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+ <path d="M 215.1525,165.73536 L 215.1525,363.25095" id="path3318" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ <path id="path3320" d="M 306.2363,165.73536 L 306.2363,372.15933" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ <path d="M 395.3201,165.73536 L 395.3201,385.5219" id="path3322" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ <path id="path3324" d="M 104.24147,322.08495 L 427.37533,322.08495" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/tackle.svg b/vtm-themes/icons/symbols/shopping/tackle.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/tackle.svg
rename to vtm-themes/icons/symbols/shopping/tackle.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/tobacco.svg b/vtm-themes/icons/symbols/shopping/tobacco.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/tobacco.svg
rename to vtm-themes/icons/symbols/shopping/tobacco.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/toys.svg b/vtm-themes/icons/symbols/shopping/toys.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/toys.svg
rename to vtm-themes/icons/symbols/shopping/toys.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/vending_machine.svg b/vtm-themes/icons/symbols/shopping/vending_machine.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/vending_machine.svg
rename to vtm-themes/icons/symbols/shopping/vending_machine.svg
diff --git a/vtm-themes/resources/assets/symbols/shopping/video_rental.svg b/vtm-themes/icons/symbols/shopping/video_rental.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/shopping/video_rental.svg
rename to vtm-themes/icons/symbols/shopping/video_rental.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/archery.svg b/vtm-themes/icons/symbols/sport/archery.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/archery.svg
rename to vtm-themes/icons/symbols/sport/archery.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/baseball.svg b/vtm-themes/icons/symbols/sport/baseball.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/baseball.svg
rename to vtm-themes/icons/symbols/sport/baseball.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/canoe.svg b/vtm-themes/icons/symbols/sport/canoe.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/canoe.svg
rename to vtm-themes/icons/symbols/sport/canoe.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/cricket.svg b/vtm-themes/icons/symbols/sport/cricket.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/cricket.svg
rename to vtm-themes/icons/symbols/sport/cricket.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/diving.svg b/vtm-themes/icons/symbols/sport/diving.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/diving.svg
rename to vtm-themes/icons/symbols/sport/diving.svg
diff --git a/vtm-themes/icons/symbols/sport/golf.svg b/vtm-themes/icons/symbols/sport/golf.svg
new file mode 100755
index 00000000..c59454cd
--- /dev/null
+++ b/vtm-themes/icons/symbols/sport/golf.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <rect id="rect2996" width="11.793" height="467.51" x="73.35" y="56.25" fill="#ffffff" stroke="#ffffff" stroke-linecap="square" stroke-width="20.948"/>
+ <path d="M 77.95768,51.756614 L 257.39682,118.5291 L 78.29184,191.43915 L 77.95768,51.756614 z" id="path2998" sodipodi:nodetypes="cccc" fill="#ffffff" fill-rule="evenodd"/>
+ <path transform="matrix(4.0375831,0,0,4.0375831,-822.63179,-683.71826)" d="M 299.66943,208.31152 C 299.66936,205.71883 298.73333,203.53402 296.86133,201.75708 C 294.98919,199.98031 292.75677,199.09188 290.16406,199.0918 C 287.57416,199.09188 285.36664,199.98031 283.5415,201.75708 C 281.71625,203.53402 280.80366,205.71883 280.80371,208.31152 C 280.80366,210.90144 281.71625,213.08479 283.5415,214.86157 C 285.36664,216.63849 287.57416,217.52692 290.16406,217.52686 C 292.75677,217.52692 294.98919,216.63849 296.86133,214.86157 C 298.73333,213.08479 299.66936,210.90144 299.66943,208.31152 L 299.66943,208.31152 z M 274.90186,304.21338 C 276.91743,304.21336 278.54926,303.25389 279.79736,301.33496 L 306.86768,260.58008 L 308.30908,266.19629 L 304.2793,296.7251 C 304.08586,298.26024 304.42131,299.6284 305.28564,300.82959 C 306.14982,302.03074 307.34953,302.77488 308.88477,303.06201 C 310.42277,303.3491 311.83927,303.03709 313.13428,302.12598 C 314.42911,301.21483 315.17325,299.99022 315.3667,298.45215 L 319.5415,267.20703 C 319.63809,266.14943 319.54288,265.04494 319.25586,263.89355 L 310.03613,227.17285 L 334.0874,222.85303 C 335.33534,222.66266 336.34315,222.0152 337.11084,220.91064 C 337.87831,219.80622 338.16542,218.62995 337.97217,217.38184 C 337.68495,216.13386 336.96571,215.07771 335.81445,214.21338 L 280.51807,177.78271 L 275.47754,185.12598 C 274.22945,186.85459 274.51802,188.34287 276.34326,189.59082 C 278.0688,190.6456 279.55561,190.35703 280.80371,188.7251 L 283.68652,184.40527 L 328.61182,213.92773 L 291.89551,220.55029 C 290.55072,220.83747 289.4704,221.53327 288.65454,222.6377 C 287.83856,223.74225 287.6225,224.91852 288.00635,226.1665 L 295.92529,257.12598 L 270.00635,295.86377 C 269.52584,296.72508 269.2856,297.63622 269.28564,298.59717 C 269.2856,300.13231 269.83785,301.45213 270.94238,302.55664 C 272.04683,303.66111 273.36665,304.21336 274.90186,304.21338 L 274.90186,304.21338 z" id="flowRoot2383" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/gym.svg b/vtm-themes/icons/symbols/sport/gym.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/gym.svg
rename to vtm-themes/icons/symbols/sport/gym.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/gymnasium.svg b/vtm-themes/icons/symbols/sport/gymnasium.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/gymnasium.svg
rename to vtm-themes/icons/symbols/sport/gymnasium.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/gymnasium2.svg b/vtm-themes/icons/symbols/sport/gymnasium2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/gymnasium2.svg
rename to vtm-themes/icons/symbols/sport/gymnasium2.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/hillclimbing.svg b/vtm-themes/icons/symbols/sport/hillclimbing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/hillclimbing.svg
rename to vtm-themes/icons/symbols/sport/hillclimbing.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/horse_racing.svg b/vtm-themes/icons/symbols/sport/horse_racing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/horse_racing.svg
rename to vtm-themes/icons/symbols/sport/horse_racing.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/iceskating.svg b/vtm-themes/icons/symbols/sport/iceskating.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/iceskating.svg
rename to vtm-themes/icons/symbols/sport/iceskating.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/jetski.svg b/vtm-themes/icons/symbols/sport/jetski.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/jetski.svg
rename to vtm-themes/icons/symbols/sport/jetski.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/leisure_centre.svg b/vtm-themes/icons/symbols/sport/leisure_centre.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/leisure_centre.svg
rename to vtm-themes/icons/symbols/sport/leisure_centre.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/minature_golf.svg b/vtm-themes/icons/symbols/sport/minature_golf.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/minature_golf.svg
rename to vtm-themes/icons/symbols/sport/minature_golf.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/motorracing.svg b/vtm-themes/icons/symbols/sport/motorracing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/motorracing.svg
rename to vtm-themes/icons/symbols/sport/motorracing.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/playground.svg b/vtm-themes/icons/symbols/sport/playground.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/playground.svg
rename to vtm-themes/icons/symbols/sport/playground.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/sailing.svg b/vtm-themes/icons/symbols/sport/sailing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/sailing.svg
rename to vtm-themes/icons/symbols/sport/sailing.svg
diff --git a/vtm-themes/icons/symbols/sport/shooting.svg b/vtm-themes/icons/symbols/sport/shooting.svg
new file mode 100755
index 00000000..7529da1c
--- /dev/null
+++ b/vtm-themes/icons/symbols/sport/shooting.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 214.71605,127.23752 c 12.02355,3.4e-4 22.28808,-4.24912 30.79365,-12.74843 8.50497,-8.49858 12.75759,-18.96878 12.75794,-31.41065 -3.5e-4,-12.03609 -4.25297,-22.3038 -12.75794,-30.80316 -8.50557,-8.49849 -18.7701,-12.748 -30.79365,-12.74839 -12.02407,3.9e-4 -22.39301,4.2499 -31.1069,12.74839 -8.71433,8.49936 -13.07136,18.76707 -13.07115,30.80316 -2.1e-4,12.44187 4.35682,22.91207 13.07115,31.41065 8.71389,8.49931 19.08283,12.74877 31.1069,12.74843 z m 29.23689,27.37638 c -1.65833,9.12573 -7.4614,13.68844 -17.40925,13.68814 l -103.90484,0 c -12.44166,3e-4 -18.6624,-5.3914 -18.66223,-16.17521 -1.7e-4,-4.56872 1.45537,-8.30244 4.36654,-11.20112 -7.88525,2.89868 -11.82776,8.0816 -11.82763,15.5487 -1.3e-4,10.78376 6.42944,16.17551 19.28873,16.1752 l 108.85995,0 c 13.69419,3.1e-4 20.12377,-6.0116 19.28873,-18.03571 z m -121.31409,13.68814 103.90484,0 c 9.94785,3e-4 15.75092,-4.56241 17.40925,-13.68814 -0.41797,-10.78316 -6.84755,-16.17491 -19.28873,-16.17521 l -108.85995,0 c -0.4178,3e-4 -2.90486,0.82934 -7.4611,2.48702 -2.91117,2.89868 -4.36671,6.6324 -4.36654,11.20112 -1.7e-4,10.78381 6.22057,16.17551 18.66223,16.17521 z m 108.87891,166.09968 0,-1.86055 c -2.5e-4,1.3e-4 -2.5e-4,0.20266 0,0.60754 z m -1.25301,12.43518 0,-1.86056 c -2.6e-4,0.41781 -2.6e-4,0.62664 0,0.62651 z m 19.91528,-206.5377 c 0.40471,0.41802 0.81603,0.83565 1.23401,1.25301 1.65772,3.31636 2.90438,7.05008 3.74003,11.20113 0.41737,4.13904 -0.62046,8.90428 -3.11353,14.29569 -3e-4,0.83564 -0.41797,1.87351 -1.25301,3.11357 -5.79702,8.70806 -14.50482,13.06194 -26.12332,13.06163 l -59.72679,0 0,160.4991 0,0 -34.21093,170.46622 c -1.24057,6.63202 0.006,12.74834 3.74003,18.34897 3.73351,5.6005 8.91643,9.02097 15.5487,10.26141 6.63189,1.24027 12.74822,-0.003 18.34898,-3.73057 5.60037,-3.72746 9.22963,-8.91352 10.88791,-15.5582 l 34.83743,-176.67426 16.17521,0 0,0 34.83748,176.67426 c 1.24,6.64468 4.66048,11.83074 10.26136,15.5582 5.60024,3.72733 11.9254,4.97084 18.97552,3.73057 6.22671,-1.24044 11.30836,-4.66091 15.24491,-10.26141 3.93586,-5.60063 5.07496,-11.71695 3.41732,-18.34897 l -34.21097,-171.70022 0,-143.71635 22.45101,-29.0605 23.21983,-1.54239 18.47168,-24.02565 155.7997,-8.68174 -0.7082,-15.5865 -238.53891,5.12778 c 0,0 -17.22065,6.29771 -23.88214,9.92447 z m -18.66227,194.10252 0,-1.25301 c -2.5e-4,1.3e-4 -2.5e-4,-0.2024 0,-0.60754 z" id="flowRoot2391" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/skiing_crosscountry.svg b/vtm-themes/icons/symbols/sport/skiing_crosscountry.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/skiing_crosscountry.svg
rename to vtm-themes/icons/symbols/sport/skiing_crosscountry.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/skiing_downhill.svg b/vtm-themes/icons/symbols/sport/skiing_downhill.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/skiing_downhill.svg
rename to vtm-themes/icons/symbols/sport/skiing_downhill.svg
diff --git a/vtm-themes/resources/assets/symbols/sport/snooker.svg b/vtm-themes/icons/symbols/sport/snooker.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/snooker.svg
rename to vtm-themes/icons/symbols/sport/snooker.svg
diff --git a/vtm-themes/icons/symbols/sport/soccer.svg b/vtm-themes/icons/symbols/sport/soccer.svg
new file mode 100755
index 00000000..93fb8679
--- /dev/null
+++ b/vtm-themes/icons/symbols/sport/soccer.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 291.6875 37.21875 C 143.19033 37.21875 22.65625 151.99467 22.65625 293.40625 C 22.65625 434.81273 143.18524 549.5625 291.6875 549.5625 C 440.18977 549.5625 560.71877 434.81272 560.71875 293.40625 C 560.71875 151.99468 440.18469 37.218751 291.6875 37.21875 z M 271.5 58.5 L 327.625 104.90625 L 312.78125 164.125 L 250.4375 193.09375 L 171.5625 172.1875 L 159.84375 123.96875 L 190.09375 78.3125 L 271.5 58.5 z M 411.25 83.25 L 483.5 142.5 L 463.15625 216.59375 L 397.125 226.46875 L 335.34375 164.6875 L 345.21875 108.5625 L 411.25 83.25 z M 151.21875 94.25 C 148.65143 104.33591 146.07144 114.44535 143.6875 124.53125 L 107.375 133.875 C 110.30908 128.55698 114.00512 123.61575 118.40625 119.03125 C 122.25723 114.07999 126.28395 109.28848 131.96875 105.4375 C 137.65353 101.03637 143.33342 97.550847 151.21875 94.25 z M 162.78125 191.46875 L 235.5625 211.8125 L 254.09375 290.65625 L 178.1875 349.34375 L 112.15625 347.5 L 95.46875 259.84375 L 162.78125 191.46875 z M 472.3125 236.1875 L 509.34375 298.5625 L 458.1875 383.09375 L 394 377.03125 L 370.53125 323.3125 L 409.96875 247.375 L 472.3125 236.1875 z M 36.78125 257.46875 L 75.125 269.75 L 95.46875 354.84375 L 70.71875 399.40625 C 64.850589 401.78509 59.336915 395.55027 53.46875 382.71875 C 47.050446 368.78185 38.434082 340.71784 35.5 319.8125 C 32.749296 298.71868 32.930267 278.1907 36.78125 257.46875 z M 544.03125 291.75 C 544.21466 313.0221 542.54672 330.99653 539.0625 349.15625 C 534.84475 367.1224 528.60483 383.45288 522.375 396.65625 C 516.14519 409.121 510.44544 417.94433 503.84375 423.8125 L 474.15625 389.3125 L 526.03125 301.65625 L 544.03125 291.75 z M 268.75 305.875 L 351.46875 327.53125 L 377.875 389.6875 L 332.21875 449.65625 L 229.15625 428.03125 L 195.21875 360.15625 L 268.75 305.875 z M 220.71875 443.40625 L 330.03125 462.6875 L 361.375 510.71875 L 353.5 531.8125 C 338.27944 534.02323 322.85209 535.66449 306.53125 536.03125 C 289.66029 536.39803 271.69583 536.01621 255.375 534.1875 C 237.95388 531.62017 221.80777 527.0271 207.6875 522.4375 C 193.56723 517.49135 182.75452 512.00381 173.21875 505.21875 L 171.9375 480.46875 L 220.71875 443.40625 z " id="path10456" fill="#ffffff" fill-rule="evenodd" stroke-width=".183" stroke-miterlimit="10"/>
+ <path d="M 151.21755,94.265209 C 143.33221,97.566052 137.64742,101.05027 131.96264,105.4514 C 126.27785,109.30238 122.24349,114.07027 118.39251,119.02153 C 113.99138,123.60603 110.32378,128.5573 107.3897,133.87532 L 143.69897,124.52293 L 143.69897,124.52293 C 146.08291,114.43703 148.65023,104.35112 151.21755,94.265209 z" i:knockout="Off" stroke-miterlimit="10" id="path10544" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 190.09415,78.311135 L 271.51493,58.506079 L 327.62926,104.90126 L 312.77547,164.13305 L 250.42622,193.10711 L 171.57275,172.20177 L 159.83642,123.97279 L 190.09415,78.311135 z" i:knockout="Off" stroke-miterlimit="10" id="path10546" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 345.23376,108.56886 L 335.33632,164.68319 L 397.1303,226.4823 L 463.1472,216.57977 L 483.5024,142.49419 L 411.2506,83.2624 L 345.23376,108.56886 z" i:knockout="Off" stroke-miterlimit="10" id="path10548" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 409.9669,247.38764 L 472.3162,236.20145 L 509.359,298.5507 L 458.1959,383.08895 L 394.0129,377.03741 L 370.5453,323.30193 L 409.9669,247.38764 z" i:knockout="Off" stroke-miterlimit="10" id="path10550" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 503.8576,423.79935 L 474.15,389.32388 L 526.0466,301.66307 L 544.0178,291.76564 C 544.2012,313.03773 542.5508,331.0039 539.0666,349.16362 C 534.8488,367.12979 528.6088,383.45571 522.379,396.65908 C 516.1492,409.12384 510.4593,417.93118 503.8576,423.79935 z" i:knockout="Off" stroke-miterlimit="10" id="path10552" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 195.22879,360.16643 L 268.76423,305.88591 L 351.46868,327.52477 L 377.8754,389.69573 L 332.21377,449.65595 L 229.15412,428.01709 L 195.22879,360.16643 z" i:knockout="Off" stroke-miterlimit="10" id="path10554" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 353.48586,531.80517 C 338.26531,534.01591 322.86138,535.65615 306.54054,536.02291 C 289.66957,536.38967 271.69831,536.02291 255.37748,534.1942 C 237.95637,531.62688 221.81891,527.04238 207.69864,522.45278 C 193.57837,517.50661 182.75894,512.0052 173.22317,505.22014 L 171.93951,480.45872 L 220.71863,443.42102 L 330.0183,462.68103 L 361.3712,510.72664 L 353.48586,531.80517 z" i:knockout="Off" stroke-miterlimit="10" id="path10556" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 95.46999,259.85749 L 162.7705,191.45669 L 235.57242,211.81189 L 254.09382,290.66536 L 178.17444,349.3521 L 112.15758,347.5132 L 95.46999,259.85749 z" i:knockout="Off" stroke-miterlimit="10" id="path10558" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path d="M 70.71367,399.41488 C 64.8455,401.79373 59.3441,395.55371 53.47593,382.72219 C 47.05763,368.7853 38.43876,340.72814 35.50468,319.8228 C 32.75397,298.72899 32.93735,278.1955 36.78834,257.47355 L 75.11479,269.76002 L 95.46999,354.8535 L 70.71367,399.41488 z" i:knockout="Off" stroke-miterlimit="10" id="path10560" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/sport/stadium.svg b/vtm-themes/icons/symbols/sport/stadium.svg
new file mode 100755
index 00000000..c7265a4f
--- /dev/null
+++ b/vtm-themes/icons/symbols/sport/stadium.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 515.17299,377.03118 c -20.79972,36.33327 -112.22974,63.68581 -221.89963,63.68581 -109.6294,0 -201.055428,-27.31618 -221.899622,-63.62941 -1.65365,4.05018 -2.593567,8.39759 -2.593567,13.0869 0,15.63105 10.372889,27.69444 23.092722,36.44025 12.719837,8.74584 29.252907,15.58444 49.178017,21.37905 39.85024,11.5892 93.24163,18.44575 152.22245,18.44575 58.98082,0 112.32234,-6.85655 152.17258,-18.44575 19.92509,-5.79461 36.50806,-12.63321 49.22788,-21.37905 12.71985,-8.74581 23.14261,-20.8092 23.14261,-36.44025 0,-4.71397 -0.97353,-9.07516 -2.64344,-13.1433 z" id="path8348" inkscape:connector-curvature="0" color="#000000" stroke-width="20" fill="#ffffff"/>
+ <path d="M 53.011285,235.60069 80.898961,398.67962" id="path8386" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="27.495"/>
+ <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path8390" d="M 534.81537,235.60069 504.92769,398.67962" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="27.495"/>
+ <path d="m 380.16282,401.68557 0,69.53157 c 0,7.7333 -9.97321,13.95902 -22.36146,13.95902 l -119.34969,0 c -12.38825,0 -22.36144,-6.22572 -22.36144,-13.95902 l 0,-69.53157 c 15.10064,-75.61835 164.69789,-65.07936 164.07259,0 z" id="rect8396" inkscape:connector-curvature="0" sodipodi:nodetypes="csssscc" fill="#ffffff" stroke="#ffffff" stroke-width="1.833"/>
+ <path d="m 293.26086,151.21526 c -67.73755,0 -129.02076,7.64529 -174.78745,20.56796 -22.883345,6.46133 -41.873216,14.08314 -56.481532,23.83526 -14.608315,9.75211 -26.550681,23.17075 -26.550681,40.60029 0,17.42953 11.942366,30.84818 26.550681,40.60029 14.608316,9.75211 33.598187,17.42748 56.481532,23.88882 45.76669,12.92266 107.0499,20.56796 174.78745,20.56796 67.73753,0 129.02075,-7.6453 174.78744,-20.56796 22.88334,-6.46134 41.92773,-14.13671 56.53604,-23.88882 14.60833,-9.75211 26.55068,-23.17076 26.55068,-40.60029 0,-17.42954 -11.94235,-30.84818 -26.55068,-40.60029 -14.60831,-9.75212 -33.6527,-17.37393 -56.53604,-23.83526 -45.76669,-12.92267 -107.04991,-20.56796 -174.78744,-20.56796 z m 0,34.27992 c 65.02777,0 123.95371,7.58484 165.19212,19.2289 20.6192,5.82203 36.78382,12.79314 46.50457,19.28246 9.72078,6.48932 11.28541,10.89799 11.28541,12.21223 0,1.31424 -1.56463,5.77647 -11.28541,12.26578 -9.72075,6.48932 -25.88537,13.46044 -46.50457,19.28247 -41.23841,11.64406 -100.16435,19.22889 -165.19212,19.22889 -65.02778,0 -123.8992,-7.58483 -165.13761,-19.22889 -20.61921,-5.82203 -36.838335,-12.79315 -46.559104,-19.28247 -9.720766,-6.48931 -11.230883,-10.95154 -11.230883,-12.26578 0,-1.31424 1.510117,-5.72291 11.230883,-12.21223 9.720769,-6.48932 25.939894,-13.46043 46.559104,-19.28246 41.23841,-11.64406 100.10983,-19.2289 165.13761,-19.2289 z" id="path8399" inkscape:connector-curvature="0" color="#000000" stroke-width="20" fill="#ffffff"/>
+ <path id="path8448" d="m 454.93025,189.87027 -16.16896,-2.2584 -32.15618,69.87649 0.59472,0.99439 z m -98.62833,-18.27468 -12.91403,-1.17342 -4.92699,78.55632 1.71919,0.99439 z m -217.84102,18.27468 16.16896,-2.2584 32.15618,69.87649 -0.59472,0.99439 z m 98.62833,-18.27468 12.91403,-1.17342 4.92699,78.55632 -1.71919,0.99439 z M 296.40625,248 c -58.15272,0.73744 -116.76511,6.184 -172.6875,22.34375 65.9861,16.22062 134.61121,19.43848 202.40286,17.50329 49.43696,-1.96006 99.20082,-6.84765 146.84714,-20.22204 C 415.55493,252.49212 355.69862,247.78689 296.40625,248 z" opacity=".5" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/swimming_indoor.svg b/vtm-themes/icons/symbols/sport/swimming_indoor.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/swimming_indoor.svg
rename to vtm-themes/icons/symbols/sport/swimming_indoor.svg
diff --git a/vtm-themes/icons/symbols/sport/swimming_outdoor.svg b/vtm-themes/icons/symbols/sport/swimming_outdoor.svg
new file mode 100755
index 00000000..819f9edb
--- /dev/null
+++ b/vtm-themes/icons/symbols/sport/swimming_outdoor.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata1976"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 520.67002,338.45757 C 516.5973,339.70107 511.33749,339.46262 504.43807,337.98711 C 497.42585,336.39109 491.03409,328.95069 479.38379,329.36219 C 467.45018,329.77627 450.59521,340.46638 434.30939,340.46638 C 417.79285,340.11513 399.24314,328.88917 382.38944,328.88917 C 365.59215,329.00838 350.32165,340.64201 334.2038,340.99711 C 317.80261,341.0548 301.45785,330.13135 285.3964,329.89548 C 269.10803,329.4827 253.66832,339.58312 238.45423,339.46262 C 223.46703,339.16906 210.17586,328.41739 195.30147,328.88917 C 180.03097,329.4827 163.29009,341.29323 148.35931,342.00216 C 133.31571,342.23931 119.68482,331.01847 106.39492,330.89795 C 92.9922,330.66208 77.947335,339.10752 68.898104,340.99839 C 59.848858,342.71363 54.136528,342.89054 51.987986,341.5304 L 51.987986,372.83415 C 54.136528,374.19172 59.848858,374.0161 68.898104,372.30214 C 77.947335,370.41129 92.990929,361.96583 106.39492,362.20172 C 119.6861,362.32093 133.31571,373.54178 148.35931,373.30335 C 163.29009,372.71492 180.03097,360.60571 195.30147,360.19163 C 210.17586,359.60193 223.46575,370.5869 238.45423,370.82279 C 253.66832,370.94329 269.10803,360.90312 285.3964,361.19797 C 301.45785,361.43256 317.80261,372.35726 334.2038,372.30086 C 350.32165,371.94576 365.59215,360.30957 382.38944,360.19163 C 399.24314,360.13522 417.79285,371.53298 434.30939,371.8304 C 450.59521,371.8304 467.45147,361.13643 479.38379,360.72493 C 491.03409,360.19163 497.42585,367.75253 504.43807,369.2883 C 511.33749,370.76509 516.5973,371.00096 520.67002,369.76005 L 520.67002,338.45757 z" i:knockout="Off" id="path113" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 252.64917,321.80515 L 382.04844,252.76229 C 371.87111,230.43599 364.6871,213.60535 360.50156,201.61535 C 356.20192,189.6843 354.39311,187.02684 356.82496,181.35681 C 359.3132,175.50986 355.8635,174.62405 374.8106,166.88752 C 393.75516,158.85486 450.42471,135.82093 468.91801,134.69923 C 487.01648,133.75443 486.28192,153.71684 483.28473,160.45089 C 480.00296,167.00547 463.14926,168.65917 450.36829,173.85744 C 437.41554,178.81855 423.1642,184.36937 406.70661,190.51244 L 465.91955,320.80137 C 458.28559,327.35596 448.1608,329.89804 434.47478,328.89173 C 420.56185,327.53671 402.01085,314.30708 384.70593,314.24426 C 367.45609,314.30708 347.77443,329.07119 331.99629,329.36475 C 316.16045,329.3045 303.60511,316.54919 290.37033,315.25187 C 277.08171,313.94812 264.58277,316.13255 252.64917,321.80515 z" i:knockout="Off" id="path115" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 485.13331,209.06343 C 505.08288,209.06343 521.27127,225.96969 521.27127,246.80254 C 521.27127,267.63539 505.08162,284.54164 485.13331,284.54164 C 465.185,284.54164 448.99406,267.63539 448.99406,246.80254 C 448.99406,225.96969 465.18371,209.06343 485.13331,209.06343" i:knockout="Off" id="path117" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 165.32709,324.34338 C 150.00019,321.50773 134.39126,317.14144 117.42475,311.23041 C 100.34415,304.97325 71.218417,296.58422 64.317713,288.37466 C 57.418297,279.92922 62.451206,263.03834 76.365405,262.27045 C 90.333465,261.50258 118.0465,273.90537 146.83379,284.1827 C 175.45059,294.34337 208.19654,307.04101 246.82531,322.92813 C 242.07444,325.52663 235.79674,326.35348 227.76539,325.17152 C 219.62119,323.81138 209.3285,316.31074 198.86527,316.07614 C 188.34565,315.89795 177.3171,318.73361 165.32709,324.34338 z" i:knockout="Off" id="path119" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 520.67002,390.848 C 516.5973,391.96842 511.33749,391.7928 504.43807,390.316 C 497.42585,388.78151 491.03409,381.21806 479.38379,381.75007 C 467.45018,382.16285 450.59521,392.85296 434.30939,392.85296 C 417.79285,392.50042 399.24314,381.27831 382.38944,381.27831 C 365.59215,381.39753 350.32165,393.03245 334.2038,393.38497 C 317.80261,393.44522 301.45785,382.51923 285.3964,382.28207 C 269.10803,381.86799 253.66832,391.96842 238.45423,391.85049 C 223.46703,391.55564 210.17586,380.80527 195.30147,381.27831 C 180.03097,381.86799 163.29009,393.67982 148.35931,394.39131 C 133.31571,394.6259 119.68482,383.40377 106.39492,383.28583 C 92.9922,383.05123 77.947335,391.49539 68.898104,393.38626 C 59.848858,395.21943 54.136528,395.15791 51.987986,393.8593 L 51.987986,425.16176 C 54.136528,426.46036 59.848858,426.5219 68.898104,424.68873 C 77.947335,422.79658 92.990929,414.35371 106.39492,414.58831 C 119.6861,414.70624 133.31571,425.92836 148.35931,425.69376 C 163.29009,424.98229 180.03097,413.17047 195.30147,412.58078 C 210.17586,412.10775 223.46575,422.85811 238.45423,423.15296 C 253.66832,423.2709 269.10803,413.17047 285.3964,413.58453 C 301.45785,413.8217 317.80261,424.7477 334.2038,424.68745 C 350.32165,424.3349 365.59215,412.69616 382.38944,412.58078 C 399.24314,412.58078 417.79285,423.8029 434.30939,424.15544 C 450.59521,424.15544 467.45147,413.46532 479.38379,413.05252 C 491.03409,412.63846 497.42585,420.07885 504.43807,421.67615 C 511.33749,423.15296 516.5973,423.39011 520.67002,422.15049 L 520.67002,390.848 z" i:knockout="Off" id="path121" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 518.98652,442.22225 C 514.9138,443.34267 509.65399,443.16705 502.75457,441.69025 C 495.74235,440.15576 489.35059,432.59231 477.70029,433.12432 C 465.76668,433.5371 448.91171,444.22721 432.62589,444.22721 C 416.10935,443.87467 397.55964,432.65256 380.70594,432.65256 C 363.90865,432.77178 348.63815,444.4067 332.5203,444.75922 C 316.11911,444.81947 299.77435,433.89348 283.7129,433.65632 C 267.42453,433.24224 251.98482,443.34267 236.77073,443.22474 C 221.78353,442.92989 208.49236,432.17952 193.61797,432.65256 C 178.34747,433.24224 161.60659,445.05407 146.67581,445.76556 C 131.63221,446.00015 118.00132,434.77802 104.71142,434.66008 C 91.3087,434.42548 76.26383,442.86964 67.2146,444.76051 C 58.16536,446.59368 52.45303,446.53216 50.30448,445.23355 L 50.30448,476.53601 C 52.45303,477.83461 58.16536,477.89615 67.2146,476.06298 C 76.26383,474.17083 91.30743,465.72796 104.71142,465.96256 C 118.0026,466.08049 131.63221,477.30261 146.67581,477.06801 C 161.60659,476.35654 178.34747,464.54472 193.61797,463.95503 C 208.49236,463.482 221.78225,474.23236 236.77073,474.52721 C 251.98482,474.64515 267.42453,464.54472 283.7129,464.95878 C 299.77435,465.19595 316.11911,476.12195 332.5203,476.0617 C 348.63815,475.70915 363.90865,464.07041 380.70594,463.95503 C 397.55964,463.95503 416.10935,475.17715 432.62589,475.52969 C 448.91171,475.52969 465.76797,464.83957 477.70029,464.42677 C 489.35059,464.01271 495.74235,471.4531 502.75457,473.0504 C 509.65399,474.52721 514.9138,474.76436 518.98652,473.52474 L 518.98652,442.22225 z" i:knockout="Off" id="path4736" fill="#ffffff" fill-rule="evenodd"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/sport/tennis.svg b/vtm-themes/icons/symbols/sport/tennis.svg
new file mode 100755
index 00000000..05041311
--- /dev/null
+++ b/vtm-themes/icons/symbols/sport/tennis.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.896,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.314 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" id="path1329" inkscape:connector-curvature="0" fill="#39AC39" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <circle cx="171.59" cy="397.93" r="50.55" id="circle2441" fill="#ffffff"/>
+ <path d="M 285.113,104.116 C 231.611,50.615 157.245,39.652 111.872,83.61 c -49.437,47.896 -32.996,119.739 20.506,173.241 41.901,41.901 91.901,63.271 137.089,45.097 18.605,6.366 50.105,19.328 80.532,41.943 -1.016,4.799 0.331,9.996 4.058,13.723 l 90.51,90.51 c 5.857,5.858 15.355,5.858 21.213,10e-4 l 10.606,-10.606 c 5.857,-5.858 5.857,-15.355 0,-21.214 l -90.51,-90.509 c -3.727,-3.727 -8.923,-5.072 -13.722,-4.058 -22.709,-30.555 -35.684,-62.186 -42.022,-80.761 17.662,-44.908 -3.277,-95.118 -45.019,-136.861 z m 58.886,211.623 c -19.857,-10.854 -38.697,-19.558 -55.349,-26.429 5.108,-4.233 10.157,-8.811 15.132,-13.786 4.976,-4.975 9.55,-10.033 13.776,-15.159 6.876,16.658 15.582,35.506 26.441,55.374 z" id="path2443" inkscape:connector-curvature="0" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/windsurfing.svg b/vtm-themes/icons/symbols/sport/windsurfing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/sport/windsurfing.svg
rename to vtm-themes/icons/symbols/sport/windsurfing.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/archaeological.svg b/vtm-themes/icons/symbols/tourist/archaeological.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/archaeological.svg
rename to vtm-themes/icons/symbols/tourist/archaeological.svg
diff --git a/vtm-themes/icons/symbols/tourist/archaeological2.svg b/vtm-themes/icons/symbols/tourist/archaeological2.svg
new file mode 100755
index 00000000..708b605c
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/archaeological2.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 267.96875 50.75 C 266.59016 50.733287 265.25398 50.7811 264.03125 50.875 C 257.85906 51.348974 250.18948 53.312633 247.28125 55.15625 C 246.03908 55.943693 243.5692 57.409906 241.78125 58.4375 C 237.066 61.147574 225.84467 73.383628 220.8125 81.3125 C 217.61382 86.352459 214.10046 92.131556 212.90625 94.28125 C 212.63315 94.772826 211.09349 97.002404 209.5 99.25 C 207.90652 101.49759 205.97821 104.53391 205.1875 106 C 204.39681 107.46608 203.55493 108.69242 203.34375 108.71875 C 203.13259 108.74506 201.631 110.90965 200 113.53125 C 192.86213 125.00432 184.0611 135.87915 180.59375 137.46875 C 175.90847 139.6167 167.95117 146.86437 163.5 153.0625 C 161.89772 155.2936 159.20213 158.97351 157.53125 161.25 C 153.7998 166.33397 147.68751 176.89384 145.5625 181.90625 C 144.69427 183.95419 143.25532 187.36705 142.34375 189.5 C 140.40659 194.0327 137.0853 203.10134 136.875 204.46875 C 136.7949 204.98961 136.31802 206.75971 135.8125 208.375 C 135.30698 209.99031 134.56519 212.56933 134.15625 214.125 C 133.74733 215.6807 132.79109 219.28869 132.03125 222.15625 C 131.27144 225.02378 130.4824 228.26873 130.28125 229.34375 C 130.08011 230.41876 129.84916 231.39246 129.75 231.5 C 129.58921 231.67439 128.52887 236.72319 127.59375 241.90625 C 127.40674 242.94275 127.17735 243.90668 127.0625 244.03125 C 126.70512 244.41886 124.15726 262.44881 124.3125 263.5 C 124.39327 264.04721 124.35361 264.60045 124.21875 264.75 C 124.08385 264.89957 123.83353 266.84719 123.65625 269.0625 C 123.47899 271.2778 123.24591 273.98706 123.15625 275.09375 C 123.06656 276.20044 122.91544 278.49835 122.8125 280.1875 C 122.70955 281.87662 122.54264 284.25891 122.4375 285.5 C 122.15608 288.82206 122.05966 290.56397 122 293.0625 C 121.97063 294.2932 121.87761 295.36687 121.8125 295.4375 C 121.60357 295.66409 121.216 305.11771 121.3125 307.5625 C 121.36376 308.8613 121.41687 310.72122 121.4375 311.71875 C 121.63662 321.35362 122.74099 333.1701 124.59375 345.34375 C 125.70525 352.64685 126.36875 359.07551 126.34375 362.5625 C 126.32296 365.46768 126.32287 365.47107 124.96875 365.0625 C 124.22401 364.83781 122.49722 364.04958 121.125 363.3125 C 119.75276 362.57541 117.66886 361.70606 116.5 361.375 C 115.33113 361.04393 114.21041 360.62681 114 360.4375 C 113.78959 360.24817 111.14724 359.69407 108.15625 359.1875 C 105.16524 358.68092 102.15134 357.98514 101.4375 357.65625 C 99.005606 356.53573 92.160853 354.96547 88.65625 354.71875 C 81.044903 354.1829 73.263748 356.99391 70.46875 361.28125 C 68.049904 364.99163 66.516343 371.17509 66.90625 375.6875 C 67.443714 381.90774 70.844221 394.70874 72.3125 396.0625 C 72.443065 396.18289 72.794066 396.9732 73.09375 397.84375 C 73.657599 399.4814 75.544576 402.68958 78.78125 407.5 C 79.811048 409.03056 80.846294 410.78593 81.09375 411.40625 C 81.54231 412.53061 86.355218 419.07865 93.75 428.5625 C 95.89369 431.31181 98.090247 434.16248 98.625 434.90625 C 99.014999 435.44878 104.02733 440.17756 110.9375 446.59375 C 129.25303 445.68729 148.97219 445.70661 168.15625 447.625 C 233.25495 454.13491 263.64735 456.3049 324.40625 447.625 C 337.52214 445.75131 351.89635 443.99982 366.71875 442.4375 C 373.15722 440.39741 377.9689 438.64243 381.90625 436.875 C 383.20762 436.29084 385.30202 435.44197 386.5625 434.96875 C 393.65302 432.30669 409.99398 423.0864 416.03125 418.34375 C 417.68551 417.04422 419.62808 415.66211 420.34375 415.28125 C 423.81662 413.43323 428.53661 409.08721 436.5 400.4375 C 445.15793 391.03335 445.39184 390.75352 450.46875 381.5 C 453.99514 375.07243 466.23802 362.37011 473.28125 357.84375 C 474.23147 357.23314 476.29868 355.75396 477.875 354.53125 C 482.71858 350.77417 485.53961 348.71052 487.21875 347.71875 C 488.10331 347.19628 489.41429 346.24774 490.15625 345.59375 C 490.8982 344.9398 492.69039 343.52474 494.125 342.46875 C 507.05377 332.95229 516.28866 324.30998 520.59375 317.71875 C 523.14984 313.80534 524.86093 308.63291 526 301.4375 C 526.8713 295.93363 526.84648 295.22254 525.46875 287.96875 C 523.57869 278.01712 519.85092 267.76171 516.3125 262.8125 C 510.96005 255.32593 507.64221 252.15802 499.375 246.71875 C 495.93079 244.45272 488.14835 240.87923 486.59375 240.84375 C 486.05135 240.83136 485.40721 240.63151 485.15625 240.40625 C 484.90525 240.1809 481.43861 239.54802 477.46875 239 C 473.49887 238.45198 470.13555 237.9 469.96875 237.75 C 469.2018 237.06024 478.41884 228.68189 480.9375 227.78125 C 482.20335 227.32861 483.81503 228.06898 487.40625 230.8125 C 489.95969 232.7632 491.72054 233.21023 494.0625 232.46875 C 494.92659 232.19521 500.00852 230.8927 505.375 229.59375 C 519.70918 226.12415 520.40757 225.91481 520.59375 225.21875 C 520.84952 224.26256 519.94104 222.98084 514.15625 216.09375 C 511.24712 212.63028 508.47686 209.30468 508 208.71875 C 504.89107 204.89893 496.35129 196.49823 478.3125 179.5625 C 455.25935 157.91903 392.46963 100.1163 390.09375 98.34375 C 389.25013 97.714349 383.88551 93.040504 378.1875 87.96875 C 361.79428 73.377233 342.03357 57.109939 337.28125 54.3125 C 335.01625 52.979219 334.77009 53.248073 334 58 C 333.65988 60.098764 332.74748 63.783387 331.96875 66.1875 C 329.44354 73.983576 328.06795 78.897989 327.9375 80.5 C 327.76897 82.569417 329.73162 86.332753 332.5625 89.3125 C 333.8056 90.620992 334.85943 92.051171 334.90625 92.5 C 335.06592 94.030785 332.71843 97.957379 328.90625 102.5625 C 325.09907 107.16159 325.09669 107.18039 324.84375 105.1875 C 324.35428 101.33057 322.05063 89.727233 321.46875 88.21875 C 319.36574 82.767072 314.58433 75.65243 308.96875 69.59375 C 304.64502 64.928821 294.50227 57.846888 288.4375 55.25 C 284.59366 53.604098 279.04611 51.894937 278.71875 52.25 C 278.58848 52.391297 278.10443 52.272539 277.625 52 C 276.4178 51.313764 272.10453 50.800139 267.96875 50.75 z M 273.34375 67.25 C 277.40498 67.172193 281.85226 68.072529 285.21875 69.84375 C 288.64405 71.645908 289.22727 72.099159 293.65625 76.40625 C 298.25399 80.877474 298.47819 81.150024 300.375 84.90625 C 303.96023 92.006022 305.44034 97.697781 305.34375 104.09375 C 305.27323 108.76452 303.94724 117.14209 303.15625 118 C 302.82931 118.35459 302.52366 119.04646 302.46875 119.53125 C 302.24688 121.48996 299.34507 126.21101 296.4375 129.375 C 292.99898 133.11676 292.91201 133.17046 285.9375 133.78125 C 272.26396 134.97878 266.63916 134.55765 251 131.1875 C 248.13941 130.57106 245.10082 129.93035 244.25 129.75 C 243.39922 129.56963 240.92281 128.98023 238.75 128.46875 C 236.57721 127.95725 233.46879 127.37934 231.84375 127.15625 C 230.2187 126.93313 228.36438 126.51356 227.71875 126.25 C 226.19586 125.62833 225.81974 125.24928 225.71875 124.28125 C 225.60267 123.16828 227.31976 118.65222 228.625 116.625 C 229.72112 114.92257 232.06732 110.75102 233.84375 107.34375 C 234.36724 106.33969 235.81675 103.91099 237.0625 101.9375 C 238.30825 99.964012 240.17839 96.836708 241.25 95 C 248.60286 82.397547 258.72968 71.894244 266.78125 68.46875 C 268.60637 67.692268 270.90701 67.296684 273.34375 67.25 z M 479.0625 260.46875 C 487.11317 260.66102 494.68675 262.89084 499.8125 267.09375 C 504.35626 270.81944 507.85553 276.18157 508.625 280.65625 C 509.40964 285.21933 508.31734 293.49619 506.28125 298.53125 C 504.74305 302.3351 504.47263 302.71227 498.09375 309.625 C 492.92917 315.22172 490.77347 317.24517 488.21875 318.90625 C 486.42206 320.07446 483.75011 321.8818 482.28125 322.90625 C 480.8124 323.9307 477.97407 325.82054 475.96875 327.09375 C 473.96347 328.36695 470.9575 330.30691 469.28125 331.4375 C 464.93313 334.37034 459.21474 337.28938 457.15625 337.59375 C 454.93198 337.92262 454.76415 337.75524 454.53125 334.875 C 454.35695 332.71939 450.73565 317.87285 449.25 313.25 C 448.07561 309.59565 445.53114 297.12684 445.0625 292.65625 C 443.82168 280.81974 447.98461 270.22955 455.5 266.03125 C 462.50504 262.11805 471.01183 260.27648 479.0625 260.46875 z " id="path8938" fill="#ffffff" stroke="#ffffff" stroke-width="4.716"/>
+ <path d="M 55.895722,502.66176 C 81.761522,498.62856 128.61643,493.1521 172.51157,497.54157 C 237.61025,504.05149 267.98965,506.22147 328.74855,497.54157 C 382.42864,489.87303 456.43424,483.89819 501.38234,487.09948" id="path9010" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="bevel" stroke-linecap="square" stroke-width="40"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/art_gallery.svg b/vtm-themes/icons/symbols/tourist/art_gallery.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/art_gallery.svg
rename to vtm-themes/icons/symbols/tourist/art_gallery.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/art_gallery2.svg b/vtm-themes/icons/symbols/tourist/art_gallery2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/art_gallery2.svg
rename to vtm-themes/icons/symbols/tourist/art_gallery2.svg
diff --git a/vtm-themes/icons/symbols/tourist/attraction.svg b/vtm-themes/icons/symbols/tourist/attraction.svg
new file mode 100755
index 00000000..ede1e880
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/attraction.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g4670" transform="translate(-4,0)">
+  <path transform="translate(30.687831,46.031746)" d="M 411.21693,457.24867 267.60639,382.68184 124.76501,458.71169 151.30418,299.08753 34.85508,186.73183 194.86773,162.6455 265.73961,17.175999 338.09369,161.91399 498.34402,184.3646 383.04866,297.90393 411.21693,457.24867 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.565689" sodipodi:arg1="0.93737044" sodipodi:r2="121.83687" sodipodi:r1="243.67374" sodipodi:cy="260.84656" sodipodi:cx="266.98413" sodipodi:sides="5" id="path4629" sodipodi:type="star" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16"/>
+  <path sodipodi:type="star" id="path4631" sodipodi:sides="5" sodipodi:cx="266.98413" sodipodi:cy="260.84656" sodipodi:r1="243.67374" sodipodi:r2="121.83687" sodipodi:arg1="0.93737044" sodipodi:arg2="1.565689" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 411.21693,457.24867 267.60639,382.68184 124.76501,458.71169 151.30418,299.08753 34.85508,186.73183 194.86773,162.6455 265.73961,17.175999 338.09369,161.91399 498.34402,184.3646 383.04866,297.90393 411.21693,457.24867 z" transform="translate(30.687831,46.031746)" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/battlefield.svg b/vtm-themes/icons/symbols/tourist/battlefield.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/battlefield.svg
rename to vtm-themes/icons/symbols/tourist/battlefield.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/beach.svg b/vtm-themes/icons/symbols/tourist/beach.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/beach.svg
rename to vtm-themes/icons/symbols/tourist/beach.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/casino.svg b/vtm-themes/icons/symbols/tourist/casino.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/casino.svg
rename to vtm-themes/icons/symbols/tourist/casino.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/castle.svg b/vtm-themes/icons/symbols/tourist/castle.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/castle.svg
rename to vtm-themes/icons/symbols/tourist/castle.svg
diff --git a/vtm-themes/icons/symbols/tourist/castle2.svg b/vtm-themes/icons/symbols/tourist/castle2.svg
new file mode 100755
index 00000000..9699e3b0
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/castle2.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 49.302816,232.71463 0.353768,-96.69793 32.160709,0 0,32.16103 32.160707,0 0,-32.16103 32.16071,0 0,32.16103 32.16071,0 0,-32.16103 32.16071,0 0,96.48342 -32.16071,0 0,64.31916 32.16071,0 0,-32.15813 32.16071,0 0,32.15813 32.16071,0 0,-32.15813 32.16071,0 0,32.15813 0,32.16103 0,32.16104 3.83929,0 0,12.16103 -68.16071,0 0,84.32206 -160.803547,0 0,-225.12432 -32.516085,0.28944 0.0016,-0.0749 8e-6,-3e-5 z" id="path2958" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="6"/>
+ <path d="m 532.24315,232.71463 -0.35056,-96.69793 -32.11665,0 0,32.16103 -32.11632,0 0,-32.16103 -32.11633,0 0,32.16103 -32.11633,0 0,-32.16103 -32.11633,0 0,96.48342 32.11633,0 0,64.32206 -32.11633,0 0,-32.16103 -32.11633,0 0,32.16103 -32.11632,0 0,-32.16103 -32.11633,0 0,32.16103 0,32.15813 0,32.16104 16.11633,0 0,12.16103 48.11632,0 0,84.32206 160.58164,0 0,-225.12432 32.47139,0.28944 -0.004,-0.0749 -1.8e-4,-3e-5 z" id="path2958-0" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="6"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/cinema.svg b/vtm-themes/icons/symbols/tourist/cinema.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/cinema.svg
rename to vtm-themes/icons/symbols/tourist/cinema.svg
diff --git a/vtm-themes/icons/symbols/tourist/cinema2.svg b/vtm-themes/icons/symbols/tourist/cinema2.svg
new file mode 100755
index 00000000..66d40bab
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/cinema2.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <g id="g18718" transform="matrix(1.4438269,0,0,1.4438269,-128.87623,-121.85042)">
+  <path id="rect3391" d="M 317.40625,102 C 314.79389,103.87499 312.32864,105.97454 309.9375,108.1875 L 318.59375,126.1875 L 304.78125,132.84375 L 298.28125,119.3125 C 295.93663,121.42726 293.54702,123.41115 291,125.125 L 318.28125,181.84375 L 189.78125,243.6875 L 155.5,172.4375 C 154.90688,172.67767 154.33197,172.93925 153.75,173.21875 C 147.97758,176.0395 142.74849,180.76877 137.65625,185.8125 L 148.8125,180.4375 L 159.5625,202.71875 L 145.75,209.375 L 135.46875,188 C 133.63637,189.84312 131.80866,191.71473 129.96875,193.5 L 262.875,469.71875 C 265.63849,466.94085 268.41773,464.13055 271.25,461.53125 L 267.875,463.15625 L 257.125,440.875 L 270.9375,434.21875 L 280.59375,454.3125 C 281.42844,453.81363 282.29811,453.35684 283.15625,452.9375 C 285.16759,451.97154 287.24435,451.26566 289.375,450.71875 L 260.75,391.1875 L 389.25,329.375 L 424.1875,402 C 433.11182,394.8094 440.70356,384.96976 450.78125,379.15625 L 317.40625,102 z M 332.28125,154.6875 L 343,176.96875 L 329.21875,183.59375 L 318.5,161.3125 L 332.28125,154.6875 z M 324.125,194.03125 L 383.40625,317.21875 L 254.90625,379.03125 L 195.625,255.84375 L 324.125,194.03125 z M 356.71875,205.4375 L 367.4375,227.71875 L 353.625,234.34375 L 342.90625,212.0625 L 356.71875,205.4375 z M 173.25,231.1875 L 183.96875,253.46875 L 170.1875,260.125 L 159.4375,237.84375 L 173.25,231.1875 z M 381.125,256.1875 L 391.84375,278.46875 L 378.0625,285.125 L 367.34375,262.8125 L 381.125,256.1875 z M 197.65625,281.96875 L 208.40625,304.25 L 194.59375,310.875 L 183.875,288.59375 L 197.65625,281.96875 z M 405.5625,306.9375 L 416.28125,329.21875 L 402.46875,335.875 L 391.75,313.59375 L 405.5625,306.9375 z M 222.09375,332.71875 L 232.8125,355 L 219.03125,361.625 L 208.28125,339.34375 L 222.09375,332.71875 z M 429.96875,357.6875 L 440.6875,380 L 426.90625,386.625 L 416.1875,364.34375 L 429.96875,357.6875 z M 246.53125,383.46875 L 257.25,405.75 L 243.4375,412.40625 L 232.71875,390.09375 L 246.53125,383.46875 z" fill="#ffffff"/>
+  <path id="rect3445" d="M 291,125.125 C 289.30153,126.26787 287.53347,127.29214 285.6875,128.15625 C 270.70905,134.83823 251.35034,131.44609 236.5625,137.71875 C 221.4956,143.92126 211.46456,159.39816 197.5,165.4375 C 184.27142,170.97234 168.57887,167.14145 155.5,172.4375 L 189.78125,243.6875 L 318.28125,181.84375 L 291,125.125 z" opacity=".332" fill="#ffffff"/>
+  <rect transform="matrix(0.9011117,-0.433587,0.433587,0.9011117,0,0)" y="315.36" x="65.34" height="136.71" width="142.6" id="rect3447" opacity=".332" fill="#ffffff"/>
+  <path id="rect3449" d="M 389.25,329.375 L 260.75,391.1875 L 289.375,450.6875 C 301.4534,447.58953 315.12121,450.07405 326.875,445.15625 C 340.83956,439.11691 350.90186,423.64003 365.96875,417.4375 C 380.75659,411.16485 400.11531,414.55698 415.09375,407.875 C 418.35625,406.34781 421.3307,404.30181 424.1875,402 L 389.25,329.375 z" opacity=".332" fill="#ffffff"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/clock.svg b/vtm-themes/icons/symbols/tourist/clock.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/clock.svg
rename to vtm-themes/icons/symbols/tourist/clock.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/fountain.svg b/vtm-themes/icons/symbols/tourist/fountain.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/fountain.svg
rename to vtm-themes/icons/symbols/tourist/fountain.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/guidepost.svg b/vtm-themes/icons/symbols/tourist/guidepost.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/guidepost.svg
rename to vtm-themes/icons/symbols/tourist/guidepost.svg
diff --git a/vtm-themes/icons/symbols/tourist/information.svg b/vtm-themes/icons/symbols/tourist/information.svg
new file mode 100755
index 00000000..992b873f
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/information.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path transform="matrix(12.872654,0,0,12.872654,4041.8845,-4307.9258)" d="M -293.96875,344.2415 C -293.96875,343.39778 -293.69532,342.70638 -293.14844,342.16728 C -292.60157,341.62825 -291.89844,341.35872 -291.03906,341.35869 C -290.1172,341.35872 -289.35157,341.64388 -288.74219,342.21416 C -288.13282,342.7845 -287.82814,343.42903 -287.82812,344.14775 C -287.82814,344.67903 -287.94923,345.21028 -288.19141,345.7415 C -288.4336,346.27278 -288.81642,346.69856 -289.33984,347.01885 C -289.86329,347.33918 -290.39845,347.49934 -290.94531,347.49932 C -291.69532,347.49934 -292.38672,347.17903 -293.01953,346.53838 C -293.65235,345.89778 -293.96875,345.13216 -293.96875,344.2415 L -293.96875,344.2415 z M -297.25,372.20244 L -297.29688,370.679 L -294.64844,370.32744 C -294.25782,370.21807 -293.98829,370.05791 -293.83984,369.84697 C -293.69141,369.63604 -293.61719,369.16338 -293.61719,368.429 L -293.61719,368.17119 C -293.61719,367.9837 -293.60547,367.64385 -293.58203,367.15166 C -293.5586,366.65948 -293.54688,366.22588 -293.54688,365.85088 C -293.54688,365.55401 -293.57032,364.9837 -293.61719,364.13994 L -293.59375,362.96807 L -293.61719,361.8665 L -293.57031,358.04619 C -293.57032,357.56183 -293.61719,357.06183 -293.71094,356.54619 C -293.88282,356.31183 -294.19532,356.10871 -294.64844,355.93682 C -295.10157,355.76496 -295.89063,355.63996 -297.01562,355.56182 L -297.01562,354.24932 C -295.40625,354.15558 -293.99219,353.81965 -292.77344,353.2415 C -291.94532,352.86652 -291.04688,352.20246 -290.07812,351.24932 L -288.50781,351.24932 C -288.44532,353.18683 -288.41407,355.70246 -288.41406,358.79619 L -288.57812,368.35869 C -288.57813,369.01494 -288.54688,369.60869 -288.48438,370.13994 C -288.00001,370.31182 -287.21095,370.48369 -286.11719,370.65557 C -285.69532,370.71807 -285.35939,370.79619 -285.10938,370.88994 L -285.13281,372.179 C -285.5547,372.19463 -285.8672,372.20244 -286.07031,372.20244 C -286.3047,372.20244 -286.66407,372.18682 -287.14844,372.15557 C -288.7422,372.07744 -290.87501,372.03838 -293.54688,372.03838 C -294.3125,372.03838 -295.05469,372.06572 -295.77344,372.12041 C -296.49219,372.1751 -296.98438,372.20244 -297.25,372.20244 L -297.25,372.20244 z" id="flowRoot6828" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/map.svg b/vtm-themes/icons/symbols/tourist/map.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/map.svg
rename to vtm-themes/icons/symbols/tourist/map.svg
diff --git a/vtm-themes/icons/symbols/tourist/memorial.svg b/vtm-themes/icons/symbols/tourist/memorial.svg
new file mode 100755
index 00000000..5203e57d
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/memorial.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="m 159.4375,30.6875 c -15.32795,0 -28.34375,13.047045 -28.34375,28.375 l 0,372 c 0.0584,1.44453 327.64837,0.78554 327.59375,0 l 0,-372 c 0,-15.327955 -13.04705,-28.375 -28.375,-28.375 l -270.875,0 z m 55.875,26.625 c 1.14947,3.7e-5 2.13808,0.425865 2.9375,1.28125 0.7994,0.855456 1.18749,1.995811 1.1875,3.4375 -1e-5,1.441763 -0.3881,2.568239 -1.1875,3.40625 -0.79942,0.838044 -1.78803,1.281282 -2.9375,1.28125 -1.15033,3.2e-5 -2.10727,-0.443206 -2.90625,-1.28125 -0.79898,-0.838011 -1.21875,-1.964487 -1.21875,-3.40625 0,-1.441689 0.41977,-2.582044 1.21875,-3.4375 0.79898,-0.855385 1.75592,-1.281213 2.90625,-1.28125 z m 65.5,0.0625 c 1.14946,3.7e-5 2.10683,0.425865 2.90625,1.28125 0.79939,0.855456 1.21874,1.995801 1.21875,3.4375 -10e-6,1.441763 -0.41936,2.599489 -1.21875,3.4375 -0.79942,0.838044 -1.75679,1.250032 -2.90625,1.25 -1.15033,3.2e-5 -2.13853,-0.411956 -2.9375,-1.25 -0.5573,-0.584525 -0.89392,-1.340492 -1.0625,-2.21875 -0.0802,0.29446 -0.17561,0.590009 -0.3125,0.9375 -0.33681,0.854934 -0.78015,1.719461 -1.3125,2.625 -0.44851,-0.301836 -1.01736,-0.619244 -1.71875,-0.9375 -0.70143,-0.318192 -1.47117,-0.468718 -2.3125,-0.46875 -0.72924,3.2e-5 -1.33921,0.235256 -1.84375,0.6875 -0.50456,0.452292 -0.78125,1.151933 -0.78125,2.125 l 0,1.21875 6.25,0 0,7.5 -6.25,0 0,16.78125 -8.34375,0 0,-24.03125 c 0,-0.435871 -0.0138,-1.041466 0,-1.8125 0.0137,-0.770985 0.0684,-1.405316 0.125,-1.875 0.36461,-2.71563 1.31855,-4.762094 2.875,-6.1875 1.55645,-1.425326 3.72346,-2.156214 6.5,-2.15625 0.56146,3.6e-5 1.15045,0.04113 1.78125,0.125 0.63079,0.08395 1.25488,0.207225 1.84375,0.375 1.00994,0.301887 1.86451,0.771327 2.59375,1.375 0.42207,0.349448 0.69724,0.789561 0.875,1.3125 0.16527,-0.899079 0.52828,-1.644564 1.09375,-2.25 0.79897,-0.855385 1.78717,-1.281213 2.9375,-1.28125 z m -4.03125,3.53125 c -0.0682,0.371282 -0.0937,0.766142 -0.0937,1.1875 0,0.436114 0.0519,0.837882 0.125,1.21875 0.11715,-0.42996 0.18749,-0.826798 0.1875,-1.125 0,-0.480106 -0.0894,-0.9007 -0.21875,-1.28125 z m -43.875,-3.3125 c 0.56146,3.6e-5 1.18168,0.04113 1.8125,0.125 0.63078,0.08395 1.22362,0.207225 1.8125,0.375 1.00994,0.301887 1.89575,0.740077 2.625,1.34375 0.72921,0.603744 1.09374,1.485153 1.09375,2.625 -1e-5,0.502428 -0.16322,1.176365 -0.5,2.03125 -0.33681,0.854934 -0.78015,1.750711 -1.3125,2.65625 -0.44851,-0.301836 -1.01735,-0.619244 -1.71875,-0.9375 -0.70141,-0.318192 -1.47116,-0.468718 -2.3125,-0.46875 -0.72924,3.2e-5 -1.37047,0.204006 -1.875,0.65625 -0.50457,0.452292 -0.75001,1.183183 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.435871 0.0174,-1.010216 0.0312,-1.78125 0.0137,-0.770985 0.0373,-1.405316 0.0937,-1.875 0.36462,-2.71563 1.31854,-4.793351 2.875,-6.21875 1.55644,-1.425326 3.72346,-2.124964 6.5,-2.125 z m 10.65625,0.34375 c 0.67359,3.6e-5 1.33795,0.06786 1.96875,0.21875 0.63079,0.150958 1.1795,0.426776 1.65625,0.8125 0.47672,0.385792 0.86181,0.906161 1.15625,1.59375 0.29443,0.687626 0.43749,1.583947 0.4375,2.65625 l 0,30.15625 c -1.14947,0.435904 -2.16467,0.65625 -3.0625,0.65625 -1.28985,0 -2.2849,-0.193606 -3,-0.5625 -0.71511,-0.368845 -1.24326,-0.83378 -1.59375,-1.4375 -0.35049,-0.603703 -0.55481,-1.305858 -0.625,-2.09375 -0.0702,-0.787875 -0.125,-1.628209 -0.125,-2.5 l 0,-29.15625 c 0.33636,-0.03373 0.69788,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.72914,-0.03122 1.09375,-0.03125 z m -54.875,0.65625 c 0.67358,3.6e-5 1.3067,0.06786 1.9375,0.21875 0.63079,0.150958 1.1795,0.426776 1.65625,0.8125 0.47672,0.385792 0.89306,0.906153 1.1875,1.59375 0.29443,0.687618 0.43749,1.583947 0.4375,2.65625 l 0,16.1875 c 0.14036,-0.736736 0.3477,-1.466634 0.65625,-2.1875 0.30854,-0.720866 0.71075,-1.419989 1.1875,-2.125 l 2.28125,-3.46875 c 0.53235,-0.804248 1.10464,-1.506904 1.75,-2.09375 0.64534,-0.586813 1.535,-0.874984 2.65625,-0.875 0.64534,1.6e-5 1.28913,0.09463 1.90625,0.3125 0.61708,0.217984 1.14824,0.450694 1.625,0.71875 0.53234,0.301884 1.02324,0.661887 1.5,1.03125 l -5.75,9.65625 6.8125,12.40625 c -1.85132,0.904536 -3.55144,1.375 -5.09375,1.375 -1.3181,0 -2.3363,-0.30506 -3.09375,-0.875 -0.75749,-0.56994 -1.4394,-1.282964 -2,-2.1875 l -2.6875,-4.5 c -0.47675,-0.770484 -0.84428,-1.485504 -1.125,-2.15625 -0.28074,-0.670713 -0.48464,-1.411956 -0.625,-2.25 l 0,11.40625 -8.4375,0 0,-35.3125 c 0.33636,-0.03373 0.69788,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.0912 1.03125,-0.125 0.37872,-0.03373 0.76038,-0.06247 1.125,-0.0625 z m -12.53125,0.4375 c 0.67359,3.6e-5 1.3067,0.09911 1.9375,0.25 0.63079,0.150958 1.21075,0.395526 1.6875,0.78125 0.47672,0.385792 0.86181,0.937397 1.15625,1.625 0.29441,0.687619 0.43749,1.552697 0.4375,2.625 l 0,30.1875 c -1.14949,0.435904 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.193606 -3,-0.5625 -0.71511,-0.368845 -1.24327,-0.83378 -1.59375,-1.4375 -0.35049,-0.603703 -0.55482,-1.305858 -0.625,-2.09375 -0.0702,-0.787875 -0.0937,-1.628209 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.03373 0.66663,-0.08971 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.76038,-0.06247 1.125,-0.0625 z M 338.5,59.09375 c 0.56146,3.6e-5 1.15043,0.04113 1.78125,0.125 0.63078,0.08395 1.25487,0.207225 1.84375,0.375 1.00994,0.301887 1.86451,0.771327 2.59375,1.375 0.54691,0.452813 0.89451,1.026885 1.03125,1.78125 l 0,-2.84375 c 0.33636,-0.03373 0.69788,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.76038,-0.06247 1.125,-0.0625 0.67359,3.6e-5 1.30668,0.06786 1.9375,0.21875 0.63079,0.150958 1.17951,0.426776 1.65625,0.8125 0.47674,0.385792 0.86181,0.937413 1.15625,1.625 0.29441,0.687619 0.43749,1.552697 0.4375,2.625 l 0,30.1875 c -1.14949,0.435904 -2.16467,0.65625 -3.0625,0.65625 -1.28985,0 -2.2849,-0.193606 -3,-0.5625 -0.71511,-0.368845 -1.24327,-0.86503 -1.59375,-1.46875 -0.35049,-0.603703 -0.55482,-1.274608 -0.625,-2.0625 -0.0702,-0.787875 -0.125,-1.628209 -0.125,-2.5 l 0,-24.9375 c -0.0743,0.415204 -0.21129,0.894525 -0.4375,1.46875 -0.33682,0.854934 -0.78015,1.750711 -1.3125,2.65625 -0.44851,-0.301836 -1.01735,-0.619244 -1.71875,-0.9375 -0.70141,-0.318192 -1.47116,-0.468718 -2.3125,-0.46875 -0.72924,3.2e-5 -1.33922,0.235256 -1.84375,0.6875 -0.50457,0.452292 -0.75001,1.151933 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.46875 -6.21875,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.435871 -0.0138,-1.041466 0,-1.8125 0.0137,-0.770985 0.0684,-1.405316 0.125,-1.875 0.36462,-2.71563 1.31854,-4.793349 2.875,-6.21875 1.55644,-1.425326 3.72346,-2.124964 6.5,-2.125 z m 7.25,5.03125 c 0.0363,-0.202937 0.0625,-0.397552 0.0625,-0.5625 -10e-6,-0.284962 -0.0169,-0.561045 -0.0625,-0.8125 l 0,1.375 z m 46.40625,-5 c 0.56145,3.6e-5 1.15043,0.04113 1.78125,0.125 0.63078,0.08395 1.25487,0.207225 1.84375,0.375 1.00994,0.301887 1.86451,0.771327 2.59375,1.375 0.72921,0.60375 1.09372,1.485153 1.09375,2.625 -3e-5,0.502428 -0.16323,1.176365 -0.5,2.03125 -0.33681,0.854934 -0.78015,1.719461 -1.3125,2.625 -0.44851,-0.301836 -1.01736,-0.587994 -1.71875,-0.90625 -0.70143,-0.318192 -1.47116,-0.499968 -2.3125,-0.5 -0.72924,3.2e-5 -1.33921,0.235256 -1.84375,0.6875 -0.50456,0.452292 -0.75001,1.151933 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.5 -6.21875,0 0,16.78125 -8.375,0 0,-24.03125 c 0,-0.435871 -0.0138,-1.041466 0,-1.8125 0.0137,-0.770985 0.0684,-1.374066 0.125,-1.84375 0.36461,-2.71563 1.31855,-4.793349 2.875,-6.21875 1.55645,-1.425326 3.72345,-2.156214 6.5,-2.15625 z m -71.1875,0.0625 c 0.67271,3.6e-5 1.3375,0.06786 1.96875,0.21875 0.63121,0.150958 1.1795,0.426776 1.65625,0.8125 0.47672,0.385792 0.8618,0.906166 1.15625,1.59375 0.2944,0.687636 0.43749,1.583931 0.4375,2.65625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78865,-0.14019 -1.125,-0.375 -0.33639,-0.234826 -0.50001,-0.7295 -0.5,-1.5 -0.39286,0.602684 -1.01954,1.169709 -1.875,1.65625 -0.85548,0.486541 -1.92892,0.71875 -3.21875,0.71875 -0.95347,0 -1.88685,-0.193622 -2.8125,-0.5625 -0.92565,-0.368878 -1.75708,-1.015573 -2.5,-1.9375 -0.74292,-0.921927 -1.34946,-2.188593 -1.8125,-3.78125 -0.46304,-1.592657 -0.6875,-3.58517 -0.6875,-6 0,-2.413795 0.1902,-4.448411 0.625,-6.125 0.4348,-1.676541 1.02076,-3.054644 1.75,-4.09375 0.72922,-1.039073 1.57778,-1.780316 2.53125,-2.25 0.95347,-0.469635 1.96179,-0.718734 3,-0.71875 0.67273,1.6e-5 1.2797,0.113499 1.8125,0.28125 0.53279,0.167832 0.965,0.34458 1.34375,0.5625 0.37872,0.217968 0.69913,0.438314 0.9375,0.65625 0.23836,0.217968 0.38486,0.368494 0.46875,0.46875 l 0,-12.3125 c 0.33722,-0.03373 0.69873,-0.08971 1.0625,-0.15625 0.30897,-0.0675 0.63538,-0.122454 1,-0.15625 0.36461,-0.03373 0.72912,-0.03122 1.09375,-0.03125 z m 39.71875,0.34375 c 0.67359,3.6e-5 1.33795,0.06786 1.96875,0.21875 0.63079,0.150958 1.17951,0.426776 1.65625,0.8125 0.47674,0.385792 0.86181,0.937413 1.15625,1.625 0.29441,0.687619 0.4375,1.552697 0.4375,2.625 l 0,16.1875 c 0.14036,-0.736736 0.37893,-1.466634 0.6875,-2.1875 0.30854,-0.720866 0.71075,-1.419989 1.1875,-2.125 l 2.25,-3.46875 c 0.53235,-0.804248 1.13589,-1.506904 1.78125,-2.09375 0.64532,-0.586813 1.535,-0.874984 2.65625,-0.875 0.64532,1.6e-5 1.25788,0.125879 1.875,0.34375 0.61708,0.217984 1.1795,0.450694 1.65625,0.71875 0.53235,0.301884 1.02324,0.630637 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.904536 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75749,-0.56994 -1.40815,-1.314214 -1.96875,-2.21875 l -2.6875,-4.46875 c -0.47675,-0.770484 -0.84427,-1.516754 -1.125,-2.1875 -0.28074,-0.670713 -0.51589,-1.411956 -0.65625,-2.25 l 0,11.40625 -8.40625,0 0,-35.28125 c 0.33636,-0.03373 0.69789,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.72913,-0.06247 1.09375,-0.0625 z m 53.8125,0 c 0.67271,3.6e-5 1.3375,0.06786 1.96875,0.21875 0.63119,0.150958 1.17949,0.426776 1.65625,0.8125 0.47671,0.385792 0.8618,0.937413 1.15625,1.625 0.29441,0.687636 0.43747,1.552681 0.4375,2.625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78864,-0.10894 -1.125,-0.34375 -0.33638,-0.234826 -0.50001,-0.7295 -0.5,-1.5 -0.39287,0.602684 -1.01954,1.138459 -1.875,1.625 -0.85548,0.486541 -1.92893,0.71875 -3.21875,0.71875 -0.95348,0 -1.88685,-0.162372 -2.8125,-0.53125 -0.92566,-0.368878 -1.75708,-1.015573 -2.5,-1.9375 -0.74292,-0.921927 -1.34946,-2.188593 -1.8125,-3.78125 -0.46304,-1.592657 -0.6875,-3.58517 -0.6875,-6 0,-2.413795 0.1902,-4.479661 0.625,-6.15625 0.4348,-1.676541 1.02078,-3.023394 1.75,-4.0625 0.72922,-1.039073 1.57778,-1.780316 2.53125,-2.25 0.95347,-0.469635 1.96179,-0.718734 3,-0.71875 0.67273,1.6e-5 1.2797,0.08225 1.8125,0.25 0.53279,0.167832 0.965,0.37583 1.34375,0.59375 0.37873,0.217968 0.69911,0.438314 0.9375,0.65625 0.23835,0.217968 0.38486,0.368494 0.46875,0.46875 l 0,-12.3125 c 0.33722,-0.03373 0.69873,-0.08971 1.0625,-0.15625 0.30896,-0.0675 0.63537,-0.122454 1,-0.15625 0.36459,-0.03373 0.72912,-0.06247 1.09375,-0.0625 z m -118.8125,9.8125 c 2.29979,1.6e-5 4.3203,0.411989 6.03125,1.25 0.7566,0.369395 1.38412,0.823979 1.875,1.34375 0.49084,0.51982 0.71872,1.139791 0.71875,1.84375 -3e-5,0.602717 -0.14651,1.317737 -0.46875,2.15625 -0.32226,0.838562 -0.74204,1.634747 -1.21875,2.40625 -0.84222,-0.771503 -1.69979,-1.388944 -2.625,-1.875 -0.92524,-0.486008 -1.89028,-0.718718 -2.84375,-0.71875 -1.20596,3.2e-5 -1.8125,0.412005 -1.8125,1.25 0,0.536192 0.23901,0.933788 0.6875,1.21875 0.44848,0.284978 1.01433,0.517704 1.6875,0.71875 0.67316,0.201078 1.4022,0.4358 2.1875,0.6875 0.78526,0.251716 1.51431,0.622103 2.1875,1.125 0.67315,0.50293 1.23856,1.190725 1.6875,2.0625 0.4489,0.871808 0.65624,2.029549 0.65625,3.4375 -10e-6,2.682918 -0.79032,4.813593 -2.375,6.40625 -1.58471,1.592657 -3.87724,2.40625 -6.90625,2.40625 -1.73919,0 -3.09491,-0.181258 -4.0625,-0.5 -0.9676,-0.318742 -1.75188,-0.633118 -2.3125,-0.96875 -0.72922,-0.435888 -1.21969,-0.917696 -1.5,-1.4375 -0.2803,-0.519787 -0.40625,-1.05506 -0.40625,-1.625 0,-0.871791 0.14951,-1.724456 0.5,-2.5625 0.35049,-0.838011 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.368376 0.72145,0.712524 1.15625,1.03125 0.43478,0.318742 0.90126,0.606912 1.40625,0.875 0.50498,0.268088 1.0297,0.474074 1.5625,0.625 0.53279,0.150942 1.02626,0.218766 1.53125,0.21875 0.72921,1.6e-5 1.25393,-0.121321 1.5625,-0.40625 0.30854,-0.284962 0.46874,-0.657846 0.46875,-1.09375 -10e-6,-0.503415 -0.22446,-0.916882 -0.6875,-1.21875 -0.46304,-0.301836 -1.04559,-0.546926 -1.71875,-0.78125 -0.67317,-0.234308 -1.40567,-0.510632 -2.21875,-0.8125 -0.81311,-0.301852 -1.54559,-0.73018 -2.21875,-1.25 -0.67317,-0.519787 -1.25614,-1.207582 -1.71875,-2.0625 -0.46261,-0.854901 -0.6875,-1.968511 -0.6875,-3.34375 0,-1.340407 0.24201,-2.49414 0.71875,-3.5 0.47672,-1.005811 1.10727,-1.846144 1.90625,-2.5 0.79897,-0.653823 1.71222,-1.149992 2.75,-1.46875 1.03778,-0.318709 2.13091,-0.468734 3.28125,-0.46875 z m -81.125,0.03125 c 0.67359,1.6e-5 1.33795,0.06792 1.96875,0.21875 0.63079,0.150942 1.17951,0.427282 1.65625,0.8125 0.47674,0.385266 0.86181,0.906163 1.15625,1.59375 0.29441,0.687636 0.4375,1.583931 0.4375,2.65625 l 0,17.8125 c 0,0.737756 -0.0377,1.629007 -0.0937,2.71875 -0.056,1.08974 -0.17901,2.06571 -0.375,2.9375 -0.30899,1.34144 -0.79258,2.46993 -1.4375,3.375 -0.64492,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.7994,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.8131,0.23431 -1.53613,0.34373 -2.125,0.34375 -1.20596,-2e-5 -2.06396,-0.25947 -2.625,-0.8125 -0.56104,-0.55307 -0.96025,-1.36413 -1.15625,-2.4375 -0.0847,-0.4359 -0.14556,-0.88898 -0.1875,-1.375 -0.042,-0.48604 -0.0998,-1.16197 -0.15625,-2 0.89784,-0.1003 1.62647,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30855,-0.46967 0.51288,-1.036174 0.625,-1.65625 0.11218,-0.620076 0.18749,-1.293494 0.1875,-2.03125 l 0,-23.4375 c 0.33636,-0.03381 0.66664,-0.08976 1.03125,-0.15625 0.30812,-0.06746 0.65252,-0.122923 1.03125,-0.15625 0.37873,-0.03316 0.76038,-0.03125 1.125,-0.03125 z m 65.5,0.0625 c 0.67358,1.6e-5 1.3067,0.06792 1.9375,0.21875 0.63079,0.150942 1.1795,0.427282 1.65625,0.8125 0.47672,0.385266 0.86181,0.937413 1.15625,1.625 0.29443,0.687636 0.46874,1.552681 0.46875,2.625 l 0,17.8125 c -10e-6,0.737756 -0.0377,1.660257 -0.0937,2.75 -0.056,1.08974 -0.17901,2.06571 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46993 -1.4375,3.375 -0.64493,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.6244,0.92193 -2.4375,1.15625 -0.81311,0.23431 -1.5049,0.37498 -2.09375,0.375 -1.20596,-2e-5 -2.09522,-0.29072 -2.65625,-0.84375 -0.56104,-0.55307 -0.92901,-1.36413 -1.125,-2.4375 -0.0847,-0.4359 -0.14556,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0998,-1.16197 -0.15625,-2 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30854,-0.46967 0.51287,-1.004924 0.625,-1.625 0.11205,-0.620076 0.15625,-1.324744 0.15625,-2.0625 l 0,-23.4375 c 0.33636,-0.03381 0.69788,-0.05851 1.0625,-0.125 0.30812,-0.06746 0.6525,-0.122923 1.03125,-0.15625 0.37872,-0.03316 0.76038,-0.0625 1.125,-0.0625 z m 36.34375,7.84375 c -0.95347,1.6e-5 -1.61826,0.494189 -1.96875,1.5 -0.35049,1.00586 -0.53125,2.381433 -0.53125,4.125 0,0.80428 0.0411,1.562397 0.125,2.25 0.0839,0.687619 0.22693,1.292696 0.4375,1.8125 0.21054,0.519804 0.50737,0.916898 0.84375,1.21875 0.33635,0.301852 0.745,0.46875 1.25,0.46875 0.33635,0 0.61606,-0.04295 0.8125,-0.09375 0.19642,-0.05064 0.32151,-0.09119 0.40625,-0.125 l 0,-10.8125 c -0.16861,-0.133955 -0.38965,-0.231098 -0.65625,-0.28125 -0.26662,-0.05015 -0.49452,-0.0625 -0.71875,-0.0625 z m 93.1875,0.375 c -0.76834,0.110026 -1.31833,0.619915 -1.625,1.5 -0.3505,1.00586 -0.53126,2.381433 -0.53125,4.125 -10e-6,0.80428 0.0411,1.531147 0.125,2.21875 0.0839,0.687619 0.22695,1.292696 0.4375,1.8125 0.21055,0.519804 0.50737,0.948148 0.84375,1.25 0.33636,0.301852 0.74501,0.4375 1.25,0.4375 0.33636,0 0.61605,-0.0117 0.8125,-0.0625 0.19641,-0.05064 0.32151,-0.09119 0.40625,-0.125 l 0,-10.8125 c -0.16863,-0.133955 -0.38965,-0.231098 -0.65625,-0.28125 -0.26663,-0.05015 -0.49452,-0.0625 -0.71875,-0.0625 -0.11919,2e-6 -0.23399,-0.01572 -0.34375,0 z M 233.8125,108.0625 c 0.67359,5e-5 1.3067,0.0992 1.9375,0.25 0.63079,0.15094 1.21075,0.39553 1.6875,0.78125 0.47672,0.3858 0.86181,0.93741 1.15625,1.625 0.29441,0.68764 0.43749,1.55268 0.4375,2.625 l 0,30.1875 c -1.14949,0.4359 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.19362 -3,-0.5625 -0.71511,-0.36886 -1.24326,-0.8338 -1.59375,-1.4375 -0.35049,-0.6037 -0.55481,-1.30586 -0.625,-2.09375 -0.0702,-0.78788 -0.125,-1.62821 -0.125,-2.5 l 0,-29.15625 c 0.33636,-0.0336 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.76038,-0.0625 1.125,-0.0625 z m 11.75,0 c 0.67359,5e-5 1.33795,0.0992 1.96875,0.25 0.63079,0.15094 1.1795,0.39553 1.65625,0.78125 0.47672,0.3858 0.86181,0.93741 1.15625,1.625 0.29443,0.68764 0.43749,1.55268 0.4375,2.625 l 0,16.1875 c 0.14036,-0.73672 0.37895,-1.43537 0.6875,-2.15625 0.30854,-0.72085 0.71075,-1.45122 1.1875,-2.15625 l 2.25,-3.46875 c 0.53235,-0.80423 1.13589,-1.50689 1.78125,-2.09375 0.64534,-0.5868 1.535,-0.87498 2.65625,-0.875 0.64534,2e-5 1.25788,0.12588 1.875,0.34375 0.61708,0.21798 1.17949,0.45069 1.65625,0.71875 0.53234,0.30188 1.02325,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85132,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75748,-0.56994 -1.40815,-1.31421 -1.96875,-2.21875 L 252.5625,136.75 c -0.47675,-0.77048 -0.84428,-1.51675 -1.125,-2.1875 -0.28074,-0.67071 -0.51589,-1.41196 -0.65625,-2.25 l 0,11.40625 -8.40625,0 0,-35.28125 c 0.33636,-0.0336 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.72914,-0.0625 1.09375,-0.0625 z m -23.9375,0.25 c 0.67271,5e-5 1.30625,0.0679 1.9375,0.21875 0.63121,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.8618,0.93741 1.15625,1.625 0.2944,0.68764 0.46874,1.55268 0.46875,2.625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.8199,-0.10896 -1.15625,-0.34375 -0.33638,-0.23483 -0.50001,-0.7295 -0.5,-1.5 -0.39286,0.60268 -1.01954,1.13846 -1.875,1.625 -0.85548,0.48654 -1.92892,0.71875 -3.21875,0.71875 -0.95347,0 -1.88685,-0.16237 -2.8125,-0.53125 -0.92566,-0.36888 -1.75708,-1.01557 -2.5,-1.9375 -0.74292,-0.92193 -1.34946,-2.18858 -1.8125,-3.78125 -0.46304,-1.59264 -0.6875,-3.58517 -0.6875,-6 0,-2.41379 0.22145,-4.47966 0.65625,-6.15625 0.4348,-1.67654 1.02078,-3.02339 1.75,-4.0625 0.72922,-1.03907 1.54653,-1.78032 2.5,-2.25 0.95347,-0.46965 1.96179,-0.71873 3,-0.71875 0.67273,2e-5 1.27969,0.0823 1.8125,0.25 0.53277,0.16783 0.99625,0.37583 1.375,0.59375 0.37872,0.21797 0.66788,0.40708 0.90625,0.625 0.23836,0.21798 0.41611,0.39974 0.5,0.5 l 0,-12.34375 c 0.33722,-0.0336 0.66748,-0.0584 1.03125,-0.125 0.30897,-0.0675 0.66663,-0.12244 1.03125,-0.15625 0.36461,-0.0336 0.72912,-0.0625 1.09375,-0.0625 z m -23.09375,0.0312 c 0.56146,3e-5 1.15045,0.0412 1.78125,0.125 0.63079,0.084 1.25488,0.20723 1.84375,0.375 1.00996,0.30188 1.8645,0.77133 2.59375,1.375 0.7292,0.60375 1.09374,1.4539 1.09375,2.59375 -1e-5,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.78015,1.75071 -1.3125,2.65625 -0.44851,-0.30184 -1.01736,-0.61924 -1.71875,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.23526 -1.84375,0.6875 -0.50456,0.45229 -0.75,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.46875 -6.21875,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 201.65625,0.625 c 1.14946,3e-5 2.13808,0.42586 2.9375,1.28125 0.79939,0.85545 1.18749,2.02704 1.1875,3.46875 -10e-6,1.44176 -0.38811,2.56824 -1.1875,3.40625 -0.79942,0.83804 -1.78804,1.25003 -2.9375,1.25 -1.15033,3e-5 -2.10728,-0.41196 -2.90625,-1.25 -0.79898,-0.83801 -1.1875,-1.96449 -1.1875,-3.40625 0,-1.44171 0.38852,-2.6133 1.1875,-3.46875 0.79897,-0.85539 1.75592,-1.28122 2.90625,-1.28125 z m -109,0.0312 c 0.67359,5e-5 1.33793,0.0679 1.96875,0.21875 0.63079,0.15094 1.17951,0.42678 1.65625,0.8125 0.47674,0.3858 0.86181,0.90616 1.15625,1.59375 0.29441,0.68764 0.43749,1.58393 0.4375,2.65625 l 0,16.1875 c 0.14036,-0.73672 0.34768,-1.46662 0.65625,-2.1875 0.30854,-0.72085 0.71075,-1.41997 1.1875,-2.125 l 2.28125,-3.46875 c 0.53235,-0.80423 1.10464,-1.50689 1.75,-2.09375 0.64532,-0.5868 1.535,-0.87498 2.65625,-0.875 0.64532,2e-5 1.28912,0.0946 1.90625,0.3125 0.61708,0.21798 1.14825,0.48194 1.625,0.75 0.53235,0.30188 1.05449,0.63064 1.53125,1 l -5.78125,9.65625 6.8125,12.40625 c -1.85134,0.90454 -3.52019,1.375 -5.0625,1.375 -1.3181,0 -2.36755,-0.30506 -3.125,-0.875 -0.75748,-0.56994 -1.40815,-1.28296 -1.96875,-2.1875 l -2.71875,-4.5 c -0.47675,-0.77048 -0.84427,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.48464,-1.41196 -0.625,-2.25 l 0,11.40625 -8.40625,0 0,-35.3125 c 0.33636,-0.0336 0.66663,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.0912 1.03125,-0.125 0.37873,-0.0336 0.76038,-0.0625 1.125,-0.0625 z m 30.5625,0.125 c 0.56146,3e-5 1.15045,0.0412 1.78125,0.125 0.63079,0.084 1.25488,0.20723 1.84375,0.375 1.00994,0.30188 1.86451,0.74008 2.59375,1.34375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -10e-6,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.7489,1.75071 -1.28125,2.65625 -0.44851,-0.30184 -1.04861,-0.61924 -1.75,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.20401 -1.84375,0.65625 -0.50456,0.45229 -0.75,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.37407 0.0937,-1.84375 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 40.78125,0.71875 c 0.67273,5e-5 1.33751,0.0679 1.96875,0.21875 0.63121,0.15094 1.17949,0.42678 1.65625,0.8125 0.47671,0.3858 0.8618,0.90616 1.15625,1.59375 0.29441,0.68764 0.43747,1.58393 0.4375,2.65625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78864,-0.14021 -1.125,-0.375 -0.33638,-0.23483 -0.50001,-0.7295 -0.5,-1.5 -0.39287,0.60268 -1.01953,1.13846 -1.875,1.625 -0.85548,0.48654 -1.92893,0.75 -3.21875,0.75 -0.95348,0 -1.88685,-0.19362 -2.8125,-0.5625 -0.92566,-0.36888 -1.75709,-1.01557 -2.5,-1.9375 -0.74293,-0.92193 -1.34946,-2.18858 -1.8125,-3.78125 -0.46304,-1.59264 -0.6875,-3.58517 -0.6875,-6 0,-2.41379 0.1902,-4.44841 0.625,-6.125 0.43478,-1.67654 1.02078,-3.05464 1.75,-4.09375 0.72922,-1.03907 1.57777,-1.78032 2.53125,-2.25 0.95346,-0.46965 1.96179,-0.71873 3,-0.71875 0.67273,2e-5 1.27969,0.1135 1.8125,0.28125 0.53279,0.16783 0.965,0.34458 1.34375,0.5625 0.37872,0.21797 0.69911,0.43833 0.9375,0.65625 0.23835,0.21798 0.38486,0.36849 0.46875,0.46875 l 0,-12.3125 c 0.3372,-0.0336 0.69872,-0.0896 1.0625,-0.15625 0.30896,-0.0675 0.63537,-0.12244 1,-0.15625 0.36459,-0.0336 0.72913,-0.0312 1.09375,-0.0312 z m 11.78125,0 c 0.67359,5e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.17951,0.42678 1.65625,0.8125 0.47674,0.3858 0.86181,0.90616 1.15625,1.59375 0.29441,0.68764 0.46875,1.58393 0.46875,2.65625 l 0,16.1875 c 0.14036,-0.73672 0.34768,-1.46662 0.65625,-2.1875 0.30854,-0.72085 0.71076,-1.45122 1.1875,-2.15625 L 383.65625,123.5 c 0.53235,-0.80423 1.10464,-1.47564 1.75,-2.0625 0.64532,-0.5868 1.535,-0.90623 2.65625,-0.90625 0.64532,2e-5 1.25788,0.12588 1.875,0.34375 0.61708,0.21798 1.1795,0.45069 1.65625,0.71875 0.53235,0.30188 1.02324,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.3363,-0.27381 -3.09375,-0.84375 -0.75749,-0.56994 -1.4394,-1.31421 -2,-2.21875 L 381.28125,138.5 c -0.47675,-0.77048 -0.84427,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.48464,-1.44321 -0.625,-2.28125 l 0,11.4375 -8.4375,0 0,-35.3125 c 0.33636,-0.0336 0.69789,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.76038,-0.0312 1.125,-0.0312 z m -97.96875,9.34375 c 3.2815,2e-5 5.61471,0.77 7.03125,2.3125 1.41648,1.54254 2.12499,3.99064 2.125,7.34375 l 0,9.8125 c -10e-6,0.83803 0.0753,1.76053 0.1875,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13412 -0.75439,0.22858 -1.0625,0.3125 -0.30813,0.084 -0.6114,0.16863 -0.90625,0.21875 -0.29487,0.0502 -0.61528,0.0769 -0.9375,0.0937 -0.32226,0.0168 -0.66967,0.0312 -1.0625,0.0312 -2.27157,0 -3.60416,-0.76946 -3.96875,-2.3125 -0.47675,0.56994 -1.16812,1.09283 -2.09375,1.5625 -0.92568,0.46965 -2.09805,0.6875 -3.5,0.6875 -0.8696,0 -1.7006,-0.13823 -2.5,-0.40625 -0.79942,-0.26809 -1.50791,-0.69442 -2.125,-1.28125 -0.61711,-0.58681 -1.10413,-1.35679 -1.46875,-2.3125 -0.36461,-0.95569 -0.53125,-2.12476 -0.53125,-3.5 0,-1.94413 0.42578,-3.49948 1.28125,-4.65625 0.85547,-1.15675 1.87366,-2.02128 3.09375,-2.625 1.22007,-0.60369 2.50854,-0.98894 3.8125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84001 -0.21875,-1.125 -0.14037,-0.28495 -0.32415,-0.50531 -0.5625,-0.65625 -0.23839,-0.15094 -0.52108,-0.23108 -0.84375,-0.28125 -0.32268,-0.0502 -0.66664,-0.0937 -1.03125,-0.0937 -0.98086,2e-5 -1.95236,0.15061 -2.90625,0.46875 -0.9539,0.31824 -2.00978,0.82877 -3.1875,1.5 -0.53322,-0.7715 -0.95257,-1.54348 -1.21875,-2.28125 -0.26618,-0.73774 -0.40625,-1.28787 -0.40625,-1.65625 0,-0.50342 0.1572,-0.98522 0.4375,-1.4375 0.28031,-0.45226 0.84915,-0.90279 1.71875,-1.40625 0.75745,-0.46964 1.77265,-0.8569 3.0625,-1.125 1.28982,-0.26806 2.62242,-0.40623 3.96875,-0.40625 z M 336.4375,120.5 c 2.29979,2e-5 4.28904,0.412 6,1.25 0.7566,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.74999,1.10854 0.75,1.8125 -10e-6,0.60272 -0.17778,1.31774 -0.5,2.15625 -0.32226,0.83856 -0.71078,1.666 -1.1875,2.4375 -0.84222,-0.7715 -1.73104,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85904,-0.71872 -2.8125,-0.71875 -1.20597,3e-5 -1.81251,0.41199 -1.8125,1.25 -10e-6,0.53619 0.20774,0.96504 0.65625,1.25 0.44848,0.28498 1.01433,0.5177 1.6875,0.71875 0.67315,0.20108 1.4022,0.43578 2.1875,0.6875 0.78528,0.25172 1.51433,0.6221 2.1875,1.125 0.67316,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.68749,1.9983 0.6875,3.40625 -10e-6,2.68292 -0.79032,4.84484 -2.375,6.4375 -1.58471,1.59266 -3.90849,2.375 -6.9375,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.72064,-0.66437 -2.28125,-1 -0.72922,-0.43589 -1.25095,-0.9177 -1.53125,-1.4375 -0.28031,-0.51979 -0.40625,-1.05506 -0.40625,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.73901,-1.66447 1.1875,-2.46875 0.33636,0.36838 0.72145,0.71252 1.15625,1.03125 0.4348,0.31874 0.90127,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.47407 1.5625,0.625 0.53279,0.15094 1.05751,0.25002 1.5625,0.25 0.72922,2e-5 1.25395,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.25572,-0.88563 -0.71875,-1.1875 -0.46305,-0.30184 -1.01435,-0.57818 -1.6875,-0.8125 -0.67317,-0.23432 -1.4369,-0.51063 -2.25,-0.8125 -0.81311,-0.30185 -1.54559,-0.69895 -2.21875,-1.21875 -0.67316,-0.51979 -1.22489,-1.20758 -1.6875,-2.0625 -0.46262,-0.8549 -0.71876,-1.96851 -0.71875,-3.34375 -10e-6,-1.34041 0.24201,-2.52539 0.71875,-3.53125 0.47674,-1.00581 1.10727,-1.81489 1.90625,-2.46875 0.79898,-0.65382 1.74346,-1.14999 2.78125,-1.46875 1.03776,-0.31871 2.13092,-0.46873 3.28125,-0.46875 z m 63,0.5625 c 0.67358,3e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.1795,0.42727 1.65625,0.8125 0.47672,0.38527 0.86181,0.90616 1.15625,1.59375 0.29443,0.68764 0.43749,1.58393 0.4375,2.65625 l 0,17.78125 c -10e-6,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08974 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.76135,2.46995 -1.40625,3.375 -0.64493,0.90505 -1.3881,1.63392 -2.1875,2.1875 -0.79942,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.81311,0.23431 -1.5049,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.29072 -2.65625,-0.84375 -0.56103,-0.55307 -0.96025,-1.36413 -1.15625,-2.4375 -0.0847,-0.4359 -0.14555,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0684,-1.13074 -0.125,-1.96875 0.89784,-0.1003 1.62646,-0.32315 2.1875,-0.625 0.56104,-0.30185 0.9727,-0.68658 1.28125,-1.15625 0.30854,-0.46967 0.54412,-1.00492 0.65625,-1.625 0.11218,-0.62008 0.15625,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69788,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.12308 1.03125,-0.15625 0.37872,-0.0332 0.72913,-0.0312 1.09375,-0.0312 z m -182.75,5.375 c -0.76834,0.11003 -1.31832,0.61992 -1.625,1.5 -0.35049,1.00586 -0.50001,2.38143 -0.5,4.125 -1e-5,0.80428 0.0411,1.53115 0.125,2.21875 0.0839,0.68762 0.22693,1.2927 0.4375,1.8125 0.21054,0.5198 0.47612,0.94815 0.8125,1.25 0.33635,0.30185 0.74501,0.4375 1.25,0.4375 0.33635,0 0.61606,-0.0117 0.8125,-0.0625 0.19642,-0.0506 0.3215,-0.0912 0.40625,-0.125 l 0,-10.8125 c -0.16863,-0.13395 -0.3584,-0.2311 -0.625,-0.28125 -0.26662,-0.0502 -0.52577,-0.0625 -0.75,-0.0625 -0.11918,0 -0.23399,-0.0157 -0.34375,0 z m 141.28125,1.5 c -0.95348,2e-5 -1.61827,0.49419 -1.96875,1.5 -0.3505,1.00586 -0.53126,2.38143 -0.53125,4.125 -10e-6,0.80428 0.0411,1.5624 0.125,2.25 0.0839,0.68762 0.22693,1.2927 0.4375,1.8125 0.21054,0.5198 0.50737,0.9169 0.84375,1.21875 0.33636,0.30185 0.74501,0.46875 1.25,0.46875 0.33635,0 0.61605,-0.0429 0.8125,-0.0937 0.19641,-0.0506 0.3215,-0.0912 0.40625,-0.125 l 0,-10.8125 c -0.16863,-0.13395 -0.38966,-0.2311 -0.65625,-0.28125 -0.26663,-0.0502 -0.49452,-0.0625 -0.71875,-0.0625 z m -80.3125,4.9375 c -0.53238,0.0676 -1.05411,0.17848 -1.53125,0.3125 -0.47718,0.13412 -0.89952,0.31132 -1.25,0.5625 -0.3505,0.25121 -0.60238,0.59737 -0.8125,1 -0.21013,0.40266 -0.34376,0.92605 -0.34375,1.5625 -10e-6,0.77152 0.18075,1.36224 0.53125,1.78125 0.35048,0.41901 0.85164,0.625 1.46875,0.625 0.50498,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59374,-0.68154 0.59375,-1.21875 l 0,-4.21875 z m 56.96875,76.6875 c 1.14946,3e-5 2.13808,0.42586 2.9375,1.28125 0.79939,0.85545 1.18749,1.9958 1.1875,3.4375 -10e-6,1.44176 -0.38811,2.5995 -1.1875,3.4375 -0.79942,0.83806 -1.78804,1.25003 -2.9375,1.25 -1.15033,3e-5 -2.10728,-0.41194 -2.90625,-1.25 -0.79898,-0.838 -1.21875,-1.99574 -1.21875,-3.4375 0,-1.4417 0.41977,-2.58205 1.21875,-3.4375 0.79897,-0.85539 1.75592,-1.28122 2.90625,-1.28125 z m -89.1875,0.46875 c 0.56145,3e-5 1.18168,0.041 1.8125,0.125 0.63079,0.084 1.22363,0.20723 1.8125,0.375 1.00994,0.30188 1.89576,0.74008 2.625,1.34375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -1e-5,0.50243 -0.19447,1.17636 -0.53125,2.03125 -0.33681,0.85493 -0.7489,1.71946 -1.28125,2.625 -0.44851,-0.30184 -1.01736,-0.58799 -1.71875,-0.90625 -0.70143,-0.31819 -1.50242,-0.49997 -2.34375,-0.5 -0.72924,3e-5 -1.33921,0.23526 -1.84375,0.6875 -0.50456,0.45229 -0.75,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0373,-1.37407 0.0937,-1.84375 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72345,-2.12497 6.5,-2.125 z m 106.5,0 c 0.56145,3e-5 1.15043,0.041 1.78125,0.125 0.63078,0.084 1.25487,0.20723 1.84375,0.375 1.00994,0.30188 1.86451,0.74008 2.59375,1.34375 0.72921,0.60375 1.09372,1.48515 1.09375,2.625 -3e-5,0.50243 -0.16323,1.17636 -0.5,2.03125 -0.33682,0.85493 -0.78016,1.71946 -1.3125,2.625 -0.44851,-0.30184 -1.01736,-0.58799 -1.71875,-0.90625 -0.70143,-0.31819 -1.47116,-0.49997 -2.3125,-0.5 -0.72924,3e-5 -1.33921,0.23526 -1.84375,0.6875 -0.50456,0.45229 -0.75001,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 -0.0138,-1.04148 0,-1.8125 0.0137,-0.77099 0.0684,-1.37407 0.125,-1.84375 0.36462,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55644,-1.42533 3.72345,-2.12497 6.5,-2.125 z m -76.96875,0.375 c 0.67359,5e-5 1.3067,0.0992 1.9375,0.25 0.6308,0.15094 1.21076,0.39553 1.6875,0.78125 0.47674,0.3858 0.86181,0.93741 1.15625,1.625 0.29441,0.68764 0.43749,1.55268 0.4375,2.625 l 0,30.1875 c -1.14949,0.4359 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.19362 -3,-0.5625 -0.71511,-0.36886 -1.24327,-0.8338 -1.59375,-1.4375 -0.3505,-0.6037 -0.55482,-1.30586 -0.625,-2.09375 -0.0702,-0.78788 -0.0937,-1.62821 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.0336 0.66663,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.76038,-0.0625 1.125,-0.0625 z m 11.75,0 c 0.67358,5e-5 1.3067,0.0992 1.9375,0.25 0.63079,0.15094 1.21075,0.39553 1.6875,0.78125 0.47672,0.3858 0.86181,0.93741 1.15625,1.625 0.29443,0.68764 0.43749,1.55268 0.4375,2.625 l 0,16.21875 c 0.14036,-0.73672 0.3477,-1.46662 0.65625,-2.1875 0.30854,-0.72085 0.71075,-1.45122 1.1875,-2.15625 l 2.28125,-3.46875 c 0.53235,-0.80423 1.10464,-1.5069 1.75,-2.09375 0.64534,-0.5868 1.535,-0.87498 2.65625,-0.875 0.64534,2e-5 1.28913,0.12588 1.90625,0.34375 0.61708,0.21797 1.14824,0.45069 1.625,0.71875 0.53234,0.30188 1.05449,0.63064 1.53125,1 l -5.78125,9.65625 6.8125,12.4375 c -1.85132,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.3363,-0.27381 -3.09375,-0.84375 -0.75749,-0.56994 -1.4394,-1.31421 -2,-2.21875 l -2.6875,-4.46875 c -0.47674,-0.77048 -0.84428,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.48464,-1.44321 -0.625,-2.28125 l 0,11.4375 -8.4375,0 0,-35.3125 c 0.33636,-0.0336 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.12244 1.03125,-0.15625 0.37872,-0.0336 0.76038,-0.0625 1.125,-0.0625 z M 260.5625,221.125 c 2.29979,2e-5 4.32029,0.412 6.03125,1.25 0.7566,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.71874,1.13979 0.71875,1.84375 -10e-6,0.60272 -0.14653,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.74203,1.63475 -1.21875,2.40625 -0.84222,-0.7715 -1.73104,-1.38894 -2.65625,-1.875 -0.92524,-0.48601 -1.85904,-0.71873 -2.8125,-0.71875 -1.20597,2e-5 -1.81251,0.41199 -1.8125,1.25 -10e-6,0.53619 0.23899,0.93379 0.6875,1.21875 0.44848,0.28498 1.01433,0.54895 1.6875,0.75 0.67315,0.20108 1.4022,0.40455 2.1875,0.65625 0.78528,0.25173 1.51433,0.65335 2.1875,1.15625 0.67316,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65624,1.9983 0.65625,3.40625 -10e-6,2.68292 -0.79032,4.81359 -2.375,6.40625 -1.58471,1.59266 -3.87724,2.40625 -6.90625,2.40625 -1.73919,0 -3.09491,-0.18126 -4.0625,-0.5 -0.9676,-0.31874 -1.75189,-0.63312 -2.3125,-0.96875 -0.72922,-0.43589 -1.2197,-0.9177 -1.5,-1.4375 -0.28031,-0.51979 -0.4375,-1.05506 -0.4375,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.36838 0.72145,0.71252 1.15625,1.03125 0.4348,0.31874 0.90127,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.47407 1.5625,0.625 0.53279,0.15094 1.02626,0.21875 1.53125,0.21875 0.72922,0 1.25393,-0.12132 1.5625,-0.40625 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.22447,-0.91688 -0.6875,-1.21875 -0.46305,-0.30184 -1.0456,-0.54693 -1.71875,-0.78125 -0.67317,-0.23432 -1.40565,-0.51063 -2.21875,-0.8125 -0.81311,-0.30185 -1.54559,-0.69895 -2.21875,-1.21875 -0.67316,-0.51979 -1.25614,-1.20758 -1.71875,-2.0625 -0.46262,-0.8549 -0.68751,-1.96851 -0.6875,-3.34375 -1e-5,-1.34041 0.24201,-2.52539 0.71875,-3.53125 0.47674,-1.00581 1.10727,-1.84614 1.90625,-2.5 0.79898,-0.65382 1.71221,-1.11874 2.75,-1.4375 1.03776,-0.31871 2.13092,-0.49998 3.28125,-0.5 z m 57.59375,0 c 3.2815,2e-5 5.64598,0.77 7.0625,2.3125 1.4165,1.54254 2.12499,3.99064 2.125,7.34375 l 0,9.8125 c -10e-6,0.83803 0.0441,1.76053 0.15625,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13395 -0.75439,0.22858 -1.0625,0.3125 -0.30815,0.084 -0.61142,0.16863 -0.90625,0.21875 -0.29487,0.0502 -0.58403,0.0769 -0.90625,0.0937 -0.32226,0.0168 -0.7009,0.0312 -1.09375,0.0312 -2.27156,0 -3.57291,-0.76946 -3.9375,-2.3125 -0.47675,0.56994 -1.1681,1.0616 -2.09375,1.53125 -0.92566,0.46967 -2.09805,0.71875 -3.5,0.71875 -0.8696,0 -1.7006,-0.13823 -2.5,-0.40625 -0.7994,-0.26809 -1.50791,-0.69442 -2.125,-1.28125 -0.61711,-0.58683 -1.10414,-1.35681 -1.46875,-2.3125 -0.36462,-0.95569 -0.5625,-2.12476 -0.5625,-3.5 0,-1.94413 0.42578,-3.49948 1.28125,-4.65625 0.85547,-1.15675 1.90491,-2.02128 3.125,-2.625 1.22007,-0.60369 2.47729,-0.98894 3.78125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84002 -0.21875,-1.125 -0.14037,-0.28496 -0.32415,-0.50531 -0.5625,-0.65625 -0.23839,-0.15094 -0.52108,-0.26233 -0.84375,-0.3125 -0.32268,-0.0502 -0.66664,-0.0625 -1.03125,-0.0625 -0.98086,2e-5 -1.95236,0.15061 -2.90625,0.46875 -0.9539,0.31824 -2.00978,0.82877 -3.1875,1.5 -0.53323,-0.7715 -0.92132,-1.54348 -1.1875,-2.28125 C 309.14007,226.41851 309,225.86838 309,225.5 c 0,-0.50342 0.12594,-0.98521 0.40625,-1.4375 0.28031,-0.45224 0.84915,-0.90279 1.71875,-1.40625 0.75747,-0.46964 1.8039,-0.8569 3.09375,-1.125 1.28983,-0.26806 2.59117,-0.40623 3.9375,-0.40625 z m 15.71875,0.5 c 0.67358,3e-5 1.33795,0.0992 1.96875,0.25 0.63079,0.15094 1.1795,0.39602 1.65625,0.78125 0.47672,0.38527 0.86181,0.93741 1.15625,1.625 0.29443,0.68762 0.43749,1.55266 0.4375,2.625 l 0,17.8125 c -10e-6,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46995 -1.4375,3.375 -0.64493,0.90505 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.81311,0.23431 -1.53615,0.34373 -2.125,0.34375 -1.20596,-2e-5 -2.06396,-0.29072 -2.625,-0.84375 -0.56104,-0.55307 -0.96026,-1.36415 -1.15625,-2.4375 -0.0847,-0.4359 -0.14556,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0998,-1.16199 -0.15625,-2 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30854,-0.46967 0.51288,-1.00492 0.625,-1.625 0.11218,-0.62008 0.1875,-1.29349 0.1875,-2.03125 l 0,-23.4375 c 0.33638,-0.0338 0.66663,-0.0898 1.03125,-0.15625 0.30812,-0.0675 0.6525,-0.12308 1.03125,-0.15625 0.37872,-0.0332 0.76038,-0.0625 1.125,-0.0625 z m -14.40625,13.1875 c -0.53238,0.0676 -1.02285,0.17846 -1.5,0.3125 -0.47717,0.13412 -0.89952,0.31132 -1.25,0.5625 -0.3505,0.25121 -0.63364,0.59737 -0.84375,1 -0.21013,0.40266 -0.31251,0.8948 -0.3125,1.53125 -10e-6,0.77152 0.18075,1.39349 0.53125,1.8125 0.35048,0.41901 0.82039,0.625 1.4375,0.625 0.50496,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59374,-0.68154 0.59375,-1.21875 l 0,-4.21875 z M 253.125,259.84375 c 1.14946,3e-5 2.13808,0.45711 2.9375,1.3125 0.7994,0.85545 1.18749,1.9958 1.1875,3.4375 -10e-6,1.44176 -0.3881,2.56825 -1.1875,3.40625 -0.79942,0.83806 -1.78804,1.25003 -2.9375,1.25 -1.15033,3e-5 -2.13852,-0.41194 -2.9375,-1.25 -0.79898,-0.838 -1.1875,-1.96449 -1.1875,-3.40625 0,-1.4417 0.38852,-2.58205 1.1875,-3.4375 0.79898,-0.85539 1.78717,-1.31247 2.9375,-1.3125 z m 91.875,0 c 1.14946,3e-5 2.10683,0.45711 2.90625,1.3125 0.7994,0.85545 1.18749,1.9958 1.1875,3.4375 -10e-6,1.44176 -0.3881,2.56825 -1.1875,3.40625 -0.79942,0.83806 -1.75679,1.25003 -2.90625,1.25 -1.15034,3e-5 -2.13852,-0.41194 -2.9375,-1.25 -0.64144,-0.67277 -0.99853,-1.53182 -1.125,-2.59375 -0.0775,0.40337 -0.22146,0.85783 -0.4375,1.40625 -0.33681,0.85493 -0.74891,1.75071 -1.28125,2.65625 -0.44851,-0.30184 -1.04861,-0.61924 -1.75,-0.9375 -0.70143,-0.31819 -1.47116,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.23527 -1.84375,0.6875 -0.50456,0.45231 -0.75001,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.46875 -6.21875,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72345,-2.12497 6.5,-2.125 0.56145,3e-5 1.15043,0.0412 1.78125,0.125 0.63078,0.084 1.25487,0.20722 1.84375,0.375 1.00994,0.30188 1.86451,0.77133 2.59375,1.375 0.52938,0.4383 0.85492,0.99792 1,1.71875 0.11089,-1.12027 0.49032,-2.03699 1.15625,-2.75 0.79898,-0.85539 1.78716,-1.31247 2.9375,-1.3125 z m -4.09375,4.0625 c -0.0222,0.22381 -0.0312,0.44744 -0.0312,0.6875 0,0.28426 0.0314,0.55171 0.0625,0.8125 0.0433,-0.22541 0.0625,-0.44488 0.0625,-0.625 -10e-6,-0.31236 -0.039,-0.6029 -0.0937,-0.875 z m 40.375,-3.59375 c 0.56146,3e-5 1.15045,0.0412 1.78125,0.125 0.63079,0.084 1.22363,0.20722 1.8125,0.375 1.00994,0.30188 1.89576,0.77133 2.625,1.375 0.72921,0.60375 1.09374,1.4539 1.09375,2.59375 -10e-6,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.78015,1.75071 -1.3125,2.65625 -0.44851,-0.30184 -1.01736,-0.61924 -1.71875,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.23527 -1.84375,0.6875 -0.50456,0.45231 -0.78125,1.15193 -0.78125,2.125 l 0,1.21875 6.25,0 0,7.46875 -6.25,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.3498,-4.79336 2.90625,-6.21875 1.55645,-1.42533 3.72345,-2.12497 6.5,-2.125 z M 221.625,260.71875 c 0.67273,5e-5 1.33751,0.0679 1.96875,0.21875 0.63121,0.15094 1.17949,0.42678 1.65625,0.8125 0.47671,0.3858 0.8618,0.90618 1.15625,1.59375 0.29441,0.68765 0.43747,1.58393 0.4375,2.65625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78864,-0.10896 -1.125,-0.34375 -0.33638,-0.23483 -0.50001,-0.76075 -0.5,-1.53125 -0.39287,0.60268 -1.01953,1.16971 -1.875,1.65625 -0.85548,0.48654 -1.92893,0.71875 -3.21875,0.71875 -0.95348,0 -1.9181,-0.19362 -2.84375,-0.5625 -0.92566,-0.36888 -1.75709,-1.01556 -2.5,-1.9375 -0.74293,-0.92193 -1.34947,-2.15733 -1.8125,-3.75 -0.46305,-1.59264 -0.6875,-3.61642 -0.6875,-6.03125 0,-2.41379 0.22145,-4.44841 0.65625,-6.125 0.43478,-1.67654 1.02078,-3.02339 1.75,-4.0625 0.72922,-1.03907 1.57777,-1.81157 2.53125,-2.28125 0.95346,-0.46965 1.93054,-0.68747 2.96875,-0.6875 0.67273,3e-5 1.27969,0.0822 1.8125,0.25 0.53279,0.16785 0.99625,0.34458 1.375,0.5625 0.37872,0.21797 0.69911,0.43833 0.9375,0.65625 0.23835,0.21798 0.38486,0.36851 0.46875,0.46875 l 0,-12.3125 c 0.3372,-0.0338 0.69872,-0.0896 1.0625,-0.15625 0.30896,-0.0675 0.63537,-0.12244 1,-0.15625 0.36459,-0.0337 0.72913,-0.0312 1.09375,-0.0312 z m 16.34375,10.71875 c 2.29979,3e-5 4.32029,0.412 6.03125,1.25 0.75659,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.71874,1.10854 0.71875,1.8125 -1e-5,0.6027 -0.14653,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.74203,1.666 -1.21875,2.4375 -0.84222,-0.7715 -1.73104,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85904,-0.71873 -2.8125,-0.71875 -1.20597,2e-5 -1.81251,0.41199 -1.8125,1.25 -1e-5,0.53619 0.23901,0.96504 0.6875,1.25 0.44849,0.28498 1.01433,0.51769 1.6875,0.71875 0.67315,0.20108 1.4022,0.4358 2.1875,0.6875 0.78528,0.25173 1.51433,0.6221 2.1875,1.125 0.67315,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65624,1.9983 0.65625,3.40625 -1e-5,2.68292 -0.79032,4.84484 -2.375,6.4375 -1.58471,1.59266 -3.87724,2.375 -6.90625,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.75189,-0.66437 -2.3125,-1 -0.72922,-0.43589 -1.2197,-0.88645 -1.5,-1.40625 -0.28031,-0.5198 -0.4375,-1.08631 -0.4375,-1.65625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.4348,0.31874 0.90127,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.50532 1.5625,0.65625 0.53279,0.15094 1.02626,0.21875 1.53125,0.21875 0.72922,0 1.25393,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.6266 0.46875,-1.0625 -1e-5,-0.50342 -0.22447,-0.91688 -0.6875,-1.21875 -0.46305,-0.30184 -1.0456,-0.57818 -1.71875,-0.8125 -0.67317,-0.23432 -1.40565,-0.51065 -2.21875,-0.8125 -0.81311,-0.30185 -1.54559,-0.69895 -2.21875,-1.21875 -0.67316,-0.51979 -1.25614,-1.20758 -1.71875,-2.0625 -0.46262,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.24201,-2.52539 0.71875,-3.53125 0.47674,-1.00581 1.10727,-1.81489 1.90625,-2.46875 0.79898,-0.65382 1.71221,-1.14999 2.75,-1.46875 1.03776,-0.31871 2.13091,-0.46872 3.28125,-0.46875 z m 32.65625,0 c 1.71092,3e-5 3.16903,0.30256 4.375,0.90625 1.20595,0.60372 2.19413,1.40044 2.9375,2.40625 0.74334,1.00586 1.28861,2.19032 1.625,3.53125 0.33635,1.34096 0.49999,2.74327 0.5,4.21875 l 0,0.65625 c -10e-6,0.28498 -0.0169,0.6044 -0.0312,0.90625 -0.0141,0.30187 -0.0176,0.57568 -0.0312,0.84375 -0.0137,0.2681 -0.0342,0.45971 -0.0625,0.59375 l -11.25,0 c 0.14036,1.27393 0.54257,2.36133 1.1875,3.25 0.6449,0.88868 1.69478,1.34377 3.125,1.34375 1.12207,2e-5 2.05544,-0.22288 2.8125,-0.625 0.75702,-0.40212 1.52377,-0.9225 2.28125,-1.59375 0.36459,0.67125 0.72912,1.44071 1.09375,2.3125 0.36459,0.87179 0.53124,1.64229 0.53125,2.3125 -10e-6,0.56994 -0.12252,1.12209 -0.375,1.625 -0.25252,0.50293 -0.69927,0.96783 -1.34375,1.4375 -0.61712,0.43589 -1.44812,0.82315 -2.5,1.125 -1.05192,0.30185 -2.36694,0.4375 -3.9375,0.4375 -1.14949,0 -2.369,-0.16437 -3.6875,-0.5 -1.31852,-0.33562 -2.56586,-0.99667 -3.6875,-1.96875 -1.12167,-0.97206 -2.0379,-2.33328 -2.78125,-4.09375 -0.74335,-1.76047 -1.125,-4.05654 -1.125,-6.90625 0,-2.11295 0.30327,-3.95798 0.90625,-5.5 0.60298,-1.54199 1.4074,-2.80664 2.375,-3.8125 0.96759,-1.00581 2.06417,-1.74907 3.3125,-2.21875 1.24833,-0.46965 2.48839,-0.68747 3.75,-0.6875 z m 22.21875,0 c 1.93517,3e-5 3.55992,0.32929 4.90625,1 1.34632,0.67075 2.43988,1.5789 3.28125,2.71875 0.84133,1.1399 1.46499,2.47439 1.84375,4 0.37871,1.52565 0.56247,3.13395 0.5625,4.84375 -3e-5,1.70984 -0.20092,3.37611 -0.59375,4.96875 -0.39289,1.59267 -1.01998,2.98061 -1.875,4.1875 -0.85506,1.20691 -1.95207,2.15362 -3.3125,2.875 -1.36046,0.72137 -3.03657,1.09375 -5,1.09375 -1.9352,0 -3.56036,-0.35801 -4.90625,-1.0625 -1.34591,-0.70449 -2.45703,-1.65372 -3.3125,-2.84375 -0.85547,-1.19002 -1.48215,-2.56559 -1.875,-4.125 -0.39286,-1.55939 -0.59375,-3.1939 -0.59375,-4.9375 0,-1.74357 0.23857,-3.40984 0.6875,-4.96875 0.44891,-1.55888 1.11972,-2.89135 2.03125,-4.03125 0.91153,-1.13985 2.06035,-2.048 3.40625,-2.71875 1.3459,-0.67071 2.92692,-0.99997 4.75,-1 z m 25.96875,0 c 0.42109,3e-5 0.84343,0.0244 1.25,0.125 0.40654,0.10079 0.75736,0.28208 1.09375,0.5 0.33635,0.21797 0.63318,0.50614 0.84375,0.875 0.21052,0.36889 0.31249,0.80759 0.3125,1.34375 -10e-6,0.53619 -0.0753,1.14432 -0.1875,1.78125 -0.11218,0.63698 -0.2552,1.26679 -0.4375,1.9375 -0.18232,0.67075 -0.3691,1.3318 -0.59375,1.96875 -0.22469,0.63698 -0.46328,1.21533 -0.6875,1.71875 -0.58888,-0.56992 -1.1406,-0.99626 -1.6875,-1.28125 -0.54693,-0.28495 -1.16803,-0.43748 -1.8125,-0.4375 -0.72924,2e-5 -1.2634,0.22036 -1.65625,0.65625 -0.39287,0.4359 -0.59376,1.01477 -0.59375,1.71875 l 0,14.03125 -8.46875,0 0,-24.03125 c 0.25249,-0.0675 0.53862,-0.15229 0.875,-0.21875 0.30812,-0.0675 0.66964,-0.12308 1.0625,-0.15625 0.39285,-0.0332 0.83876,-0.0312 1.34375,-0.0312 2.52404,3e-5 4.10164,0.82398 4.71875,2.5 0.13951,-0.30184 0.36139,-0.61673 0.65625,-0.96875 0.29485,-0.35197 0.63881,-0.69812 1.03125,-1 0.39241,-0.30182 0.83876,-0.54892 1.34375,-0.75 0.50496,-0.20105 1.03313,-0.28122 1.59375,-0.28125 z m 41.75,0 c 2.29979,3e-5 4.3203,0.412 6.03125,1.25 0.7566,0.36941 1.35287,0.82396 1.84375,1.34375 0.49084,0.51982 0.74997,1.10854 0.75,1.8125 -3e-5,0.6027 -0.14651,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.74204,1.666 -1.21875,2.4375 -0.84222,-0.7715 -1.73105,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85903,-0.71873 -2.8125,-0.71875 -1.20596,2e-5 -1.8125,0.41199 -1.8125,1.25 0,0.53619 0.23901,0.96504 0.6875,1.25 0.44848,0.28498 1.01433,0.51769 1.6875,0.71875 0.67316,0.20108 1.4022,0.4358 2.1875,0.6875 0.78526,0.25173 1.51431,0.6221 2.1875,1.125 0.67315,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65622,1.9983 0.65625,3.40625 -3e-5,2.68292 -0.79032,4.84484 -2.375,6.4375 -1.58471,1.59266 -3.87724,2.375 -6.90625,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.75188,-0.66437 -2.3125,-1 -0.72922,-0.43589 -1.21969,-0.88645 -1.5,-1.40625 -0.2803,-0.5198 -0.4375,-1.08631 -0.4375,-1.65625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.43478,0.31874 0.90126,0.60691 1.40625,0.875 0.50498,0.26809 0.99845,0.50532 1.53125,0.65625 0.53279,0.15094 1.05751,0.21875 1.5625,0.21875 0.72921,0 1.25393,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.6266 0.46875,-1.0625 -10e-6,-0.50342 -0.22446,-0.91688 -0.6875,-1.21875 -0.46304,-0.30184 -1.04559,-0.57818 -1.71875,-0.8125 -0.67317,-0.23432 -1.40565,-0.51065 -2.21875,-0.8125 -0.8131,-0.30185 -1.57684,-0.69895 -2.25,-1.21875 -0.67317,-0.51979 -1.22489,-1.20758 -1.6875,-2.0625 -0.46261,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.242,-2.52539 0.71875,-3.53125 0.47672,-1.00581 1.10727,-1.81489 1.90625,-2.46875 0.79897,-0.65382 1.71222,-1.14999 2.75,-1.46875 1.03778,-0.31871 2.13091,-0.46872 3.28125,-0.46875 z m -108.1875,0.5 c 0.67359,3e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.21076,0.42727 1.6875,0.8125 0.47674,0.38527 0.86181,0.90616 1.15625,1.59375 0.29441,0.68762 0.4375,1.58391 0.4375,2.65625 l 0,17.78125 c 0,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.79258,2.46995 -1.4375,3.375 -0.64493,0.90505 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.6244,0.95318 -2.4375,1.1875 -0.8131,0.23431 -1.50488,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.25947 -2.65625,-0.8125 -0.56104,-0.55307 -0.929,-1.36415 -1.125,-2.4375 -0.0847,-0.4359 -0.14556,-0.92023 -0.1875,-1.40625 -0.042,-0.48604 -0.0998,-1.13074 -0.15625,-1.96875 0.89784,-0.1003 1.62647,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.71783 1.3125,-1.1875 0.30855,-0.46967 0.51288,-1.00492 0.625,-1.625 0.11218,-0.62008 0.15624,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69789,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12308 1.03125,-0.15625 0.37873,-0.0332 0.76038,-0.0312 1.125,-0.0312 z m 91.84375,0 c 0.67359,3e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.1795,0.42727 1.65625,0.8125 0.47672,0.38527 0.86181,0.90616 1.15625,1.59375 0.29443,0.68762 0.43749,1.58391 0.4375,2.65625 l 0,17.78125 c -10e-6,0.73776 -0.006,1.66026 -0.0625,2.75 -0.056,1.08973 -0.21026,2.06569 -0.40625,2.9375 -0.30899,1.34144 -0.76135,2.46995 -1.40625,3.375 -0.64493,0.90505 -1.3881,1.63392 -2.1875,2.1875 -0.79942,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.81311,0.23431 -1.5049,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.25947 -2.65625,-0.8125 -0.56103,-0.55307 -0.96025,-1.36415 -1.15625,-2.4375 -0.0847,-0.4359 -0.14555,-0.92023 -0.1875,-1.40625 -0.0419,-0.48604 -0.0684,-1.13074 -0.125,-1.96875 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 0.97271,-0.71783 1.28125,-1.1875 0.30855,-0.46967 0.54412,-1.00492 0.65625,-1.625 0.11218,-0.62008 0.15625,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69788,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12308 1.03125,-0.15625 0.37873,-0.0332 0.72914,-0.0312 1.09375,-0.0312 z m -73.65625,5.78125 c -1.31896,2e-5 -2.00001,1.21122 -2,3.625 l 4.0625,0 c -10e-6,-1.37419 -0.17776,-2.32395 -0.5,-2.84375 -0.32226,-0.51979 -0.83329,-0.78123 -1.5625,-0.78125 z m -53.53125,1.09375 c -0.95348,2e-5 -1.58702,0.52544 -1.9375,1.53125 -0.3505,1.00586 -0.53126,2.35018 -0.53125,4.09375 l 0,0.0312 c -1e-5,0.80428 0.0411,1.53115 0.125,2.21875 0.0839,0.68762 0.22695,1.2927 0.4375,1.8125 0.21054,0.5198 0.47612,0.94815 0.8125,1.25 0.33636,0.30185 0.77626,0.4375 1.28125,0.4375 0.33635,0 0.5848,-0.0119 0.78125,-0.0625 0.19641,-0.0506 0.35275,-0.0912 0.4375,-0.125 l 0,-10.84375 c -0.16863,-0.13412 -0.38966,-0.19985 -0.65625,-0.25 -0.26663,-0.0501 -0.52577,-0.0937 -0.75,-0.0937 z M 292.75,278.875 c -0.47675,2e-5 -0.87896,0.13566 -1.1875,0.4375 -0.30855,0.30187 -0.55358,0.71584 -0.75,1.21875 -0.19644,0.50293 -0.33607,1.0818 -0.40625,1.71875 -0.0702,0.63697 -0.0937,1.2673 -0.0937,1.9375 -10e-6,0.73777 0.0235,1.45429 0.0937,2.125 0.0702,0.67075 0.20981,1.26146 0.40625,1.78125 0.19642,0.51982 0.45556,0.94867 0.75,1.25 0.29441,0.30135 0.6795,0.43752 1.15625,0.4375 0.47672,2e-5 0.84768,-0.15045 1.15625,-0.46875 0.30854,-0.31821 0.55055,-0.73018 0.71875,-1.25 0.16818,-0.51979 0.30481,-1.14175 0.375,-1.8125 0.0702,-0.67071 0.0937,-1.35598 0.0937,-2.09375 -1e-5,-1.47446 -0.16365,-2.72727 -0.5,-3.75 -0.33638,-1.0227 -0.94292,-1.53123 -1.8125,-1.53125 z m -69.90625,31.28125 c 1.14946,3e-5 2.13808,0.42586 2.9375,1.28125 0.7994,0.85545 1.1875,1.9958 1.1875,3.4375 0,1.44176 -0.3881,2.5995 -1.1875,3.4375 -0.79942,0.83806 -1.78804,1.25003 -2.9375,1.25 -1.15034,3e-5 -2.10727,-0.41194 -2.90625,-1.25 -0.79898,-0.838 -1.21875,-1.99574 -1.21875,-3.4375 0,-1.4417 0.41977,-2.58205 1.21875,-3.4375 0.79898,-0.85539 1.75591,-1.28122 2.90625,-1.28125 z m -36.4375,0.4375 c 0.56146,3e-5 1.15045,0.041 1.78125,0.125 0.63079,0.084 1.25488,0.20722 1.84375,0.375 1.00994,0.30188 1.86451,0.77133 2.59375,1.375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -1e-5,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.7489,1.71948 -1.28125,2.625 -0.44851,-0.30182 -1.04861,-0.58799 -1.75,-0.90625 -0.70143,-0.31819 -1.47117,-0.49997 -2.3125,-0.5 -0.72924,3e-5 -1.33921,0.23527 -1.84375,0.6875 -0.50456,0.45231 -0.75,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.5 -6.21875,0 0,16.78125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0373,-1.37407 0.0937,-1.84375 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.15622 6.5,-2.15625 z m 89.0625,0 c 0.56146,3e-5 1.1817,0.041 1.8125,0.125 0.63079,0.084 1.22362,0.20722 1.8125,0.375 1.00994,0.30188 1.89575,0.77133 2.625,1.375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -10e-6,0.50243 -0.19447,1.17636 -0.53125,2.03125 -0.33681,0.85493 -0.7489,1.71948 -1.28125,2.625 -0.44851,-0.30182 -1.01735,-0.58799 -1.71875,-0.90625 -0.70141,-0.31819 -1.50241,-0.49997 -2.34375,-0.5 -0.72924,3e-5 -1.33922,0.23527 -1.84375,0.6875 -0.50457,0.45231 -0.75001,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.5 -6.21875,0 0,16.78125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0373,-1.37407 0.0937,-1.84375 0.36462,-2.71563 1.31854,-4.79336 2.875,-6.21875 1.55644,-1.42533 3.72346,-2.15622 6.5,-2.15625 z M 196.9375,311 c 0.67358,5e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.86181,0.93743 1.15625,1.625 0.29443,0.68765 0.4375,1.55268 0.4375,2.625 l 0,16.1875 c 0.14036,-0.7367 0.37895,-1.46662 0.6875,-2.1875 0.30854,-0.72085 0.6795,-1.41997 1.15625,-2.125 l 2.28125,-3.46875 c 0.53235,-0.80423 1.13589,-1.5069 1.78125,-2.09375 0.64534,-0.5868 1.50377,-0.87497 2.625,-0.875 0.64534,3e-5 1.28913,0.12586 1.90625,0.34375 0.61708,0.21797 1.1795,0.45069 1.65625,0.71875 0.53235,0.30188 1.02324,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.31809,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75749,-0.56994 -1.40814,-1.31421 -1.96875,-2.21875 l -2.6875,-4.46875 c -0.47675,-0.77048 -0.87552,-1.51675 -1.15625,-2.1875 -0.28074,-0.67071 -0.48464,-1.41196 -0.625,-2.25 l 0,11.40625 -8.40625,0 0,-35.28125 c 0.33638,-0.0337 0.69789,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.72913,-0.0625 1.09375,-0.0625 z m 36.90625,0 c 0.67359,5e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.21075,0.42678 1.6875,0.8125 0.47672,0.3858 0.86181,0.93743 1.15625,1.625 0.29443,0.68765 0.43749,1.55268 0.4375,2.625 l 0,30.1875 c -1.14947,0.4359 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.19362 -3,-0.5625 -0.71511,-0.36888 -1.24326,-0.86505 -1.59375,-1.46875 -0.35049,-0.6037 -0.55482,-1.27461 -0.625,-2.0625 -0.0702,-0.78788 -0.0937,-1.62821 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.0337 0.66663,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.76039,-0.0625 1.125,-0.0625 z m 23.5625,0 c 0.67273,5e-5 1.3375,0.0679 1.96875,0.21875 0.63121,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.8618,0.93743 1.15625,1.625 0.2944,0.68765 0.43747,1.55268 0.4375,2.625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78865,-0.10896 -1.125,-0.34375 -0.33638,-0.23483 -0.50001,-0.7295 -0.5,-1.5 -0.39286,0.60268 -1.01954,1.13846 -1.875,1.625 -0.85548,0.48654 -1.92892,0.71875 -3.21875,0.71875 -0.95347,0 -1.88685,-0.16237 -2.8125,-0.53125 -0.92566,-0.36888 -1.78833,-1.01556 -2.53125,-1.9375 -0.74292,-0.92193 -1.31821,-2.18858 -1.78125,-3.78125 -0.46304,-1.59264 -0.71875,-3.58517 -0.71875,-6 0,-2.41379 0.22145,-4.47966 0.65625,-6.15625 0.43478,-1.67654 1.02078,-3.02339 1.75,-4.0625 0.72922,-1.03907 1.57777,-1.78032 2.53125,-2.25 0.95346,-0.46965 1.93054,-0.71872 2.96875,-0.71875 0.67273,3e-5 1.27969,0.0822 1.8125,0.25 0.53279,0.16785 0.99625,0.37583 1.375,0.59375 0.37872,0.21797 0.69913,0.43833 0.9375,0.65625 0.23836,0.21798 0.38485,0.36851 0.46875,0.46875 l 0,-12.3125 c 0.3372,-0.0337 0.69873,-0.0896 1.0625,-0.15625 0.30897,-0.0675 0.63538,-0.12244 1,-0.15625 0.36461,-0.0337 0.72912,-0.0625 1.09375,-0.0625 z m 109.53125,1.90625 c 1.96256,5e-5 3.62884,0.38528 5.03125,1.15625 1.40237,0.77103 2.54007,1.91442 3.4375,3.40625 0.89739,1.4919 1.56175,3.30818 1.96875,5.4375 0.40696,2.12937 0.62497,4.53437 0.625,7.25 -3e-5,5.53262 -0.90984,9.797 -2.71875,12.78125 -1.80897,2.98425 -4.65704,4.46875 -8.5,4.46875 -3.87038,0 -6.6945,-1.42852 -8.53125,-4.3125 -1.83676,-2.88396 -2.78125,-7.20432 -2.78125,-12.9375 0,-2.64912 0.23901,-5.0274 0.6875,-7.15625 0.44848,-2.12882 1.13684,-3.9456 2.0625,-5.4375 0.92565,-1.49183 2.11817,-2.6327 3.5625,-3.4375 1.44432,-0.80473 3.16457,-1.2187 5.15625,-1.21875 z m 24.40625,0 c 1.82305,5e-5 3.45547,0.35856 4.84375,1.0625 1.38826,0.70402 2.54349,1.72359 3.46875,3.03125 0.9252,1.30771 1.59945,2.90365 2.0625,4.78125 0.46303,1.87765 0.71872,3.96523 0.71875,6.3125 -3e-5,3.45342 -0.42237,6.42744 -1.25,8.875 -0.82767,2.44757 -1.91781,4.42675 -3.25,5.96875 -1.33222,1.542 -2.84857,2.68487 -4.53125,3.40625 -1.68271,0.72137 -3.35158,1.0625 -5.0625,1.0625 -0.98087,0 -1.77203,-0.0822 -2.375,-0.25 -0.60299,-0.1678 -1.10414,-0.41437 -1.46875,-0.75 -0.36462,-0.33562 -0.62377,-0.73271 -0.75,-1.21875 -0.12626,-0.48602 -0.1875,-1.07979 -0.1875,-1.75 0,-0.50343 0.0553,-1.09415 0.125,-1.78125 0.0698,-0.68709 0.13102,-1.27782 0.1875,-1.78125 0.56061,0.13412 1.01038,0.21624 1.375,0.25 0.36461,0.0338 0.8045,0.0625 1.28125,0.0625 0.64534,0 1.27846,-0.099 1.9375,-0.25 0.65903,-0.15094 1.28613,-0.38112 1.875,-0.75 0.58885,-0.36888 1.15126,-0.87991 1.65625,-1.5 0.50496,-0.62006 0.91361,-1.40441 1.25,-2.34375 -0.61712,0.46967 -1.32603,0.81583 -2.125,1 -0.799,0.18419 -1.51091,0.25 -2.15625,0.25 -1.34635,0 -2.52173,-0.30305 -3.53125,-0.90625 -1.00955,-0.60319 -1.85809,-1.38553 -2.53125,-2.375 -0.67317,-0.98946 -1.19445,-2.13031 -1.53125,-3.4375 -0.3368,-1.30716 -0.5,-2.68475 -0.5,-4.09375 0,-2.17945 0.27928,-4.0472 0.8125,-5.65625 0.53323,-1.60901 1.26528,-2.95786 2.21875,-4.03125 0.95347,-1.07334 2.08171,-1.88693 3.34375,-2.40625 1.26201,-0.51925 2.60705,-0.7812 4.09375,-0.78125 z m -24.5,7.71875 c -0.50499,3e-5 -0.9449,0.14999 -1.28125,0.46875 -0.33639,0.31876 -0.60196,0.83965 -0.8125,1.59375 -0.21057,0.75414 -0.35364,1.74499 -0.4375,2.96875 -0.0839,1.22381 -0.125,2.72267 -0.125,4.5 0,3.52095 0.20131,6.01266 0.59375,7.4375 0.39241,1.42486 1.08077,2.125 2.0625,2.125 0.47672,0 0.8648,-0.14999 1.1875,-0.46875 0.32265,-0.31873 0.60237,-0.87087 0.8125,-1.625 0.21011,-0.75411 0.37031,-1.74495 0.46875,-2.96875 0.0984,-1.22376 0.12499,-2.72264 0.125,-4.5 -10e-6,-1.77733 -0.0266,-3.27619 -0.125,-4.5 -0.0984,-1.22376 -0.25864,-2.21461 -0.46875,-2.96875 -0.21013,-0.7541 -0.48985,-1.27499 -0.8125,-1.59375 -0.3227,-0.31873 -0.71078,-0.46872 -1.1875,-0.46875 z m 24.5625,0.0312 c -0.56062,2e-5 -1.02752,0.41402 -1.40625,1.21875 -0.37875,0.8048 -0.56251,2.01549 -0.5625,3.625 -10e-6,1.64231 0.20732,2.83914 0.65625,3.59375 0.4489,0.75465 1.09314,1.12502 1.90625,1.125 0.64534,2e-5 1.21375,-0.0822 1.71875,-0.25 0.0556,-0.5024 0.0967,-1.01143 0.125,-1.53125 0.0283,-0.51979 0.0312,-1.05504 0.0312,-1.625 -1e-5,-0.80527 -0.0236,-1.57473 -0.0937,-2.3125 -0.0702,-0.73772 -0.20984,-1.39878 -0.40625,-1.96875 -0.19645,-0.56991 -0.44146,-1.03987 -0.75,-1.375 -0.30855,-0.33508 -0.71379,-0.49998 -1.21875,-0.5 z m -92.4375,1.0625 c 2.29979,3e-5 4.3203,0.412 6.03125,1.25 0.7566,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.71872,1.13979 0.71875,1.84375 -3e-5,0.6027 -0.14651,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.71079,1.63475 -1.1875,2.40625 -0.84222,-0.7715 -1.73104,-1.38894 -2.65625,-1.875 -0.92524,-0.48601 -1.85904,-0.74998 -2.8125,-0.75 -1.20597,2e-5 -1.8125,0.44324 -1.8125,1.28125 0,0.53619 0.20776,0.93379 0.65625,1.21875 0.44848,0.28498 1.01433,0.51769 1.6875,0.71875 0.67316,0.20108 1.4022,0.4358 2.1875,0.6875 0.78526,0.25173 1.51431,0.6221 2.1875,1.125 0.67315,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65624,2.02955 0.65625,3.4375 -10e-6,2.68292 -0.79032,4.81361 -2.375,6.40625 -1.58471,1.59267 -3.87724,2.375 -6.90625,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.72064,-0.63312 -2.28125,-0.96875 -0.72924,-0.43589 -1.25094,-0.9177 -1.53125,-1.4375 -0.2803,-0.5198 -0.40625,-1.05506 -0.40625,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.73901,-1.66447 1.1875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.43478,0.31874 0.90126,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.47409 1.5625,0.625 0.53279,0.15094 1.05751,0.21875 1.5625,0.21875 0.72921,0 1.22268,-0.12132 1.53125,-0.40625 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.22446,-0.91688 -0.6875,-1.21875 -0.46304,-0.30184 -1.04559,-0.54691 -1.71875,-0.78125 -0.67317,-0.23431 -1.40567,-0.51065 -2.21875,-0.8125 -0.81311,-0.30185 -1.54559,-0.7302 -2.21875,-1.25 C 292.04558,334.54271 291.46262,333.85492 291,333 c -0.46261,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.24201,-2.49414 0.71875,-3.5 0.47672,-1.00581 1.10727,-1.84613 1.90625,-2.5 0.79897,-0.65381 1.71222,-1.14999 2.75,-1.46875 1.03778,-0.31871 2.13091,-0.46872 3.28125,-0.46875 z m 20.71875,0 c 3.2815,3e-5 5.61473,0.77001 7.03125,2.3125 1.4165,1.54255 2.12497,3.99064 2.125,7.34375 l 0,9.8125 c -3e-5,0.83803 0.0753,1.76053 0.1875,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13412 -0.75439,0.22858 -1.0625,0.3125 -0.30815,0.084 -0.61142,0.13738 -0.90625,0.1875 -0.29487,0.0501 -0.61528,0.10817 -0.9375,0.125 -0.32228,0.0168 -0.66965,0 -1.0625,0 -2.27156,0 -3.57291,-0.76948 -3.9375,-2.3125 -0.47675,0.56994 -1.19935,1.09285 -2.125,1.5625 -0.92566,0.46967 -2.09805,0.71875 -3.5,0.71875 -0.8696,0 -1.7006,-0.13824 -2.5,-0.40625 -0.7994,-0.26809 -1.50791,-0.69444 -2.125,-1.28125 -0.61711,-0.58683 -1.10414,-1.35681 -1.46875,-2.3125 -0.36462,-0.95569 -0.53126,-2.12476 -0.53125,-3.5 -10e-6,-1.94413 0.42578,-3.49948 1.28125,-4.65625 0.85547,-1.15675 1.87366,-2.02128 3.09375,-2.625 1.22007,-0.60369 2.50852,-0.98894 3.8125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84002 -0.21875,-1.125 -0.14037,-0.28496 -0.32414,-0.50529 -0.5625,-0.65625 -0.23837,-0.15094 -0.52108,-0.26235 -0.84375,-0.3125 -0.32268,-0.0501 -0.66664,-0.0625 -1.03125,-0.0625 -0.98086,3e-5 -1.95236,0.15059 -2.90625,0.46875 -0.9539,0.31824 -2.00978,0.82879 -3.1875,1.5 -0.53323,-0.77149 -0.95257,-1.54348 -1.21875,-2.28125 -0.26618,-0.73774 -0.40625,-1.28787 -0.40625,-1.65625 0,-0.50342 0.15719,-0.98521 0.4375,-1.4375 0.28031,-0.45224 0.84915,-0.93404 1.71875,-1.4375 0.75747,-0.46964 1.77265,-0.82565 3.0625,-1.09375 1.28983,-0.26807 2.6224,-0.40622 3.96875,-0.40625 z m 25.9375,0 c 0.86958,3e-5 1.74512,0.20801 2.65625,0.59375 0.91107,0.38578 1.75662,1.01559 2.5,1.9375 0.74332,0.92196 1.34987,2.15989 1.8125,3.71875 0.46258,1.55891 0.68747,3.49899 0.6875,5.8125 -3e-5,2.7167 -0.24203,4.94443 -0.71875,6.6875 -0.47675,1.74308 -1.12099,3.13353 -1.90625,4.15625 -0.7853,1.02272 -1.65743,1.73925 -2.625,2.125 -0.96761,0.38575 -1.92455,0.5625 -2.90625,0.5625 -0.75663,0 -1.42184,-0.097 -1.96875,-0.28125 -0.54693,-0.18419 -0.99628,-0.40453 -1.375,-0.65625 -0.37875,-0.2517 -0.69614,-0.46955 -0.90625,-0.6875 -0.21013,-0.21794 -0.31551,-0.36846 -0.34375,-0.46875 l 0,12.40625 -8.34375,0 0,-35 c 0.25249,-0.0675 0.56987,-0.12104 0.90625,-0.1875 0.30811,-0.0675 0.63839,-0.12292 1.03125,-0.15625 0.39286,-0.0332 0.83876,-0.0625 1.34375,-0.0625 2.55228,3e-5 4.12988,0.79674 4.71875,2.40625 0.47672,-0.77149 1.14452,-1.4444 2,-2.03125 0.85547,-0.5868 2.00728,-0.87497 3.4375,-0.875 z m -123.53125,0.5 c 0.67359,3e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.21075,0.42727 1.6875,0.8125 0.47672,0.38527 0.86181,0.9374 1.15625,1.625 0.29441,0.68762 0.43749,1.55266 0.4375,2.625 l 0,17.8125 c -1e-5,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46995 -1.4375,3.375 -0.64493,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.62439,0.92193 -2.4375,1.15625 -0.8131,0.23431 -1.5049,0.37498 -2.09375,0.375 -1.20596,-2e-5 -2.09521,-0.29072 -2.65625,-0.84375 -0.56104,-0.55307 -0.929,-1.36415 -1.125,-2.4375 -0.0847,-0.4359 -0.14555,-0.88898 -0.1875,-1.375 -0.042,-0.48604 -0.0998,-1.16199 -0.15625,-2 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30855,-0.46967 0.51287,-1.00492 0.625,-1.625 0.11218,-0.62008 0.1875,-1.32474 0.1875,-2.0625 l 0,-23.4375 c 0.33636,-0.0338 0.66663,-0.0585 1.03125,-0.125 0.30812,-0.0675 0.65252,-0.12292 1.03125,-0.15625 0.37873,-0.0332 0.76038,-0.0625 1.125,-0.0625 z m 119.75,6.6875 c -0.33724,2e-5 -0.61651,0.0436 -0.8125,0.0937 -0.19602,0.0501 -0.32152,0.0912 -0.40625,0.125 l 0,10.15625 c 0.1686,0.13412 0.35838,0.23111 0.625,0.28125 0.2666,0.0501 0.52574,0.0625 0.75,0.0625 0.95346,2e-5 1.61825,-0.53576 1.96875,-1.625 0.35048,-1.08921 0.49999,-2.5064 0.5,-4.25 -10e-6,-1.50924 -0.18378,-2.70757 -0.5625,-3.5625 -0.37875,-0.85489 -1.05341,-1.28123 -2.0625,-1.28125 z m -89.375,0.21875 c -0.76834,0.11003 -1.28708,0.61992 -1.59375,1.5 -0.3505,1.00586 -0.53126,2.38143 -0.53125,4.125 -1e-5,0.80428 0.0411,1.5624 0.125,2.25 0.0839,0.68762 0.22693,1.26145 0.4375,1.78125 0.21054,0.5198 0.47612,0.94816 0.8125,1.25 0.33635,0.30187 0.77626,0.4375 1.28125,0.4375 0.33635,0 0.58481,-0.0117 0.78125,-0.0625 0.19642,-0.0506 0.35275,-0.0912 0.4375,-0.125 l 0,-10.8125 c -0.16863,-0.13412 -0.38965,-0.2311 -0.65625,-0.28125 -0.26662,-0.0501 -0.52577,-0.0625 -0.75,-0.0625 -0.11919,0 -0.23399,-0.0157 -0.34375,0 z M 321,335.40625 c -0.53238,0.0676 -1.0541,0.17846 -1.53125,0.3125 -0.47717,0.13412 -0.89952,0.31132 -1.25,0.5625 -0.3505,0.25121 -0.60239,0.56612 -0.8125,0.96875 -0.21013,0.40266 -0.34376,0.92607 -0.34375,1.5625 -10e-6,0.77154 0.18075,1.36224 0.53125,1.78125 0.35048,0.41901 0.85164,0.65625 1.46875,0.65625 0.50496,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59374,-0.68154 0.59375,-1.21875 l 0,-4.21875 z m 89.28125,2.65625 c 1.1777,0 2.13163,0.42635 2.875,1.28125 0.74332,0.85492 1.12499,1.96955 1.125,3.34375 -10e-6,1.37522 -0.36153,2.51758 -1.0625,3.40625 -0.701,0.88868 -1.67506,1.3125 -2.9375,1.3125 -1.23422,0 -2.2224,-0.42382 -2.9375,-1.3125 -0.71511,-0.88867 -1.0625,-2.03103 -1.0625,-3.40625 0,-1.3742 0.39878,-2.48883 1.15625,-3.34375 0.75747,-0.8549 1.69428,-1.28125 2.84375,-1.28125 z m -142.6875,22.375 c 1.14946,3e-5 2.10683,0.42586 2.90625,1.28125 0.7994,0.85545 1.21875,2.02705 1.21875,3.46875 0,1.44176 -0.41935,2.56825 -1.21875,3.40625 -0.79942,0.83806 -1.75679,1.25003 -2.90625,1.25 -1.15034,3e-5 -2.13852,-0.41194 -2.9375,-1.25 -0.79898,-0.838 -1.1875,-1.96449 -1.1875,-3.40625 0,-1.4417 0.38852,-2.6133 1.1875,-3.46875 0.79898,-0.85539 1.78716,-1.28122 2.9375,-1.28125 z m -33,0.46875 c 0.56146,3e-5 1.1817,0.041 1.8125,0.125 0.63079,0.084 1.22363,0.20722 1.8125,0.375 1.00996,0.30188 1.89575,0.74008 2.625,1.34375 0.7292,0.60375 1.09374,1.48515 1.09375,2.625 -1e-5,0.50243 -0.19447,1.17636 -0.53125,2.03125 -0.33681,0.85493 -0.7489,1.75073 -1.28125,2.65625 -0.44851,-0.30182 -1.04861,-0.61924 -1.75,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.20402 -1.84375,0.65625 -0.50456,0.45231 -0.75001,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c -1e-5,-0.43587 0.0174,-1.01023 0.0312,-1.78125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 50.28125,0 c 0.56146,3e-5 1.1817,0.041 1.8125,0.125 0.63079,0.084 1.22363,0.20722 1.8125,0.375 1.00994,0.30188 1.89576,0.74008 2.625,1.34375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -10e-6,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.78015,1.75073 -1.3125,2.65625 -0.44851,-0.30182 -1.01736,-0.61924 -1.71875,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.37046,0.20402 -1.875,0.65625 -0.50456,0.45231 -0.75,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 0.0174,-1.01023 0.0312,-1.78125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 51.5625,0.40625 c 0.67359,5e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.86181,0.90618 1.15625,1.59375 0.29441,0.68765 0.43749,1.58393 0.4375,2.65625 l 0,16.1875 c 0.14036,-0.7367 0.37893,-1.46662 0.6875,-2.1875 0.30854,-0.72085 0.71075,-1.45122 1.1875,-2.15625 l 2.25,-3.46875 c 0.53235,-0.80423 1.13589,-1.47565 1.78125,-2.0625 0.64534,-0.5868 1.535,-0.90622 2.65625,-0.90625 0.64532,3e-5 1.25788,0.12586 1.875,0.34375 0.61708,0.21797 1.17949,0.45069 1.65625,0.71875 0.53234,0.30188 1.02325,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75748,-0.56994 -1.40815,-1.31421 -1.96875,-2.21875 l -2.6875,-4.46875 c -0.47675,-0.77048 -0.84428,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.51589,-1.44321 -0.65625,-2.28125 l 0,11.4375 -8.40625,0 0,-35.3125 c 0.33636,-0.0337 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.76038,-0.0312 1.125,-0.0312 z m 25.125,0 c 0.67359,5e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.17951,0.42678 1.65625,0.8125 0.47674,0.3858 0.86181,0.90618 1.15625,1.59375 0.29441,0.68765 0.4375,1.58393 0.4375,2.65625 l 0,30.15625 c -1.14947,0.4359 -2.16466,0.65625 -3.0625,0.65625 -1.28983,0 -2.2849,-0.16237 -3,-0.53125 -0.71511,-0.36888 -1.27451,-0.86505 -1.625,-1.46875 -0.35049,-0.6037 -0.55482,-1.30586 -0.625,-2.09375 -0.0702,-0.78788 -0.0937,-1.62819 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.0337 0.66664,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.76038,-0.0312 1.125,-0.0312 z M 251.65625,372 c 1.71092,3e-5 3.16901,0.30256 4.375,0.90625 1.20593,0.60372 2.19413,1.43169 2.9375,2.4375 0.74332,1.00586 1.25737,2.15907 1.59375,3.5 0.33635,1.34096 0.53122,2.77452 0.53125,4.25 -3e-5,0.16783 -3e-5,0.37129 0,0.65625 -3e-5,0.28498 -0.0168,0.57315 -0.0312,0.875 -0.0142,0.30187 -0.0176,0.60693 -0.0312,0.875 -0.0137,0.2681 -0.0342,0.45971 -0.0625,0.59375 l -11.25,0 c 0.14036,1.27393 0.54257,2.36133 1.1875,3.25 0.64492,0.88868 1.66353,1.34375 3.09375,1.34375 1.12206,0 2.08669,-0.22286 2.84375,-0.625 0.75703,-0.40211 1.49251,-0.9225 2.25,-1.59375 0.36459,0.67125 0.72912,1.44071 1.09375,2.3125 0.36459,0.87179 0.56247,1.64229 0.5625,2.3125 -3e-5,0.56994 -0.12251,1.09084 -0.375,1.59375 -0.2525,0.50291 -0.69928,0.99908 -1.34375,1.46875 -0.61712,0.43589 -1.44812,0.7919 -2.5,1.09375 -1.05191,0.30185 -2.36694,0.46875 -3.9375,0.46875 -1.14947,0 -2.40024,-0.16437 -3.71875,-0.5 -1.31852,-0.33562 -2.5346,-0.99667 -3.65625,-1.96875 -1.12165,-0.97206 -2.03791,-2.33328 -2.78125,-4.09375 -0.74335,-1.76047 -1.125,-4.05654 -1.125,-6.90625 0,-2.11295 0.30327,-3.95798 0.90625,-5.5 0.60298,-1.54199 1.37615,-2.80664 2.34375,-3.8125 0.96759,-1.00581 2.09542,-1.74907 3.34375,-2.21875 1.24832,-0.46965 2.48839,-0.71872 3.75,-0.71875 z m 50.0625,0 c 3.2815,3e-5 5.64598,0.80126 7.0625,2.34375 1.4165,1.54255 2.12497,3.95939 2.125,7.3125 l 0,9.8125 c -3e-5,0.83803 0.0441,1.76053 0.15625,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13412 -0.75439,0.22858 -1.0625,0.3125 -0.30815,0.084 -0.58017,0.16863 -0.875,0.21875 -0.29487,0.0501 -0.61526,0.0769 -0.9375,0.0937 -0.32226,0.0168 -0.66965,0.0312 -1.0625,0.0312 -2.27156,0 -3.60416,-0.76948 -3.96875,-2.3125 -0.47675,0.56994 -1.1681,1.09285 -2.09375,1.5625 -0.92566,0.46967 -2.09805,0.6875 -3.5,0.6875 -0.8696,0 -1.7006,-0.13824 -2.5,-0.40625 -0.79942,-0.26809 -1.50791,-0.69444 -2.125,-1.28125 -0.61711,-0.58683 -1.10414,-1.35681 -1.46875,-2.3125 -0.36462,-0.95569 -0.5625,-2.12476 -0.5625,-3.5 0,-1.94413 0.42577,-3.46823 1.28125,-4.625 0.85547,-1.15675 1.90491,-2.05253 3.125,-2.65625 1.22009,-0.60369 2.47727,-0.98894 3.78125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84002 -0.21875,-1.125 -0.14037,-0.28496 -0.32414,-0.50529 -0.5625,-0.65625 -0.23837,-0.15094 -0.52108,-0.2311 -0.84375,-0.28125 -0.32268,-0.0501 -0.66664,-0.0937 -1.03125,-0.0937 -0.98087,3e-5 -1.95236,0.18184 -2.90625,0.5 -0.9539,0.31824 -2.0098,0.79754 -3.1875,1.46875 -0.53323,-0.77149 -0.92132,-1.51223 -1.1875,-2.25 -0.26618,-0.73774 -0.40625,-1.31911 -0.40625,-1.6875 0,-0.5034 0.12594,-0.95396 0.40625,-1.40625 0.28031,-0.45224 0.8804,-0.93404 1.75,-1.4375 0.75747,-0.46964 1.77265,-0.8569 3.0625,-1.125 1.28983,-0.26807 2.59115,-0.40622 3.9375,-0.40625 z m 20.3125,0 c 2.29979,3e-5 4.28904,0.44325 6,1.28125 0.75659,0.36941 1.38412,0.79271 1.875,1.3125 0.49084,0.51982 0.74999,1.13979 0.75,1.84375 -10e-6,0.6027 -0.17778,1.31774 -0.5,2.15625 -0.32226,0.83856 -0.71078,1.666 -1.1875,2.4375 -0.84222,-0.7715 -1.73104,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85904,-0.71873 -2.8125,-0.71875 -1.20597,2e-5 -1.81251,0.41199 -1.8125,1.25 -10e-6,0.53619 0.23901,0.96504 0.6875,1.25 0.44849,0.28498 1.01433,0.51769 1.6875,0.71875 0.67315,0.20108 1.4022,0.4358 2.1875,0.6875 0.78528,0.25173 1.51433,0.6221 2.1875,1.125 0.67315,0.50293 1.20731,1.19072 1.65625,2.0625 0.4489,0.87181 0.68749,1.9983 0.6875,3.40625 -10e-6,2.68292 -0.79032,4.81361 -2.375,6.40625 -1.58471,1.59267 -3.90849,2.40625 -6.9375,2.40625 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.72064,-0.66437 -2.28125,-1 -0.72922,-0.43589 -1.2197,-0.9177 -1.5,-1.4375 -0.28031,-0.5198 -0.4375,-1.05506 -0.4375,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.73901,-1.66447 1.1875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.4348,0.31874 0.93252,0.60693 1.4375,0.875 0.50498,0.2681 0.99845,0.47409 1.53125,0.625 0.53279,0.15094 1.05751,0.25 1.5625,0.25 0.72921,0 1.25393,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.22447,-0.88563 -0.6875,-1.1875 -0.46305,-0.30184 -1.04559,-0.57816 -1.71875,-0.8125 -0.67316,-0.23431 -1.40565,-0.51065 -2.21875,-0.8125 -0.81311,-0.30185 -1.57684,-0.69895 -2.25,-1.21875 -0.67316,-0.51979 -1.22489,-1.20758 -1.6875,-2.0625 -0.46262,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.21076,-2.52539 0.6875,-3.53125 0.47674,-1.00581 1.13852,-1.84613 1.9375,-2.5 0.79898,-0.65381 1.71221,-1.11874 2.75,-1.4375 1.03776,-0.31871 2.13091,-0.49997 3.28125,-0.5 z m -55.1875,0.53125 c 0.67359,3e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.1795,0.42727 1.65625,0.8125 0.47672,0.38527 0.86181,0.90615 1.15625,1.59375 0.29441,0.68762 0.43749,1.58391 0.4375,2.65625 l 0,17.78125 c -10e-6,0.73776 -0.006,1.66026 -0.0625,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46995 -1.4375,3.375 -0.64493,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.6244,0.95318 -2.4375,1.1875 -0.8131,0.23431 -1.5049,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.25947 -2.65625,-0.8125 -0.56104,-0.55308 -0.929,-1.3954 -1.125,-2.46875 -0.0847,-0.4359 -0.14555,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0998,-1.13074 -0.15625,-1.96875 0.89784,-0.1003 1.62646,-0.32315 2.1875,-0.625 0.56104,-0.30185 1.00395,-0.6866 1.3125,-1.15625 0.30855,-0.46967 0.51287,-1.00492 0.625,-1.625 0.11218,-0.62009 0.15625,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69788,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12292 1.03125,-0.15625 0.37873,-0.0332 0.76038,-0.0312 1.125,-0.0312 z m -15.28125,5.78125 c -1.31894,2e-5 -1.96876,1.21122 -1.96875,3.625 l 4.03125,0 c -1e-5,-1.37419 -0.14651,-2.32393 -0.46875,-2.84375 -0.32226,-0.51977 -0.86453,-0.78123 -1.59375,-0.78125 z m 51.46875,7.375 c -0.53238,0.0675 -1.02285,0.17846 -1.5,0.3125 -0.47717,0.13412 -0.89951,0.31132 -1.25,0.5625 -0.35049,0.25121 -0.63364,0.59737 -0.84375,1 -0.21013,0.40266 -0.31251,0.92607 -0.3125,1.5625 -10e-6,0.77154 0.18076,1.36224 0.53125,1.78125 0.35049,0.41901 0.82038,0.625 1.4375,0.625 0.50496,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59375,-0.68154 0.59375,-1.21875 l 0,-4.21875 z" id="rect3812" opacity=".75" color="#000000" stroke-width="35" fill="#ffffff"/>
+ <path d="M 129.86624,448.6745 L 457.10717,448.6745 L 475.36526,473.95491 L 111.82816,473.95491 L 129.86624,448.6745 z" id="path4453" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="12.945"/>
+ <path sodipodi:nodetypes="ccccc" id="path4457" d="M 107.60816,542.20485 L 479.36524,542.20485 L 479.36526,498.66636 L 107.82816,498.66636 L 107.60816,542.20485 z" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="12.945"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/tourist/monument.svg b/vtm-themes/icons/symbols/tourist/monument.svg
new file mode 100755
index 00000000..804d79df
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/monument.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 35.844853,509.62169 L 540.74919,509.62892 M 53.553541,473.50382 L 522.78718,473.53056 M 71.615504,437.55222 L 504.7284,437.49148" id="path2161" fill-rule="evenodd" stroke-width="18.02" fill="#ffffff" stroke="#ffffff"/>
+ <path d="M 71.756306,212.26887 L 504.86921,212.20813 M 108.42188,217.53947 L 108.45313,440.35593 M 180.51255,217.53947 L 180.5438,440.35593 M 252.60322,217.53947 L 252.63447,440.35593 M 324.69389,217.53947 L 324.72515,440.35593 M 396.78457,217.53947 L 396.81582,440.35593 M 468.87524,217.53947 L 468.90649,440.35593" id="path3157" fill-rule="evenodd" stroke-width="36.05" fill="#ffffff" stroke="#ffffff"/>
+ <path d="M 71.974325,176.86692 L 71.974325,143.90333 L 286.16213,53.07543 L 502.5664,141.90804 L 502.5664,174.87293 L 284.19038,90.539858 L 71.974325,176.86692 z M 130.54849,175.34844 L 287.82283,112.43779 L 440.79415,177.03805 L 378.83496,176.75646 L 287.30556,144.35008 L 196.03681,174.70177 L 130.54849,175.34844 z" id="polygon6239" fill="#ffffff" fill-rule="evenodd" stroke-width="18.02"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/tourist/museum.svg b/vtm-themes/icons/symbols/tourist/museum.svg
new file mode 100755
index 00000000..c4501bb2
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/museum.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 23.159867,470.46638 L 557.64236,469.5373 L 528.55835,419.16233 L 54.205081,419.16233 L 23.159867,470.46638 z" id="path828" sodipodi:nodetypes="ccccc" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" stroke-opacity=".581" fill="#ffffff" fill-rule="evenodd" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.615"/>
+ <path d="M 101.35121,425.11637 L 101.35121,205.47952" id="path829" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
+ <path d="M 223.95544,425.11637 L 223.95544,205.47952" id="path830" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
+ <path d="M 354.92482,425.11637 L 354.92482,205.47952" id="path832" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
+ <path d="M 477.52906,425.11637 L 477.52906,205.47952" id="path833" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
+ <path d="M 24.452984,148.9176 L 557.89553,148.9176 L 293.67923,59.311399 L 24.452984,148.9176 z" id="path837" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" stroke-opacity=".581" fill="#ffffff" fill-rule="evenodd" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.615"/>
+ <rect id="rect3475" width="496.41" height="44.07" x="42.874" y="148.99" rx="0" fill="#ffffff" stroke="#ffffff" stroke-linecap="square" stroke-width="29.523"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/tourist/picnic.svg b/vtm-themes/icons/symbols/tourist/picnic.svg
new file mode 100755
index 00000000..381a645a
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/picnic.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path transform="matrix(14.685839,0,0,14.685839,569.76584,1146.0639)" d="M -24.382324,-58.667969 L -21.142578,-66.628174 L -17.822266,-66.628174 L -14.58252,-58.667969 L -24.382324,-58.667969 z M -13.822021,-66.628174 L -8.4228516,-66.628174 L -8.4228516,-69.588379 L -29.822998,-69.588379 L -29.822998,-66.628174 L -24.462891,-66.628174 L -27.702637,-58.667969 L -35.622559,-58.667969 L -35.622559,-55.708984 L -28.902588,-55.708984 L -32.62207,-46.427979 L -28.981934,-46.427979 L -25.222168,-55.708984 L -13.062744,-55.708984 L -9.3029785,-46.427979 L -5.6225586,-46.427979 L -9.3823242,-55.708984 L -2.6220703,-55.708984 L -2.6220703,-58.667969 L -10.582275,-58.667969 L -13.822021,-66.628174 z" id="flowRoot3192" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/tourist/ruin.svg b/vtm-themes/icons/symbols/tourist/ruin.svg
new file mode 100755
index 00000000..98f0afc6
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/ruin.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 35.844853,459.62169 L 540.74919,459.62892 M 53.553541,423.50382 L 502.78718,423.53056 M 71.615504,387.55222 L 444.7284,387.49148" id="path2161" sodipodi:nodetypes="cccccc" fill-rule="evenodd" stroke-width="18.02" fill="#ffffff" stroke="#ffffff"/>
+ <path d="M 71.756306,162.26887 L 324.86921,182.20813 M 108.42188,167.53947 L 108.45313,390.35593 M 180.51255,167.53947 L 180.5438,390.35593 M 232.60322,167.53947 L 252.63447,390.35593 M 244.69389,247.53947 L 344.72515,390.35593" id="path3157" sodipodi:nodetypes="cccccccccc" fill-rule="evenodd" stroke-width="36.05" fill="#ffffff" stroke="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/steam_train.svg b/vtm-themes/icons/symbols/tourist/steam_train.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/steam_train.svg
rename to vtm-themes/icons/symbols/tourist/steam_train.svg
diff --git a/vtm-themes/icons/symbols/tourist/theatre.svg b/vtm-themes/icons/symbols/tourist/theatre.svg
new file mode 100755
index 00000000..092abf31
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/theatre.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 265.09375,130.96875 C 255.42724,130.9898 244.66623,138.72369 237.8125,145.1875 C 208.50923,167.68706 187.06659,183.80534 138.09375,197 C 119.4875,202.62024 81.59984,195.77961 44.4375,193.15625 C 20.710459,189.45796 41.04585,231.83122 44.21875,249.0625 C 65.317009,315.13731 89.59352,382.01479 132.46875,437.40625 C 156.92036,464.61897 190.73799,488.33878 228.65625,487.90625 C 259.99019,485.29355 285.85191,460.13326 293.1875,430.15625 C 293.82111,428.13286 294.40659,426.08395 294.9375,424.03125 C 295.77829,420.88845 296.58975,417.75226 297.34375,414.59375 C 292.71932,407.3835 289.22716,399.42884 287.1875,391.09375 C 286.5539,389.07037 285.99966,387.02145 285.46875,384.96875 C 268.42501,321.26082 269.47522,254.21513 276.875,189.1875 C 279.03002,178.75105 281.64627,168.41917 284.46875,158.15625 C 282.50748,151.63598 280.56372,145.10346 278.6875,138.5625 C 274.92537,133.03828 270.15716,130.95773 265.09375,130.96875 z" id="path3327" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="20"/>
+ <path d="M 313.84375,100 C 306.0853,101.99335 307.19159,112.10518 304.625,118 C 293.17914,154.58947 281.68076,191.82114 281.21875,230.5 C 277.69848,288.6076 279.95274,348.63291 300.1875,403.59375 C 312.13002,428.38634 340.74171,446.28915 368.5,439.28125 C 407.63884,431.21039 438.8371,401.76392 459.15625,368.4375 C 497.25023,308.91718 518.75291,241.0346 538.25,173.625 C 538.62298,170.04023 540.08659,164.52452 537.90625,161.9375 C 519.11724,163.2403 500.19726,165.72219 481.3125,167.375 C 460.73266,169.33247 439.6763,167.40834 420.40625,159.875 C 386.01924,148.48422 355.72538,127.97556 328.15625,104.84375 C 323.94185,102.02441 319.0055,99.810649 313.84375,100 z M 375.34375,191.3125 C 391.64916,190.78972 399.09826,214.0955 388,224.75 C 373.05082,240.8641 349.58523,251.68637 327.5,245.96875 C 313.93662,241.09335 306.2658,221.54176 316.59375,210.09375 C 332.86073,195.96494 356.22327,198.35442 375.34375,191.3125 z M 441.3125,205.8125 C 458.42952,205.30332 470.90253,221.48377 473.125,237.15625 C 477.59536,247.94464 485.50373,260.07269 479.90625,271.96875 C 475.79828,280.92895 464.15597,282.57854 455.75,279.28125 C 435.64093,274.60965 422.23914,254.70832 421.84375,234.5 C 420.01567,222.90797 425.46195,208.04215 438.34375,206.125 C 439.32108,205.93479 440.31259,205.83211 441.3125,205.8125 z M 374.90625,311.375 C 396.03164,311.71968 415.34217,324.59963 427.71875,341.03125 C 435.58384,354.52488 431.83651,376.16924 415.875,381.6875 C 404.91236,384.10357 397.65903,373.60088 388.9375,369.09375 C 374.97247,360.14985 357.13266,360.03363 341.875,365.375 C 334.36799,367.72716 324.19438,366.01843 321.34375,357.75 C 316.46519,346.24714 323.41564,332.93355 333.46875,326.8125 C 345.31853,317.6737 359.78464,311.42355 374.90625,311.375 z" id="path3331" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="20"/>
+ <path sodipodi:nodetypes="ccccccccccc" id="path3354" d="M 285.4541,384.97852 C 268.41036,321.27059 269.48954,254.20095 276.88932,189.17332 C 283.16816,158.7657 293.16738,129.32182 301.7164,99.51794 C 312.66079,83.447494 332.12672,96.27889 342.5705,106.1285 C 371.87377,128.62806 393.33157,144.76096 442.30441,157.95562 C 460.91065,163.57586 498.78475,156.72276 535.94709,154.0994 C 559.67413,150.40111 539.36072,192.77824 536.18782,210.00952 C 515.08956,276.08434 490.78524,342.94327 447.91,398.33473 C 423.45839,425.54744 389.65637,449.2867 351.73811,448.85417 C 320.40417,446.24146 294.53511,421.07144 287.19952,391.09443 C 286.56592,389.07104 285.98501,387.03122 285.4541,384.97852 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="20"/>
+ <path d="M 186.12241,419.27686 C 170.53493,417.11172 155.64536,407.86822 148.14943,393.82511 C 156.45018,384.60253 168.30406,393.94518 177.99545,394.82651 C 200.59927,397.6843 221.72402,382.82159 232.73498,363.94829 C 239.87297,357.1071 240.80305,338.44975 253.21729,341.18549 C 262.17061,346.14062 260.48348,357.54208 258.29637,365.82526 C 256.88071,376.8697 251.51326,386.79943 244.41837,395.21953 C 238.82911,402.70552 233.279,411.2716 223.61206,413.75083 C 211.24992,416.05078 198.94862,421.89348 186.12241,419.27686 z M 130.89478,298.43387 C 118.97928,291.40044 104.61665,287.07557 96.170165,275.40016 C 94.286275,262.11694 111.04341,253.45542 122.18996,258.6432 C 135.31628,262.75007 147.72927,270.26671 156.03614,281.40001 C 161.54984,291.41743 151.97952,307.23533 140.07175,302.07563 C 136.9139,301.12126 133.97122,299.60336 130.89478,298.43387 z M 206.89207,273.8418 C 198.55822,262.89704 198.48009,243.84556 211.43127,236.33629 C 219.93732,230.71704 232.14405,226.85491 241.18494,233.48717 C 245.93063,243.2669 237.57259,252.23031 233.80123,260.69155 C 231.52257,269.23785 225.9191,278.83487 216.1538,279.68611 C 212.22197,279.78353 208.73096,277.17207 206.89207,273.8418 z" id="path3360" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/theme_park.svg b/vtm-themes/icons/symbols/tourist/theme_park.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/theme_park.svg
rename to vtm-themes/icons/symbols/tourist/theme_park.svg
diff --git a/vtm-themes/icons/symbols/tourist/view_point.svg b/vtm-themes/icons/symbols/tourist/view_point.svg
new file mode 100755
index 00000000..22641ca1
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/view_point.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734a08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path sodipodi:nodetypes="cszss" id="use6027" d="m 264.50523,235.49926 c -0.16658,0.78886 -42.10316,-33.79044 -85.91597,-79.79102 -9.98712,-10.48582 -67.67963,-60.980315 -14.46661,-91.66394 54.45289,-31.398539 69.60929,44.6705 73.90403,61.46637 15.13669,59.19661 26.64513,109.19973 26.47855,109.98859 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+ <path sodipodi:nodetypes="cszss" id="use6039" d="m 323.1887,233.94211 c -0.76647,0.25017 8.2118,-53.35763 26.14307,-114.30092 4.08742,-13.89201 18.9707,-89.10244 72.15,-58.360413 54.41838,31.458315 -3.88114,82.618663 -16.27943,94.735943 -43.69743,42.70707 -81.24718,77.67522 -82.01364,77.92539 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+ <path sodipodi:nodetypes="cszss" id="use6039-1" d="m 319.7866,336.12097 c 0.14256,-0.79356 43.1095,32.49679 88.29851,77.14619 10.30082,10.17782 69.49954,58.89775 17.24246,91.18255 -53.47465,33.03704 -70.93322,-42.53685 -75.73582,-59.19461 -16.92668,-58.70986 -29.9477,-108.34057 -29.80515,-109.13413 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+ <path sodipodi:nodetypes="cszss" id="use6039-1-7" d="m 266.29377,332.92737 c -0.14256,-0.79356 -43.1095,32.49679 -88.29851,77.14619 -10.30082,10.17782 -69.49954,58.89775 -17.24246,91.18255 53.47465,33.03704 70.93322,-42.53685 75.73582,-59.19461 16.92668,-58.70986 29.9477,-108.34057 29.80515,-109.13413 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+ <path sodipodi:nodetypes="cszss" id="use6039-1-7-4" d="m 346.34706,286.69224 c -0.60652,-0.53121 50.06828,-20.19002 111.62218,-35.89777 14.03119,-3.58057 86.2947,-29.19516 87.02319,32.22617 0.74548,62.85244 -73.01387,38.85718 -89.76365,34.38608 -59.03422,-15.75823 -108.27519,-30.18327 -108.88172,-30.71448 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+ <path sodipodi:nodetypes="cszss" id="use6039-1-7-4-9" d="m 236.05283,287.13694 c 0.60652,-0.53121 -50.06828,-20.19002 -111.62218,-35.89777 -14.03119,-3.58057 -86.294699,-29.19516 -87.023189,32.22617 -0.74548,62.85244 73.013869,38.85718 89.763649,34.38608 59.03422,-15.75823 108.27519,-30.18327 108.88172,-30.71448 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/waterwheel.svg b/vtm-themes/icons/symbols/tourist/waterwheel.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/waterwheel.svg
rename to vtm-themes/icons/symbols/tourist/waterwheel.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/wayside_cross.svg b/vtm-themes/icons/symbols/tourist/wayside_cross.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/wayside_cross.svg
rename to vtm-themes/icons/symbols/tourist/wayside_cross.svg
diff --git a/vtm-themes/resources/assets/symbols/tourist/wayside_shrine.svg b/vtm-themes/icons/symbols/tourist/wayside_shrine.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/wayside_shrine.svg
rename to vtm-themes/icons/symbols/tourist/wayside_shrine.svg
diff --git a/vtm-themes/icons/symbols/tourist/windmill.svg b/vtm-themes/icons/symbols/tourist/windmill.svg
new file mode 100755
index 00000000..e7ad1ff6
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/windmill.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 184.78155,542.01606 L 240.33221,215.29258 L 292.63713,183.97397 L 343.80161,216.12787 C 343.80161,216.12787 390.64574,547.32866 385.19959,544.67234 C 379.75344,542.01606 185.87079,546.00051 184.78155,542.01606 z" id="path3457" sodipodi:nodetypes="ccccsc" opacity=".5" fill="#ffffff" fill-rule="evenodd" stroke-width="14.07"/>
+ <path d="M 78.35819,96.82824 L 139.07109,40.013241 L 286.19495,240.60115 L 267.45324,258.73256 L 78.35819,96.82824 z" id="path4180" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
+ <path id="path4188" d="M 506.19495,96.82824 L 445.48205,40.013241 L 298.35819,240.60115 L 317.0999,258.73256 L 506.19495,96.82824 z" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
+ <path id="path4194" d="M 506.19495,421.91756 L 445.48205,478.73256 L 298.35819,278.14465 L 317.0999,260.01324 L 506.19495,421.91756 z" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
+ <path d="M 78.35819,421.91756 L 139.07109,478.73256 L 286.19495,278.14465 L 267.45324,260.01324 L 78.35819,421.91756 z" id="path4196" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/wreck.svg b/vtm-themes/icons/symbols/tourist/wreck.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/tourist/wreck.svg
rename to vtm-themes/icons/symbols/tourist/wreck.svg
diff --git a/vtm-themes/icons/symbols/tourist/zoo.svg b/vtm-themes/icons/symbols/tourist/zoo.svg
new file mode 100755
index 00000000..16e9158c
--- /dev/null
+++ b/vtm-themes/icons/symbols/tourist/zoo.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path id="path6" d="M 96.846181,370.80896 C 102.4913,372.47363 116.35648,371.07296 111.60422,361.70746 C 108.96749,356.51055 96.561781,349.96831 91.082089,348.41661 C 82.825026,346.07754 68.952006,356.22926 79.553903,362.73923 L 77.248266,369.65614 C 68.369948,365.41377 65.839627,352.43073 66.562444,343.14131 C 67.070722,336.60829 72.969579,329.71905 75.306458,323.5434 C 81.690537,306.6719 86.934133,290.09091 91.899553,272.81938 C 93.884361,265.91515 94.472298,252.8491 100.47456,248.29662 C 106.09859,244.03004 114.73562,243.40867 121.05076,240.26608 C 125.70584,237.94892 128.74698,233.18201 133.75367,231.63378 C 144.50371,228.3102 155.09465,229.16675 160.25121,217.48408 C 171.13843,233.91982 180.22725,249.23501 182.03372,269.36092 C 183.31796,283.66855 173.55128,298.33817 170.25422,312.01521 C 167.94973,321.57554 168.65987,331.31339 166.14903,340.83568 C 163.01682,352.70971 156.90804,363.68454 153.928,375.42024 C 152.1296,382.49969 153.74124,390.55444 151.53129,397.32264 C 147.57597,409.43761 124.99571,416.67731 127.68062,431.90258 C 128.92106,438.93824 137.12452,440.32162 142.95893,441.51594 C 156.50686,444.28847 171.09116,442.57769 184.4604,440.48417 C 188.91259,439.78671 194.31815,440.64787 197.7939,437.17212 C 206.18527,428.7819 196.27103,412.92719 198.98938,403.08788 C 200.93649,396.03609 207.6067,389.89157 211.09051,383.48997 C 218.66453,369.56853 225.07766,354.90352 229.42033,339.68286 L 230.57315,339.68286 C 230.84982,353.09936 234.08809,369.91437 239.23543,382.33715 C 242.48522,390.18093 250.85353,401.43474 250.62528,410.00479 C 250.23332,424.6917 227.98046,434.29814 238.65325,451.48436 C 249.39061,468.77318 274.76876,451.37946 288.21408,448.33717 C 295.5852,446.66904 305.46947,448.85248 309.08701,439.92851 C 314.08102,427.61179 303.94429,415.93605 302.24388,404.2407 C 300.29677,390.85648 302.81107,377.3904 300.35902,363.89205 C 298.56524,354.01355 290.52433,342.51879 290.79409,332.76595 C 290.98315,325.90322 295.85496,317.777 297.43663,310.86239 L 341.24374,331.43444 L 359.68884,341.9885 C 359.76953,351.78745 359.50093,363.49548 361.22093,373.1146 C 362.04289,377.70858 366.35674,382.34983 365.04137,387.09829 C 362.47635,396.35081 339.82923,405.84427 344.92584,415.64784 C 347.72719,421.03612 355.4603,422.88178 360.84165,424.26516 C 374.47028,427.76973 410.17653,433.03465 420.19567,420.25566 C 424.61097,414.62414 424.24437,405.25403 424.24668,398.47661 C 424.2536,381.39414 426.0543,363.29604 421.94104,346.59977 C 436.77551,355.74739 440.14866,374.13023 447.58434,389.25406 C 450.15974,394.49247 455.52611,402.79968 453.77036,408.83468 C 451.06124,418.14254 423.2933,432.67613 436.14146,445.243 C 439.70367,448.72797 446.17905,448.98736 450.76151,450.38227 C 464.02123,454.41713 504.26958,461.00203 510.53746,443.41924 C 516.39493,426.98697 514.89973,397.96937 510.82336,381.18433 C 508.42434,371.30583 502.85162,362.73693 501.87749,352.36386 C 500.98175,342.81968 507.59316,333.16021 508.29869,323.5434 C 509.27973,310.15571 505.14112,298.39927 504.72956,285.50038 C 504.46556,277.20239 507.24962,268.6577 507.24962,260.13837 C 519.91218,293.70269 506.65707,329.81588 515.87386,363.89205 C 517.21574,368.85263 517.74027,396.98486 527.67641,394.15123 C 531.40232,393.08949 532.50442,386.62909 531.75624,383.48997 C 528.49376,369.79218 522.58441,357.68182 522.55214,343.14131 C 522.536,335.91084 525.83997,328.45902 526.6481,321.23776 C 531.41962,278.59269 538.08406,219.28709 501.48092,188.01689 C 485.15931,174.07356 467.47968,163.88933 449.60869,152.34454 C 435.62385,143.31024 421.3116,132.76288 404.64876,129.16712 C 392.42658,126.5297 379.02852,130.4275 366.60575,129.82365 C 339.51912,128.5069 312.91322,123.37997 285.90844,120.84308 C 273.6194,119.68853 261.44678,122.05792 249.01825,119.72046 C 222.3132,114.69798 202.56196,94.517658 176.39067,87.917425 C 168.10075,85.82695 153.73433,87.259511 145.26457,88.747339 C 137.26631,90.15251 133.03086,95.755093 126.80217,100.1901 C 108.71422,113.07054 84.992786,133.72502 74.977328,154.07815 C 68.829116,166.5724 68.169934,183.26946 64.225681,196.73335 C 58.476689,216.35778 47.555231,232.68515 44.322613,253.22146 C 40.93713,274.7296 46.123546,297.32254 46.122162,318.93212 C 46.121125,335.17764 37.033456,355.04993 42.817608,370.80896 C 50.903017,392.83817 93.824875,400.11707 96.846181,370.80896 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/aerodrome.svg b/vtm-themes/icons/symbols/transport/aerodrome.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/aerodrome.svg
rename to vtm-themes/icons/symbols/transport/aerodrome.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/aerodrome2.svg b/vtm-themes/icons/symbols/transport/aerodrome2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/aerodrome2.svg
rename to vtm-themes/icons/symbols/transport/aerodrome2.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/airport.svg b/vtm-themes/icons/symbols/transport/airport.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/airport.svg
rename to vtm-themes/icons/symbols/transport/airport.svg
diff --git a/vtm-themes/icons/symbols/transport/airport2.svg b/vtm-themes/icons/symbols/transport/airport2.svg
new file mode 100755
index 00000000..09b90176
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/airport2.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <g id="g1970" transform="translate(68.799779,58.552307)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30">
+  <path id="path1972" d="M 196.91,25.3815 C 196.97,-8.6185 248.219,-8.6185 248.185,26.3395 L 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 249.144,383.029 L 295.152,418.973 L 295.152,460.667 L 224.225,438.621 L 153.298,460.667 L 153.298,418.973 L 198.827,383.029 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 196.91,25.3815 z"/>
+  <path d="M 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 248.185,169.031 z" id="path7842" sodipodi:nodetypes="ccccccccc"/>
+ </g>
+ <g transform="translate(68.799779,58.552307)" id="g7850" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="40">
+  <path d="M 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 248.185,169.031 z" id="path7852" sodipodi:nodetypes="ccccccccc"/>
+  <path sodipodi:nodetypes="ccccccccc" id="path7854" d="M 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 248.185,169.031 z"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/airport_gate.svg b/vtm-themes/icons/symbols/transport/airport_gate.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/airport_gate.svg
rename to vtm-themes/icons/symbols/transport/airport_gate.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/airport_terminal.svg b/vtm-themes/icons/symbols/transport/airport_terminal.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/airport_terminal.svg
rename to vtm-themes/icons/symbols/transport/airport_terminal.svg
diff --git a/vtm-themes/icons/symbols/transport/bus_station.svg b/vtm-themes/icons/symbols/transport/bus_station.svg
new file mode 100755
index 00000000..730e48f5
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/bus_station.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata1976"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 289.075,74.970939 C 289.60491,74.970939 290.15544,74.991208 290.69088,74.995422 C 291.23004,74.99115 291.77323,74.970939 292.30677,74.970939 L 289.075,74.970939 z M 290.69088,74.995422 C 253.06535,75.29353 202.08803,85.88773 180.81067,94.75329 C 159.22842,103.7459 144.83592,112.74284 140.34008,135.22388 L 124.15675,259.86741 L 124.15675,431.59197 L 152.04301,431.59197 L 152.04301,458.52339 C 152.04301,491.36026 200.07888,491.36024 200.07888,458.52339 L 200.07888,431.59197 L 288.80568,431.59197 L 289.075,431.59197 L 381.30289,431.59197 L 381.30289,458.52339 C 381.30289,491.36026 429.36324,491.36024 429.36324,458.52339 L 429.36324,431.59197 L 457.2495,431.59197 L 457.2495,259.86741 L 441.06617,135.22388 C 436.57033,112.74284 422.17784,103.7459 400.59558,94.75329 C 379.31614,85.88686 328.31748,75.291548 290.69088,74.995422 z M 222.18713,106.45622 L 289.075,106.45622 L 359.21912,106.45622 C 372.70849,106.45623 372.7085,126.67927 359.21912,126.67927 L 288.9281,126.67927 L 222.18713,126.67927 C 208.69776,126.67927 208.69775,106.45622 222.18713,106.45622 z M 185.80523,147.12267 L 288.9281,147.12267 L 395.57654,147.12267 C 409.82585,147.12267 413.55543,154.35559 415.28545,165.33811 L 427.89425,255.72977 C 429.06887,264.39401 426.54587,272.99035 414.57544,272.99036 L 289.075,272.99036 L 166.80633,272.99036 C 154.83589,272.99036 152.33738,264.394 153.512,255.72977 L 166.1208,165.33811 C 167.85084,154.35559 171.5559,147.12267 185.80523,147.12267 z M 176.08543,331.6519 C 188.81487,331.65189 199.12404,341.98555 199.12404,354.71499 C 199.12404,367.44444 188.81487,377.7536 176.08543,377.7536 C 163.35599,377.75361 153.02234,367.44443 153.02234,354.71499 C 153.02234,341.98556 163.35599,331.6519 176.08543,331.6519 z M 405.32082,331.6519 C 418.05026,331.6519 428.35942,341.98556 428.35943,354.71499 C 428.35943,367.44443 418.05026,377.75361 405.32082,377.7536 C 392.59138,377.7536 382.25772,367.44444 382.25773,354.71499 C 382.25773,341.98555 392.59139,331.65189 405.32082,331.6519 z" id="path2115" fill="#ffffff"/>
+ <path transform="matrix(0.9469422,0,0,0.9469422,84.843881,0.5062342)" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" sodipodi:ry="288.57144" sodipodi:rx="288.57144" sodipodi:cy="305.71429" sodipodi:cx="217.14285" id="path3267" sodipodi:type="arc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-width="25.14"/>
+ <path sodipodi:type="arc" id="path3276" sodipodi:cx="217.14285" sodipodi:cy="305.71429" sodipodi:rx="288.57144" sodipodi:ry="288.57144" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" transform="matrix(0.9469422,0,0,0.9469422,84.843881,0.5062342)" fill="none" stroke="#ffffff" stroke-width="25.14"/>
+</svg>
diff --git a/vtm-themes/icons/symbols/transport/bus_stop.svg b/vtm-themes/icons/symbols/transport/bus_stop.svg
new file mode 100755
index 00000000..2575f666
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/bus_stop.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata1976"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 290.625 34.5625 C 291.30137 34.5625 292.00406 34.588371 292.6875 34.59375 C 293.37567 34.588298 294.069 34.5625 294.75 34.5625 L 290.625 34.5625 z M 292.6875 34.59375 C 244.66265 34.974252 179.59571 48.496579 152.4375 59.8125 C 124.89013 71.290575 106.51969 82.774174 100.78125 111.46875 L 80.125 270.5625 L 80.125 489.75 L 115.71875 489.75 L 115.71875 524.125 C 115.71875 566.03764 177.03125 566.03762 177.03125 524.125 L 177.03125 489.75 L 290.28125 489.75 L 290.625 489.75 L 408.34375 489.75 L 408.34375 524.125 C 408.34375 566.03764 469.6875 566.03762 469.6875 524.125 L 469.6875 489.75 L 505.28125 489.75 L 505.28125 270.5625 L 484.625 111.46875 C 478.88656 82.774174 460.51613 71.290573 432.96875 59.8125 C 405.80789 48.495478 340.71371 34.971722 292.6875 34.59375 z M 205.25 74.75 L 290.625 74.75 L 380.15625 74.75 C 397.37395 74.750004 397.37396 100.5625 380.15625 100.5625 L 290.4375 100.5625 L 205.25 100.5625 C 188.0323 100.5625 188.03229 74.75 205.25 74.75 z M 158.8125 126.65625 L 290.4375 126.65625 L 426.5625 126.65625 C 444.75018 126.65625 449.51057 135.88827 451.71875 149.90625 L 467.8125 265.28125 C 469.31177 276.3402 466.09144 287.31249 450.8125 287.3125 L 290.625 287.3125 L 134.5625 287.3125 C 119.28355 287.3125 116.09448 276.34019 117.59375 265.28125 L 133.6875 149.90625 C 135.8957 135.88827 140.62481 126.65625 158.8125 126.65625 z M 146.40625 362.1875 C 162.65398 362.18749 175.8125 375.37727 175.8125 391.625 C 175.8125 407.87274 162.65398 421.03125 146.40625 421.03125 C 130.15852 421.03126 116.96875 407.87273 116.96875 391.625 C 116.96875 375.37728 130.15852 362.1875 146.40625 362.1875 z M 439 362.1875 C 455.24773 362.1875 468.40624 375.37728 468.40625 391.625 C 468.40625 407.87273 455.24773 421.03126 439 421.03125 C 422.75227 421.03125 409.56249 407.87274 409.5625 391.625 C 409.5625 375.37727 422.75228 362.18749 439 362.1875 z " id="path2115" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/bus_stop2.svg b/vtm-themes/icons/symbols/transport/bus_stop2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/bus_stop2.svg
rename to vtm-themes/icons/symbols/transport/bus_stop2.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/car_share.svg b/vtm-themes/icons/symbols/transport/car_share.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/car_share.svg
rename to vtm-themes/icons/symbols/transport/car_share.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/emergency_phone.svg b/vtm-themes/icons/symbols/transport/emergency_phone.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/emergency_phone.svg
rename to vtm-themes/icons/symbols/transport/emergency_phone.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/ford.svg b/vtm-themes/icons/symbols/transport/ford.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/ford.svg
rename to vtm-themes/icons/symbols/transport/ford.svg
diff --git a/vtm-themes/icons/symbols/transport/fuel.svg b/vtm-themes/icons/symbols/transport/fuel.svg
new file mode 100755
index 00000000..184fbfc1
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/fuel.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker8025">
+   <path id="path8027" d="M 10,0 L 0,5 L 10,10 L 10,0 z "/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker8021">
+   <path id="path8023" d="M 0,0 L 10,5 L 0,10 L 0,0 z "/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 249,111.75 C 240.51758,111.75 232.0625,117.88064 232.0625,127.6875 L 231.875,442.9375 L 249.3125,442.9375 L 249.46875,467.875 L 409.5625,467.78125 L 409.6875,442.9375 L 424.6875,443.0625 L 424.6875,124.4375 C 424.68751,117.64142 420.75087,111.75 413.34375,111.75 L 249,111.75 z M 275.78125,146.59375 L 380.6875,146.59375 C 386.49577,146.59375 391.06251,148.95926 391.0625,156.96875 L 391.0625,239.84375 C 391.0625,245.45746 388.06163,249.53125 381.65625,249.53125 L 276.0625,249.25 C 269.96423,249.25 264.71875,244.74463 264.71875,238.1875 L 265.25,156.6875 C 265.25,150.1638 269.76979,146.59375 275.78125,146.59375 z" id="path1897" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 232.83211,220.10791 L 216.8105,220.01303 C 216.70662,285.20608 217.18175,413.86794 217.45327,416.06937 C 218.03287,420.76868 217.68239,425.63716 216.47581,430.07245 C 191.35934,493.34558 110.08776,464.28417 121.62727,402.71575 C 146.97207,341.64522 182.51061,300.32073 200.19813,228.29037 L 201.77268,281.83519 C 185.8545,312.81087 157.77166,367.21167 135.99276,412.68501 C 134.15788,454.66887 184.10162,468.50125 199.74349,423.43723 C 206.71402,344.55555 199.48141,258.5723 199.35038,176.13983 C 209.5149,145.92256 220.73039,143.03014 232.11247,144.46938" id="path1899" fill="#ffffff" fill-rule="evenodd"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/fuel_lpg.svg b/vtm-themes/icons/symbols/transport/fuel_lpg.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/fuel_lpg.svg
rename to vtm-themes/icons/symbols/transport/fuel_lpg.svg
diff --git a/vtm-themes/icons/symbols/transport/helicopter.svg b/vtm-themes/icons/symbols/transport/helicopter.svg
new file mode 100755
index 00000000..11da4dd2
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/helicopter.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata1976"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <g id="g3780" transform="matrix(1.4851465,0,0,1.4851465,-135.79563,-178.9105)">
+  <path sodipodi:nodetypes="cc" id="path2872" d="m 265.10872,398.21695 133.2798,0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="18.7"/>
+  <path sodipodi:nodetypes="cccccccccccccccccccccc" id="path3660" d="m 325.40054,283.74495 c -27.11433,0.84507 -53.34269,9.42465 -80.529,9.87961 -34.92928,2.29399 -76.99751,3.87666 -111.94063,2.33695 1.99656,1.29533 11.54415,0.37374 11.46146,10.50423 2.816,5.21168 -6.14351,12.8561 -2.37094,14.37937 44.41493,2.77835 104.78136,26.58994 152.50411,46.64984 24.34401,8.36603 50.93941,6.82358 76.25,4.625 13.21538,-2.20492 29.92826,-3.26191 37.15625,-16.5 3.20298,-9.11621 -8.6e-4,-19.28648 -3.34375,-27.875 -11.6761,-27.02707 -41.17439,-41.70987 -69.46548,-43.73707 -3.23142,-0.26887 -6.48062,-0.35427 -9.72202,-0.26293 z m 25.96291,11.97167 c 12.0857,1.03859 24.30274,7.05641 32.10105,16.18312 8.62377,8.08029 13.16131,20.04676 14.02395,31.94188 -15.66602,0.52921 -28.81749,-0.0801 -43.71661,-0.0801 -7.73602,-16.05957 -16.47031,-31.19742 -24.12714,-47.29488 7.2289,-0.56234 12.93621,-1.23604 21.71875,-0.75 z m -34.59375,1.72517 c 7.20805,7.01924 17.11979,39.02726 20.93546,47.78885 -12.84377,-0.14361 -32.90884,0.35436 -45.75234,0.19042 -0.13401,-7.95854 -0.61938,-39.77742 -0.75146,-47.73599 8.10431,-0.12441 17.46396,-0.13307 25.56834,-0.24328 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.5"/>
+  <path sodipodi:nodetypes="ccccc" id="path3662" d="m 311.72788,272.31885 c -12.3058,-2.26182 -27.05427,8.72945 -38.93108,13.81425 l 36.4194,2.51168 41.79147,-5.02336 c -8.58846,-4.45605 -26.07283,-13.00453 -39.27979,-11.30257 z" fill="#ffffff" stroke="#ffffff" stroke-width="3.7"/>
+  <path id="path3664" d="m 311.72788,245.31825 -0.62792,30.76812" fill="#ffffff" stroke="#ffffff" stroke-width="10.4"/>
+  <path id="path3666" d="m 156.08241,228.99232 154.38963,14.44217 159.41299,-13.81425 -7.53504,8.79089 -150.62211,8.16297 -148.11042,-6.90713 -7.53505,-10.67465 z" sodipodi:nodetypes="ccccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="5.1"/>
+  <path id="path3726" d="m 124.32868,293.75121 c -3.56225,-9.47953 -6.98912,-19.03812 -10.52189,-28.53751 l -6.59375,0.375 0,0 c 4.65512,9.70907 9.08305,19.82866 13.73933,29.53563" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.1"/>
+  <path id="path3678" d="m 132.4186,323.78079 10.16944,29.18291 c 1.68267,-0.54311 6.53218,0.98878 6.90625,-1.0625 -5.3782,-9.42179 -9.37675,-19.68689 -13.76577,-29.71518" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.1"/>
+  <path id="path3680" d="m 126.58241,291.30255 c -12.63207,0.0284 -21.2103,15.46427 -14.75279,26.22719 5.63246,11.59712 23.73241,12.38102 30.43823,1.4131 8.08174,-11.83297 -1.22345,-28.58449 -15.68544,-27.64029 z m 0.48045,7.99816 c 8.34686,-0.78819 13.60603,10.54095 7.57423,16.36373 -5.34325,6.46098 -17.01785,2.13193 -16.92897,-6.21765 -0.30203,-5.24668 4.09881,-10.01936 9.35474,-10.14608 z" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="18.7"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/helicopter_pad.svg b/vtm-themes/icons/symbols/transport/helicopter_pad.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/helicopter_pad.svg
rename to vtm-themes/icons/symbols/transport/helicopter_pad.svg
diff --git a/vtm-themes/icons/symbols/transport/lighthouse.svg b/vtm-themes/icons/symbols/transport/lighthouse.svg
new file mode 100755
index 00000000..7305ece9
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/lighthouse.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 361.71459,80.721032 C 364.06866,80.721399 365.24586,79.741384 365.24623,77.781001 C 365.24586,76.598174 364.66025,75.618173 363.48938,74.840955 L 291.22544,34.899496 L 219.57102,74.840955 C 218.38762,75.618173 217.79603,76.598174 217.79625,77.781001 C 217.79603,79.741384 218.77604,80.721399 220.73628,80.721032 L 361.71459,80.721032 z M 365.24623,180.60396 C 369.54834,180.60424 371.6996,178.453 371.69997,174.15023 C 371.6996,169.83608 369.54834,167.67885 365.24623,167.67856 L 217.79625,167.67856 C 213.49353,167.67885 211.34229,169.83608 211.34251,174.15023 C 211.34229,178.453 213.49353,180.60424 217.79625,180.60396 L 230.13006,180.60396 L 181.96007,543.67391 L 400.4908,543.67391 L 352.91242,180.60396 L 365.24623,180.60396 z" id="flowRoot3192" sodipodi:nodetypes="cscccscccsccscccccc" stroke-width="10" fill="#ffffff" stroke-linejoin="round" stroke="#ffffff"/>
+ <path sodipodi:nodetypes="cccccccccc" id="path3186" d="M 239.17868,105.75173 L 35.92179,79.900921 L 36.51338,165.66393 L 239.17868,140.40471 L 239.17868,105.75173 z M 345.88172,139.81312 L 548.54702,165.66393 L 548.54702,79.900921 L 345.88172,105.75173 L 345.88172,139.81312 z" opacity=".5" stroke-width="10" fill="#ffffff" stroke-linejoin="round" stroke="#ffffff"/>
+ <path sodipodi:type="arc" id="path3188" sodipodi:cx="286.43436" sodipodi:cy="125.39394" sodipodi:rx="36.889275" sodipodi:ry="36.889275" d="M 323.32363,125.39394 A 36.889275,36.889275 0 1 1 249.54508,125.39394 A 36.889275,36.889275 0 1 1 323.32363,125.39394 z" transform="matrix(0.8704944,0,0,0.8704944,43.094837,14.239211)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/marina.svg b/vtm-themes/icons/symbols/transport/marina.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/marina.svg
rename to vtm-themes/icons/symbols/transport/marina.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/miniroundabout_anticlockwise.svg b/vtm-themes/icons/symbols/transport/miniroundabout_anticlockwise.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/miniroundabout_anticlockwise.svg
rename to vtm-themes/icons/symbols/transport/miniroundabout_anticlockwise.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/miniroundabout_clockwise.svg b/vtm-themes/icons/symbols/transport/miniroundabout_clockwise.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/miniroundabout_clockwise.svg
rename to vtm-themes/icons/symbols/transport/miniroundabout_clockwise.svg
diff --git a/vtm-themes/icons/symbols/transport/parking.svg b/vtm-themes/icons/symbols/transport/parking.svg
new file mode 100755
index 00000000..11230cb2
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/parking.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 145.35836,505.1504 L 145.35836,85.566299 L 303.63258,85.566299 C 331.49012,85.56672 352.76506,86.902366 367.45745,89.573248 C 388.06429,93.008179 405.33227,99.543305 419.26147,109.17864 C 433.19004,118.81477 444.39993,132.31434 452.89116,149.67738 C 461.38172,167.04114 465.62716,186.12179 465.62752,206.91942 C 465.62716,242.60054 454.27416,272.79568 431.56851,297.50493 C 408.8622,322.21458 367.83879,334.56932 308.49813,334.56915 L 200.88312,334.56915 L 200.88312,505.1504 L 145.35836,505.1504 z M 200.88312,285.05478 L 309.35678,285.05478 C 345.22821,285.05501 370.70087,278.37678 385.77488,265.02007 C 400.84831,251.66386 408.38518,232.8694 408.38548,208.63666 C 408.38518,191.08276 403.94894,176.05676 395.07671,163.55858 C 386.2039,151.06108 374.51701,142.80869 360.01596,138.8014 C 350.66619,136.32127 333.39819,135.08103 308.21194,135.08067 L 200.88312,135.08067 L 200.88312,285.05478 z" id="text2419" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.688"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_bicycle.svg b/vtm-themes/icons/symbols/transport/parking_bicycle.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/parking_bicycle.svg
rename to vtm-themes/icons/symbols/transport/parking_bicycle.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_car.svg b/vtm-themes/icons/symbols/transport/parking_car.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/parking_car.svg
rename to vtm-themes/icons/symbols/transport/parking_car.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_car_paid.svg b/vtm-themes/icons/symbols/transport/parking_car_paid.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/parking_car_paid.svg
rename to vtm-themes/icons/symbols/transport/parking_car_paid.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_disabled.svg b/vtm-themes/icons/symbols/transport/parking_disabled.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/parking_disabled.svg
rename to vtm-themes/icons/symbols/transport/parking_disabled.svg
diff --git a/vtm-themes/icons/symbols/transport/parking_private.svg b/vtm-themes/icons/symbols/transport/parking_private.svg
new file mode 100755
index 00000000..afbe52ee
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/parking_private.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <defs id="defs4">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path d="M 145.34375 74.21875 C 142.37406 74.219094 139.41239 75.43136 137.3125 77.53125 C 135.21261 79.63114 134.00034 82.592807 134 85.5625 L 134 108.03125 L 169.34375 108.03125 L 169.34375 74.21875 L 145.34375 74.21875 z M 212.28125 74.21875 L 212.28125 106.5 L 254.21875 106.5 L 254.21875 74.21875 L 212.28125 74.21875 z M 297.65625 74.21875 L 297.65625 105.65625 L 339.59375 105.65625 L 339.59375 75.15625 C 329.01542 74.534513 317.08787 74.218953 303.625 74.21875 L 297.65625 74.21875 z M 385.125 81.71875 L 385.125 104.09375 L 427.0625 104.09375 L 427.0625 100.8125 C 426.61503 100.49203 426.17149 100.15697 425.71875 99.84375 C 414.03244 91.759904 400.44451 85.747274 385.125 81.71875 z M 427.3125 103 L 427.3125 144.9375 L 463.21875 144.9375 C 463.17813 144.85398 463.13455 144.77094 463.09375 144.6875 C 454.74663 127.61915 443.67363 113.55724 430 103 L 427.3125 103 z M 254.96875 104.875 L 254.96875 146.4375 L 296.90625 146.4375 L 296.90625 104.875 L 254.96875 104.875 z M 341.5625 105.03125 L 341.5625 146.96875 L 383.5 146.96875 L 383.5 105.03125 L 341.5625 105.03125 z M 170.09375 107.5 L 170.09375 149.4375 L 212.03125 149.4375 L 212.03125 107.5 L 170.09375 107.5 z M 385.125 146.03125 L 385.125 169.1875 C 385.35371 169.49797 385.58677 169.80705 385.8125 170.125 C 389.63165 175.50497 392.49896 181.41173 394.375 188 L 427.0625 188 L 427.0625 146.03125 L 385.125 146.03125 z M 134 149.96875 L 134 191.90625 L 169.34375 191.90625 L 169.34375 149.96875 L 134 149.96875 z M 468.78125 158.1875 L 468.78125 186.90625 L 427.3125 186.90625 L 427.3125 228.84375 L 469.25 228.84375 L 469.25 188.0625 L 475.8125 188.0625 C 474.53885 177.71974 472.20685 167.74182 468.78125 158.1875 z M 170.09375 191.375 L 170.09375 233.3125 L 212.03125 233.3125 L 212.03125 191.375 L 170.09375 191.375 z M 394.53125 229.9375 C 392.56388 237.3559 389.4165 243.70797 385.125 249.21875 L 385.125 271.875 L 427.0625 271.875 L 427.0625 229.9375 L 394.53125 229.9375 z M 468.78125 230 L 468.78125 257.21875 C 471.81903 248.52007 473.99222 239.42734 475.34375 230 L 468.78125 230 z M 134 233.84375 L 134 275.78125 L 169.34375 275.78125 L 169.34375 233.84375 L 134 233.84375 z M 427.3125 270.78125 L 427.3125 312.71875 L 432.125 312.71875 C 434.87572 310.34828 437.47505 307.8332 439.90625 305.1875 C 449.53043 294.71406 457.29142 283.20553 463.1875 270.78125 L 427.3125 270.78125 z M 339.59375 271.59375 C 334.10594 272.44029 328.17766 273.06869 321.71875 273.40625 L 339.59375 273.40625 L 339.59375 271.59375 z M 341.5625 272.8125 L 341.5625 314.75 L 383.5 314.75 L 383.5 272.8125 L 341.5625 272.8125 z M 212.28125 273.71875 L 212.28125 274.28125 L 254.21875 274.28125 L 254.21875 273.71875 L 212.28125 273.71875 z M 254.96875 273.71875 L 254.96875 314.5625 L 296.90625 314.5625 L 296.90625 273.71875 L 254.96875 273.71875 z M 170.09375 275.25 L 170.09375 317.1875 L 212.03125 317.1875 L 212.03125 275.25 L 170.09375 275.25 z M 385.125 313.8125 L 385.125 336.8125 C 401.48404 332.10404 415.49881 325.47498 427.0625 316.78125 L 427.0625 313.8125 L 385.125 313.8125 z M 297.65625 315.34375 L 297.65625 345.90625 L 308.5 345.90625 C 319.39398 345.90628 329.76395 345.50004 339.59375 344.6875 L 339.59375 315.34375 L 297.65625 315.34375 z M 212.28125 316.21875 L 212.28125 345.90625 L 254.21875 345.90625 L 254.21875 316.21875 L 212.28125 316.21875 z M 134 317.71875 L 134 359.6875 L 169.34375 359.6875 L 169.34375 317.71875 L 134 317.71875 z M 170.09375 359.15625 L 170.09375 401.09375 L 212.03125 401.09375 L 212.03125 359.15625 L 170.09375 359.15625 z M 134 401.625 L 134 443.5625 L 169.34375 443.5625 L 169.34375 401.625 L 134 401.625 z M 170.09375 443.03125 L 170.09375 484.96875 L 212.03125 484.96875 L 212.03125 443.03125 L 170.09375 443.03125 z M 134 485.5 L 134 505.15625 C 134.00034 508.12594 135.21261 511.08761 137.3125 513.1875 C 139.41239 515.28739 142.37406 516.49966 145.34375 516.5 L 169.34375 516.5 L 169.34375 485.5 L 134 485.5 z " id="text2419" opacity=".75" color="#000000" stroke-width="22.688" fill="#ffffff"/>
+ <path d="m 145.3295,72.845074 a 11.345066,11.345066 0 0 0 -11.34375,11.3438 l 0,419.593696 a 11.345066,11.345066 0 0 0 11.34375,11.3438 l 55.53125,0 a 11.345066,11.345066 0 0 0 11.34375,-11.3438 l 0,-159.25 96.28125,0 c 60.9152,2e-4 105.3686,-12.3838 131.40624,-40.7187 24.54634,-26.7124 37.06212,-60.1939 37.0625,-98.2813 -3.9e-4,-22.3412 -4.59935,-43.2494 -13.875,-62.2187 -9.2028,-18.8181 -21.71176,-34.0076 -37.375,-44.8438 -15.51745,-10.733996 -34.40527,-17.778696 -56.21875,-21.437496 -0.0574,-0.01 -0.12999,-0.021 -0.1875,-0.031 -15.9176,-2.8746 -37.56905,-4.1559 -65.68749,-4.1563 l -158.28125,0 z m 11.34375,22.687496 146.9375,0 c 27.49502,4e-4 48.36129,1.3673 61.81249,3.8125 a 11.345066,11.345066 0 0 0 0.15625,0.031 c 19.31888,3.2203 34.92333,9.2448 47.21875,17.75 12.1939,8.4361 22.09534,20.2483 29.875,36.1563 7.70547,15.7582 11.59342,32.996 11.59375,52.25 -3.4e-4,33.2749 -10.19754,60.2313 -31.0625,82.9375 -19.37498,21.0844 -56.95264,33.3751 -114.71874,33.375 l -107.625,0 a 11.345066,11.345066 0 0 0 -11.34375,11.3437 l 0,159.25 -32.84375,0 0,-396.9062 z m 44.1875,26.8438 a 11.345066,11.345066 0 0 0 -11.34375,11.3437 l 0,149.9688 a 11.345066,11.345066 0 0 0 11.34375,11.3437 l 108.46875,0 c 37.2794,3e-4 65.55178,-6.5874 83.96874,-22.9062 17.62215,-15.6146 26.40592,-38.2902 26.40625,-64.875 -3.3e-4,-19.465 -5.08295,-37.0827 -15.40625,-51.625 -10.23022,-14.4095 -24.43448,-24.4695 -41.28125,-29.125 a 11.345066,11.345066 0 0 0 -0.0937,-0.031 c -11.78959,-3.1273 -29.16017,-4.0934 -54.71874,-4.0938 l -107.34375,0 z m 11.34375,22.6875 96,0 c 24.72938,3e-4 41.82519,1.488 48.78124,3.3125 0.0238,0.01 0.0702,0.025 0.0937,0.031 12.10617,3.3666 21.22373,9.7869 28.71875,20.3437 7.42116,10.4541 11.21848,22.8572 11.21875,38.5 -2.7e-4,21.8807 -6.25654,36.8084 -18.78125,47.9063 -11.73106,10.3946 -34.4428,17.1877 -68.90624,17.1875 l -97.125,0 0,-127.2813 z" id="text2419-1" opacity=".5" color="#000000" stroke-width="22.688" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_private2.svg b/vtm-themes/icons/symbols/transport/parking_private2.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/parking_private2.svg
rename to vtm-themes/icons/symbols/transport/parking_private2.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_private3.svg b/vtm-themes/icons/symbols/transport/parking_private3.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/parking_private3.svg
rename to vtm-themes/icons/symbols/transport/parking_private3.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/port.svg b/vtm-themes/icons/symbols/transport/port.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/port.svg
rename to vtm-themes/icons/symbols/transport/port.svg
diff --git a/vtm-themes/icons/symbols/transport/rental_bicycle.svg b/vtm-themes/icons/symbols/transport/rental_bicycle.svg
new file mode 100755
index 00000000..59642036
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/rental_bicycle.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <path transform="matrix(-1.043444,0,0,1.043444,323.37568,-17.91917)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path596" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
+ <path transform="matrix(-1.043444,0,0,1.043444,673.88637,-19.51244)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path595" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
+ <path sodipodi:nodetypes="ccccc" id="path594" d="M 399.8509,323.37769 L 189.54455,324.43987 L 115.19386,462.51978 L 257.52239,462.51978 L 406.22382,361.61524" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="21.782"/>
+ <path sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc" id="path593" d="M 391.76959,240.62652 C 403.19308,240.62652 411.82771,240.37164 420.67812,253.89246 C 423.2257,258.3997 424.39045,263.90301 423.44977,269.38108 C 422.32132,275.61019 418.63346,281.73019 414.28594,285.35311 C 408.52909,290.15049 403.06568,289.78041 403.94863,294.09299 C 405.08154,299.62655 408.53901,307.31615 412.27539,319.80251 C 416.06809,332.47698 420.57169,347.98935 424.99237,363.26848 C 429.41305,378.54758 433.75257,393.60169 437.1876,405.33231 C 438.90516,411.19759 440.40517,416.23394 441.55706,420.00574 C 442.67934,423.68059 443.6702,426.53512 443.5787,426.33161 C 447.15752,432.62827 447.64466,436.73113 453.64743,442.09045 C 460.37787,447.98085 465.85772,452.33235 467.75953,453.66161 C 472.59005,457.17067 474.83572,464.5761 472.28487,468.23518 C 469.07016,473.22193 462.43098,473.98687 457.5786,472.49499 C 452.97115,471.03238 445.6776,468.52005 437.22023,461.51522 L 437.155,461.41741 L 437.05718,461.35218 C 425.28921,451.25828 420.93556,439.00744 420.49254,438.29863 L 419.87297,437.35299 L 419.44906,436.30955 C 418.42937,433.79944 417.81856,431.58612 416.61222,427.63591 C 415.40585,423.6857 413.87655,418.58235 412.14495,412.66901 C 408.68179,400.84238 404.3643,385.76538 399.94972,370.50737 C 395.5351,355.24938 391.04254,339.816 387.29795,327.30227 C 383.55335,314.78855 381.18764,304.51112 380.31314,302.32482 C 378.18463,297.00359 377.09723,291.25886 378.5523,285.49927 C 380.00737,279.73971 384.3555,275.09124 388.25864,274.01066 C 397.16788,271.51814 394.80395,265.10979 390.24588,265.1005 L 352.04959,265.02275 L 351.95544,240.62705 C 351.95568,240.62652 376.74854,240.62652 391.76959,240.62652 z" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="25"/>
+ <path id="path599" d="M 254.79723,458.19646 L 182.69587,281.69838" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.09"/>
+ <path id="path600" d="M 279.58342,413.13108 L 236.0195,514.52769" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="9.521"/>
+ <path transform="matrix(-0.294204,0,0,0.259853,315.7233,342.74209)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path597" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="31.31"/>
+ <path sodipodi:nodetypes="cc" id="path601" d="M 298.97743,413.1773 L 260.49527,413.53004" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="13.304"/>
+ <path sodipodi:nodetypes="cc" id="path602" d="M 255.63669,513.07118 L 217.15452,513.42393" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="13.304"/>
+ <path sodipodi:nodetypes="cssccc" id="path603" d="M 147.3959,265.92563 L 237.89819,265.92563 C 241.27795,265.92563 245.64018,271.90419 241.27795,275.87712 C 236.55999,280.36731 194.14915,289.58389 194.14915,289.58389 C 194.14915,289.58389 182.50779,292.77588 176.31155,292.02484 C 170.11535,291.27378 148.71025,289.39614 147.3959,265.92563 z" fill="#ffffff" fill-rule="evenodd" stroke-width=".695"/>
+ <g id="g2303" transform="matrix(1.1575693,0,0,1.1575693,79.723001,48.80318)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10">
+  <g id="g2305">
+   <path d="M 100.25,5.75 C 60.335317,5.4974281 26.826507,47.079175 35.324049,86.079571 C 40.899839,118.70779 72.527534,145.59302 106.15625,142.28125 C 128.63909,140.89286 149.66527,127.49806 160.96875,108.1875 C 171.22308,100.14266 186.5403,110.7971 196.625,102.125 C 203.52011,94.990233 209.28493,85.495716 219,82.28125 C 226.79207,84.482581 230.2873,92.927779 236.71875,96.84375 C 243.17665,92.70632 246.9099,82.864282 255.75,82.90625 C 262.00373,86.670488 265.96886,93.31314 271.875,97.25 C 278.58404,92.957363 282.56064,82.699357 291.6875,82.6875 C 298.0679,86.28521 301.59369,93.796619 308.25,96.65625 C 317.51043,88.304078 326.98735,79.656571 334.71875,69.71875 C 334.69063,64.095915 327.08245,60.980337 324.06234,56.381768 C 317.78098,50.838171 312.47635,40.600972 302.59375,42.71875 C 289.22865,43.785674 275.56059,42.397209 262.0625,42.9375 C 229.36594,42.923262 196.41274,43.721279 163.875,42.125 C 154.95723,34.457888 150.20766,22.500694 139.25,17.0625 C 127.86772,9.4689786 114.03062,5.323508 100.25,5.75 z M 73.09375,50.53125 C 92.620948,50.045026 104.27829,77.77724 90.09375,91.25 C 78.614364,103.88316 54.044314,99.821659 49.21875,82.875 C 43.869693,67.719648 56.328438,48.853256 73.09375,50.53125 z" id="path2307" stroke-width="10"/>
+  </g>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/rental_car.svg b/vtm-themes/icons/symbols/transport/rental_car.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/rental_car.svg
rename to vtm-themes/icons/symbols/transport/rental_car.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/roundabout_anticlockwise.svg b/vtm-themes/icons/symbols/transport/roundabout_anticlockwise.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/roundabout_anticlockwise.svg
rename to vtm-themes/icons/symbols/transport/roundabout_anticlockwise.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/roundabout_clockwise.svg b/vtm-themes/icons/symbols/transport/roundabout_clockwise.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/roundabout_clockwise.svg
rename to vtm-themes/icons/symbols/transport/roundabout_clockwise.svg
diff --git a/vtm-themes/icons/symbols/transport/slipway.svg b/vtm-themes/icons/symbols/transport/slipway.svg
new file mode 100755
index 00000000..cc2df524
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/slipway.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r=".8" id="circle4300"/>
+    <circle cx="6.5" r=".8" id="circle4302"/>
+    <circle cx="10" r=".8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path inkscape:connector-curvature="0" id="path5679" d="m 121.52892,132.23153 100.56651,27.37779 55.84341,-38.73987 19.40016,4.65362 -55.2995,38.86073 304.78178,83.58383 -22.3011,81.83115 -305.93008,-83.4025 C 100.07394,211.16174 121.64979,132.11067 121.64979,132.11067" fill="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path5681" d="m 385.87862,341.52348 c -0.36262,-6.82934 -1.63179,-13.35649 -3.86794,-19.52101 l 137.91632,38.43767 -4.41188,16.92225 -129.6365,-35.83891 z" fill="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path5683" d="m 260.65398,306.89331 c 3.74706,-5.43929 8.15894,-10.33465 13.17518,-14.50478 L 43.747015,228.86967 v 18.25184 l 216.906965,59.7718 z" fill="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path5685" d="m 317.52481,367.39035 c 12.38951,0 22.42198,-9.97204 22.42198,-22.36155 0,-12.38949 -10.03247,-22.42197 -22.42198,-22.42197 -12.38949,0 -22.42196,10.03248 -22.42196,22.42197 0,12.38951 10.03247,22.36155 22.42196,22.36155 z m 224.58241,137.43283 c -10.93902,0 -21.33411,-2.4779 -30.58091,-6.64803 -9.60942,-4.41187 -20.36714,-7.01064 -31.60834,-7.01064 -11.24121,0 -21.99892,2.59877 -31.48747,7.01064 -9.36768,4.17013 -19.76277,6.64803 -30.70179,6.64803 -10.93904,0 -21.33413,-2.4779 -30.7018,-6.64803 -9.54898,-4.41187 -20.3067,-7.01064 -31.48747,-7.01064 -11.30165,0 -21.99892,2.59877 -31.60834,7.01064 -9.2468,4.17013 -19.76276,6.64803 -30.64136,6.64803 -10.87858,0 -21.33412,-2.4779 -30.64135,-6.64803 -9.60943,-4.41187 -20.42757,-7.01064 -31.60835,-7.01064 -11.18077,0 -21.99892,2.59877 -31.48747,7.01064 -9.30723,4.17013 -19.8232,6.64803 -30.70178,6.64803 -10.8786,0 -21.33413,-2.4779 -30.70181,-6.64803 -9.48854,-4.41187 -20.30669,-7.01064 -31.48746,-7.01064 -11.180769,0 -21.998925,2.59877 -31.5479,7.01064 -9.307246,4.17013 -19.823206,6.64803 -30.641362,6.64803 L 43.747015,322.18377 295.34459,391.50455 c -17.34531,-8.40069 -29.3722,-25.98774 -29.3722,-46.47575 0,-28.5865 23.14723,-51.67328 51.6733,-51.67328 28.52608,0 51.6733,23.14722 51.6733,51.67328 0,28.52609 -23.20766,51.6733 -51.6733,51.6733 -1.69223,0 -3.44488,-0.36262 -5.07667,-0.54393 l 229.29646,63.21668 0.24174,45.44833 z" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/speedbump.svg b/vtm-themes/icons/symbols/transport/speedbump.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/speedbump.svg
rename to vtm-themes/icons/symbols/transport/speedbump.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/subway.svg b/vtm-themes/icons/symbols/transport/subway.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/subway.svg
rename to vtm-themes/icons/symbols/transport/subway.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/taxi_rank.svg b/vtm-themes/icons/symbols/transport/taxi_rank.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/taxi_rank.svg
rename to vtm-themes/icons/symbols/transport/taxi_rank.svg
diff --git a/vtm-themes/resources/assets/symbols/traffic_signal1.svg b/vtm-themes/icons/symbols/transport/traffic_lights.svg
similarity index 71%
rename from vtm-themes/resources/assets/symbols/traffic_signal1.svg
rename to vtm-themes/icons/symbols/transport/traffic_lights.svg
index 2ddb0e93..12afe437 100755
--- a/vtm-themes/resources/assets/symbols/traffic_signal1.svg
+++ b/vtm-themes/icons/symbols/transport/traffic_lights.svg
@@ -66,16 +66,14 @@
   </marker>
   <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
        style="overflow:visible"&gt;
-            <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
+         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
  </defs>
- <g id="g4245" transform="matrix(0.99990728,0,0,0.99990728,-4.8659522,-1.3236405)">
-  <circle transform="matrix(0.91935484,0,0,0.91935484,29.263352,9.6518204)" id="path4809-1" cx="288.47" cy="119.68" r="95.13" fill="#ffffff"/>
-  <circle id="path4813-7" transform="matrix(0.91935484,0,0,0.91935484,29.263352,181.65182)" cx="288.47" cy="119.68" r="95.13" fill="#ffffff"/>
-  <circle transform="matrix(0.91935484,0,0,0.91935484,29.263352,351.65182)" id="path4815-4" cx="288.47" cy="119.68" r="95.13" fill="#ffffff"/>
-  <circle transform="matrix(0.91935484,0,0,0.91935484,29.263356,9.6518182)" id="path4809" cx="288.47" cy="119.68" r="95.13" opacity=".6" fill="#0092da"/>
-  <circle id="path4813" transform="matrix(0.91935484,0,0,0.91935484,29.263356,181.65182)" cx="288.47" cy="119.68" r="95.13" opacity=".2" fill="#0092da"/>
-  <circle transform="matrix(0.91935484,0,0,0.91935484,29.263356,351.65182)" id="path4815" cx="288.47" cy="119.68" r="95.13" opacity=".3" fill="#0092da"/>
-  <path id="path4782" d="m 296.09195,17.829971 c -1.1544,-0.01235 -2.31572,5.1e-4 -3.47009,0.02965 -49.73086,-0.08599 -95.36898,42.46164 -97.87428,92.298409 -1.58709,25.61454 0.16862,51.29301 -0.50421,76.93512 0.21255,95.85547 -0.63683,191.72795 0.50421,287.57244 4.1478,45.80317 43.39248,85.55474 89.33253,89.62911 43.41739,4.86929 88.30297,-21.28198 103.92469,-62.28363 8.26021,-19.9307 8.13,-41.86942 7.41471,-63.08442 -0.27357,-110.32898 0.62412,-220.67496 -0.53386,-330.99303 -4.11589,-45.50134 -42.81102,-85.076596 -88.44276,-89.451162 -3.44097,-0.392503 -6.88777,-0.615452 -10.35094,-0.652495 z m -0.0297,24.972772 c 42.62651,0 77.20205,34.575538 77.20205,77.202047 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.626509 34.54588,-77.202047 77.17239,-77.202047 z m 0,170.835107 c 42.62651,0 77.20205,34.57554 77.20205,77.20205 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20205 77.17239,-77.20205 z m 0,170.83512 c 42.62651,0 77.20205,34.57553 77.20205,77.20204 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20204 77.17239,-77.20204 z" inkscape:connector-curvature="0" fill="#0092da" color="#000000" stroke-width="200"/>
-  <path d="m 296.09195,17.829971 c -1.1544,-0.01235 -2.31572,5.1e-4 -3.47009,0.02965 -49.73086,-0.08599 -95.36898,42.46164 -97.87428,92.298409 -1.58709,25.61454 0.16862,51.29301 -0.50421,76.93512 0.21255,95.85547 -0.63683,191.72795 0.50421,287.57244 4.1478,45.80317 43.39248,85.55474 89.33253,89.62911 43.41739,4.86929 88.30297,-21.28198 103.92469,-62.28363 8.26021,-19.9307 8.13,-41.86942 7.41471,-63.08442 -0.27357,-110.32898 0.62412,-220.67496 -0.53386,-330.99303 -4.11589,-45.50134 -42.81102,-85.076596 -88.44276,-89.451162 -3.44097,-0.392503 -6.88777,-0.615452 -10.35094,-0.652495 z m -0.0297,24.972772 c 42.62651,0 77.20205,34.575538 77.20205,77.202047 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.626509 34.54588,-77.202047 77.17239,-77.202047 z m 0,170.835107 c 42.62651,0 77.20205,34.57554 77.20205,77.20205 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20205 77.17239,-77.20205 z m 0,170.83512 c 42.62651,0 77.20205,34.57553 77.20205,77.20204 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20204 77.17239,-77.20204 z" id="path8151" inkscape:connector-curvature="0" fill="#0092da" color="#000000" stroke-width="8"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
  </g>
+ <path sodipodi:type="arc" id="path4809" sodipodi:cx="288.46561" sodipodi:cy="119.68254" sodipodi:rx="95.132271" sodipodi:ry="95.132271" d="m 383.59788,119.68254 a 95.132271,95.132271 0 1 1 -190.26454,0 95.132271,95.132271 0 1 1 190.26454,0 z" transform="matrix(0.91935484,0,0,0.91935484,29.263356,9.6518182)" opacity=".6" fill="#ffffff"/>
+ <path transform="matrix(0.91935484,0,0,0.91935484,29.263356,181.65182)" d="m 383.59788,119.68254 a 95.132271,95.132271 0 1 1 -190.26454,0 95.132271,95.132271 0 1 1 190.26454,0 z" sodipodi:ry="95.132271" sodipodi:rx="95.132271" sodipodi:cy="119.68254" sodipodi:cx="288.46561" id="path4813" sodipodi:type="arc" opacity=".2" fill="#ffffff"/>
+ <path sodipodi:type="arc" id="path4815" sodipodi:cx="288.46561" sodipodi:cy="119.68254" sodipodi:rx="95.132271" sodipodi:ry="95.132271" d="m 383.59788,119.68254 a 95.132271,95.132271 0 1 1 -190.26454,0 95.132271,95.132271 0 1 1 190.26454,0 z" transform="matrix(0.91935484,0,0,0.91935484,29.263356,351.65182)" opacity=".3" fill="#ffffff"/>
+ <path d="m 296.09195,17.829971 c -1.1544,-0.01235 -2.31572,5.1e-4 -3.47009,0.02965 -49.73086,-0.08599 -95.36898,42.46164 -97.87428,92.298414 -1.58709,25.61454 0.16862,51.29301 -0.50421,76.93512 0.21255,95.85547 -0.63683,191.72794 0.50421,287.57244 4.1478,45.80317 43.39248,85.55474 89.33253,89.62911 43.41739,4.86929 88.30297,-21.28198 103.92469,-62.28363 8.26021,-19.9307 8.13,-41.86942 7.41471,-63.08442 -0.27357,-110.32898 0.62412,-220.67496 -0.53386,-330.99303 -4.11589,-45.501345 -42.81102,-85.076601 -88.44276,-89.451167 -3.44097,-0.392503 -6.88777,-0.615452 -10.35094,-0.652495 z m -0.0297,24.972772 c 42.62651,0 77.20205,34.575538 77.20205,77.202047 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.626509 34.54588,-77.202047 77.17239,-77.202047 z m 0,170.835107 c 42.62651,0 77.20205,34.57554 77.20205,77.20205 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20205 77.17239,-77.20205 z m 0,170.83512 c 42.62651,0 77.20205,34.57553 77.20205,77.20204 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20204 77.17239,-77.20204 z" id="path4782" color="#000000" stroke-width="200" fill="#ffffff"/>
+ <path id="path8151" d="m 296.09195,17.829971 c -1.1544,-0.01235 -2.31572,5.1e-4 -3.47009,0.02965 -49.73086,-0.08599 -95.36898,42.46164 -97.87428,92.298414 -1.58709,25.61454 0.16862,51.29301 -0.50421,76.93512 0.21255,95.85547 -0.63683,191.72794 0.50421,287.57244 4.1478,45.80317 43.39248,85.55474 89.33253,89.62911 43.41739,4.86929 88.30297,-21.28198 103.92469,-62.28363 8.26021,-19.9307 8.13,-41.86942 7.41471,-63.08442 -0.27357,-110.32898 0.62412,-220.67496 -0.53386,-330.99303 -4.11589,-45.501345 -42.81102,-85.076601 -88.44276,-89.451167 -3.44097,-0.392503 -6.88777,-0.615452 -10.35094,-0.652495 z m -0.0297,24.972772 c 42.62651,0 77.20205,34.575538 77.20205,77.202047 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.626509 34.54588,-77.202047 77.17239,-77.202047 z m 0,170.835107 c 42.62651,0 77.20205,34.57554 77.20205,77.20205 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20205 77.17239,-77.20205 z m 0,170.83512 c 42.62651,0 77.20205,34.57553 77.20205,77.20204 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20204 77.17239,-77.20204 z" color="#000000" stroke-width="8" fill="none" stroke="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/train_station.svg b/vtm-themes/icons/symbols/transport/train_station.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/train_station.svg
rename to vtm-themes/icons/symbols/transport/train_station.svg
diff --git a/vtm-themes/icons/symbols/transport/train_station2.svg b/vtm-themes/icons/symbols/transport/train_station2.svg
new file mode 100755
index 00000000..a051f037
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/train_station2.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <defs id="defs22">
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <metadata id="metadata10"/>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
+ </g>
+ <g id="g3574" transform="matrix(1.2317123,0,0,1.2317123,-81.360132,-113.23274)">
+  <g id="g3576">
+   <path d="M 295.5625,77.1875 L 213.03125,77.25 C 174.59259,77.249989 146.3125,108.11801 146.3125,141.75 L 146.3125,379.96875 C 146.31253,412.55139 171.80358,439.27577 197.4375,443.40625 L 120.5625,558.71875 L 164.9375,558.71875 L 219.90625,478.125 L 295.1875,478.125 L 295.25,478.125 L 295.3125,478.125 L 370.59375,478.125 L 425.5625,558.71875 L 469.9375,558.71875 L 393.0625,443.40625 C 418.69638,439.27575 444.21875,412.55141 444.21875,379.96875 L 444.21875,141.75 C 444.21871,108.11804 415.90738,77.25 377.46875,77.25 L 295.5625,77.1875 z M 262.875,91 L 295.1875,91 L 295.25,91 L 295.3125,91 L 327.625,91 C 333.47317,91 338.5625,95.90183 338.5625,101.75 L 338.5625,120.6875 C 338.5625,126.53567 333.75166,131.5625 327.625,131.5625 L 295.3125,131.5625 L 295.25,131.5625 L 295.1875,131.5625 L 262.875,131.5625 C 256.74835,131.5625 251.9375,126.53567 251.9375,120.6875 L 251.9375,101.75 C 251.9375,95.90183 257.02682,91.000003 262.875,91 z M 215.25,144.40625 L 295.1875,144.40625 L 295.3125,144.40625 L 375.25,144.40625 C 396.97176,144.40626 408.50001,159.95825 408.5,177.78125 L 408.5,220.65625 C 408.66931,241.26409 393.62996,253.90625 375.25,253.90625 L 295.3125,253.90625 L 295.25,253.90625 L 295.1875,253.90625 L 215.25,253.90625 C 196.87003,253.90625 181.83068,241.26409 182,220.65625 L 182,177.78125 C 181.99999,159.95825 193.52822,144.40625 215.25,144.40625 z M 211.625,350.15625 C 227.78266,350.15622 240.90625,363.24859 240.90625,379.40625 C 240.90625,395.56275 227.78266,408.65625 211.625,408.65625 C 195.46731,408.65623 182.375,395.56279 182.375,379.40625 C 182.37496,363.24855 195.46734,350.15625 211.625,350.15625 z M 378.1875,350.15625 C 394.34514,350.15623 407.4375,363.24858 407.4375,379.40625 C 407.43748,395.56277 394.34517,408.65626 378.1875,408.65625 C 362.02982,408.65623 348.93749,395.56278 348.9375,379.40625 C 348.93748,363.24857 362.02985,350.15625 378.1875,350.15625 z" transform="matrix(0.8977168,0,0,0.8977168,40.710583,46.777129)" id="path3578" fill="#ffffff"/>
+  </g>
+ </g>
+</svg>
diff --git a/vtm-themes/icons/symbols/transport/tram_stop.svg b/vtm-themes/icons/symbols/transport/tram_stop.svg
new file mode 100755
index 00000000..ca7669c7
--- /dev/null
+++ b/vtm-themes/icons/symbols/transport/tram_stop.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
+   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
+   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
+  </marker>
+  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
+   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
+   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
+   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
+   <g transform="scale(-1.2)" id="g4152">
+    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
+   </g>
+  </marker>
+  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
+   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
+   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
+   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
+   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
+  </marker>
+  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
+   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
+   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
+   <g transform="translate(-13,0)" id="g4298">
+    <circle cx="3" r="0.8" id="circle4300"/>
+    <circle cx="6.5" r="0.8" id="circle4302"/>
+    <circle cx="10" r="0.8" id="circle4304"/>
+   </g>
+  </marker>
+  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
+   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity="0.75" stroke-width="1.25"/>
+  </marker>
+  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
+   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
+  </marker>
+  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
+   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
+  </marker>
+  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
+       style="overflow:visible"&gt;
+            <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width="0.125"/></marker>
+  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
+   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
+  </marker>
+  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
+   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
+  </marker>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" stroke-width="3.408" stroke="#eee" fill="#0092da"/>
+ </g>
+ <path inkscape:connector-curvature="0" id="path30859" d="M 208.7127,117.9537 333.07725,36.035961 454.73526,117.8877 333.16165,199.77627 208.7127,117.9537 z" fill="none" stroke="#ffffff" stroke-width="10.203"/>
+ <path inkscape:connector-curvature="0" id="path29926" d="m 160.41817,491.74312 c 0.43281,67.56962 97.21497,67.57086 97.21497,0.60759" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path30815" d="m 360.92405,491.7233 c 0.43282,67.56962 97.21497,67.57086 97.21497,0.60759" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path30821" d="m 268.11413,522.5785 81.41754,0 c -4.14386,-7.17737 -6.03434,-14.78615 -5.77213,-30.37969 l -68.50618,0 c -0.48497,15.8109 -2.96383,23.14768 -7.13923,30.37969 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path30827" d="m 131.77163,205.029 0.27328,30.78975 376.99221,0 0,-30.78975 -377.26549,0 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" id="path30833" d="m 480.43363,234.40679 c 7.58287,5.35346 14.57502,9.87803 14.57502,14.48394 l -0.0911,102.38957 c -1.77496,10.05829 -8.9163,11.74021 -14.48393,17.30785 l 28.60349,0 0,-134.18136 -28.60349,0 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path30839" d="m 270.74634,234.72407 c 7.58289,5.35345 14.57994,9.882 14.57994,14.48792 l -0.0886,188.16651 c -1.77496,10.05828 -8.92375,11.72291 -14.49138,17.29054 l 34.59355,-0.26458 0.43151,-205.58342 c 0,-4.06837 7.20375,-8.83149 14.63843,-14.08105 l -49.66349,-0.0159 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path30849" d="m 224.52251,234.55124 c -7.58289,5.35345 -14.57994,9.882 -14.57994,14.48791 l 0.0886,188.16652 c 1.77496,10.05828 8.92375,11.72291 14.49138,17.29054 l -34.59355,-0.005 0.21252,-219.82158 34.38103,-0.11794 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccc" id="path30853" d="m 131.7212,234.17906 -65.952005,131.26635 0,79.61609 c 1.5e-5,14.37924 16.979427,29.32707 29.924355,29.28669 l 413.34357,0 0,-106.35215 -204.64739,0 0,86.31149 -113.50303,0 0,-86.17485 -57.11589,0 c -12.94931,-10e-6 -34.80333,-15.56068 -26.9638,-44.81821 l 43.86172,-89.13541 -18.94753,0 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path30857" d="m 306.47577,351.37859 c 1.77496,10.05828 9.13631,11.29779 14.70394,16.86542 -11.43275,-0.0212 -30.02772,-0.14759 -30.06886,-1.20447 l -0.60232,-15.46855 15.96724,-0.1924 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path31750" d="m 438.29341,205.67655 -10.41177,-10.91967 -192.7448,0 -8.88809,10.66572 212.04466,0.25395 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/turning_circle.svg b/vtm-themes/icons/symbols/transport/turning_circle.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/turning_circle.svg
rename to vtm-themes/icons/symbols/transport/turning_circle.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/walking.svg b/vtm-themes/icons/symbols/transport/walking.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/walking.svg
rename to vtm-themes/icons/symbols/transport/walking.svg
diff --git a/vtm-themes/resources/assets/symbols/transport/zebra_crossing.svg b/vtm-themes/icons/symbols/transport/zebra_crossing.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/transport/zebra_crossing.svg
rename to vtm-themes/icons/symbols/transport/zebra_crossing.svg
diff --git a/vtm-themes/resources/assets/symbols/water/dam.svg b/vtm-themes/icons/symbols/water/dam.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/water/dam.svg
rename to vtm-themes/icons/symbols/water/dam.svg
diff --git a/vtm-themes/resources/assets/symbols/water/tower.svg b/vtm-themes/icons/symbols/water/tower.svg
similarity index 100%
rename from vtm-themes/resources/assets/symbols/water/tower.svg
rename to vtm-themes/icons/symbols/water/tower.svg
diff --git a/vtm-themes/icons/symbols/water/weir.svg b/vtm-themes/icons/symbols/water/weir.svg
new file mode 100755
index 00000000..d59c8c64
--- /dev/null
+++ b/vtm-themes/icons/symbols/water/weir.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+  <linearGradient id="linearGradient2936">
+   <stop id="stop2938" stop-color="#8acf6b"/>
+   <stop offset="1" id="stop2940" stop-color="#368912"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2952">
+   <stop id="stop2954" stop-color="#c0d50d"/>
+   <stop offset="1" id="stop2956" stop-color="#eef2cd"/>
+  </linearGradient>
+ </defs>
+ <g id="g1327">
+  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ </g>
+ <path d="M 105 138.5625 C 82.455636 139.04808 61.42436 153.68047 39.6875 153.5625 C 39.477692 153.55754 39.27222 153.53876 39.0625 153.53125 L 39.0625 197.15625 C 61.302883 197.02121 82.818963 181.68267 106 182.15625 C 129.44843 182.79644 154.8153 199.06962 177.78125 200.1875 C 200.43961 200.80612 224.32047 186.55857 240.9375 186.4375 C 257.16223 186.30388 265.77336 196.91758 275.46875 199.40625 C 285.01176 201.72301 292.31781 202.22622 298.03125 200.65625 L 298.15625 169.9375 C 301.99997 171.95999 320.23864 173.93213 288.375 154.71875 C 274.40607 144.84293 258.32295 142.6086 242.09375 142.90625 C 225.47492 143.0272 201.65835 157.27487 179 156.65625 C 156.03404 155.53837 130.63594 139.20268 107.1875 138.5625 C 106.45705 138.54774 105.72724 138.54684 105 138.5625 z " id="path121" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 272.81345,203.26343 c 5.4828,17.66839 1.73344,42.62012 8.42705,62.46192 7.27785,19.4899 11.44834,27.60472 18.70891,47.5966 0.38761,1.09033 8.17912,19.81802 8.47491,20.92412 29.0411,-0.2218 57.0508,23.61394 40.49302,-25.1136 -7.26055,-19.9919 -18.90558,-37.18293 -26.18346,-56.67283 -6.6936,-19.84178 2.39416,-42.65962 -3.08808,-60.32633 -9.25741,-32.80102 -33.09728,-33.91389 -41.39465,-35.83641 -32.81615,-7.60364 -56.31307,-17.88257 -39.03183,16.18077 3.88984,7.66729 17.65058,13.14773 33.59413,30.78576 z" id="path3025" sodipodi:nodetypes="cccccccssc" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 140.53158,233.875 c -20.6718,-0.0322 -74.867293,0.70379 -101.46908,1.4375 l 0,241.3125 237.43138,0 C 260.82193,231.04103 268.79743,207.07373 140.53158,233.875 z" id="rect3039" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.04"/>
+ <path d="M 371 320.03125 C 349.83492 320.50279 329.29817 332.3247 309.4375 331.625 C 308.62739 331.587 307.86459 331.54873 307.0625 331.46875 L 307.0625 375.1875 C 307.46587 375.216 307.87582 375.2326 308.28125 375.25 C 329.44393 375.99556 351.28679 362.62729 373.9375 363.65625 C 396.27477 364.59271 418.64775 380.42422 441.46875 380.96875 C 463.9069 381.08692 485.53182 365.49479 508.90625 365.96875 C 519.83001 366.23041 531.17539 369.95588 542.5 373.96875 L 542.5 329.9375 C 531.58299 326.11964 520.65336 322.66245 510.125 322.375 C 486.75051 321.90282 465.06314 337.55569 442.625 337.4375 C 419.80394 336.89477 397.46222 321.06326 375.125 320.125 C 374.4173 320.0877 373.73743 320.04075 373.03125 320.03125 C 372.34715 320.02202 371.68274 320.01604 371 320.03125 z " id="path3815" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="M 378.65625 408.4375 C 356.76496 408.14203 335.56385 420.78476 315.0625 420.0625 C 314.2524 420.0245 313.45833 419.95498 312.65625 419.875 L 312.65625 463.59375 C 313.05962 463.62225 313.46957 463.6701 313.875 463.6875 C 335.03768 464.43307 356.9118 451.03355 379.5625 452.0625 C 401.89977 452.99897 424.24149 468.83047 447.0625 469.375 C 469.50065 469.49317 491.15682 453.90105 514.53125 454.375 C 523.64659 454.59334 533.05472 457.24053 542.5 460.4375 L 542.5 416.4375 C 533.4631 413.44622 524.47349 411.01942 515.75 410.78125 C 492.37551 410.30906 470.68813 425.96195 448.25 425.84375 C 425.42894 425.30103 403.08722 409.46951 380.75 408.53125 C 380.0423 408.49395 379.36243 408.447 378.65625 408.4375 z " id="path3831" fill="#ffffff" fill-rule="evenodd"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/coniferous.svg b/vtm-themes/resources/assets/patterns/coniferous.svg
new file mode 100644
index 00000000..da256c96
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/coniferous.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <path inkscape:connector-curvature="0" id="path8893-1-1" d="m 151.49813,293.8417 -44.4375,95.875 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.062502,29.875 -0.5625,0.90625 1.0625,-0.15625 45.593752,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.875 -0.5,0.0937 -0.53125,-0.0937 z m -0.0312,2.4375 0,194.21875 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125002,6.75 17.937502,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.15625 z m 1.125,0.0625 43.25,93.09375 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.15625 z m -0.63664,-2.30136 -44.44666,95.87969 9.78092,0 -15.56963,28.27819 11.57742,0 -18.497262,30.60698 46.176622,-6.91983 0,49.10424 10.97859,0 0,-196.94927 z m 0.13307,0 0,196.94927 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.87969 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
+ <path inkscape:connector-curvature="0" id="path8893-1-7" d="m 438.03409,87.423634 -44.4375,95.874996 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.0625,29.875 -0.5625,0.90625 1.0625,-0.15625 45.59375,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.874996 -0.5,0.0937 -0.53125,-0.0937 z m -0.0312,2.4375 0,194.218746 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125,6.75 17.9375,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.156246 z m 1.125,0.0625 43.25,93.093746 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.156246 z m -0.63664,-2.30136 -44.44666,95.879686 9.78092,0 -15.56963,28.27819 11.57742,0 -18.49726,30.60698 46.17662,-6.91983 0,49.10424 10.97859,0 0,-196.949266 z m 0.13307,0 0,196.949266 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.879686 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/coniferous_and_deciduous.svg b/vtm-themes/resources/assets/patterns/coniferous_and_deciduous.svg
new file mode 100644
index 00000000..55e8cd12
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/coniferous_and_deciduous.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <path id="path8893-1" d="m 171,276.21875 -44.4375,95.875 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.0625,29.875 -0.5625,0.90625 1.0625,-0.15625 45.59375,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.875 -0.5,0.0937 L 171,276.21875 z m -0.0312,2.4375 0,194.21875 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125,6.75 17.9375,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.15625 z m 1.125,0.0625 43.25,93.09375 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.15625 z m -0.63664,-2.30136 -44.44666,95.87969 9.78092,0 -15.56963,28.27819 11.57742,0 -18.49726,30.60698 46.17662,-6.91983 0,49.10424 10.97859,0 0,-196.94927 z m 0.13307,0 0,196.94927 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.87969 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
+ <path d="m 401.20072,107.52099 c -12.89249,-0.21792 -26.4631,6.91624 -29.20596,21.537 -1.16133,6.19036 -2.13136,8.18098 -9.45839,8.30804 -22.57124,0.39142 -32.17031,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.56,7.73287 -32.37287,24.61961 2.48489,73.74553 35.59676,50.16779 4.84775,-3.4519 5.61647,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31908,0 c 1.71459,0 2.57221,0.006 3.96229,0 1.40745,0.006 2.28396,0 4.0262,0 l 17.31908,0 -2.81195,-9.52229 c -2.88049,-9.57117 -3.97059,-38.46295 -1.66161,-44.47997 1.09387,-2.85059 1.86259,-2.81282 6.71034,0.63908 33.11187,23.57774 67.96963,-25.54818 35.59676,-50.16779 -6.36099,-4.83754 -7.77751,-6.8574 -5.49609,-7.73287 19.06917,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23315,-2.11768 -9.39448,-8.30804 -2.87273,-15.31291 -17.65149,-22.36306 -31.05929,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/deciduous.svg b/vtm-themes/resources/assets/patterns/deciduous.svg
new file mode 100644
index 00000000..016a340c
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/deciduous.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <path d="m 159.3237,301.42595 c -12.89248,-0.21792 -26.46309,6.91624 -29.20596,21.537 -1.16132,6.19036 -2.13136,8.18098 -9.45839,8.30804 -22.571243,0.39142 -32.170313,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.55999,7.73287 -32.372883,24.61961 2.48489,73.74553 35.59676,50.16779 4.84774,-3.4519 5.61646,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31907,0 c 1.71459,0 2.57221,0.006 3.9623,0 1.40744,0.006 2.28396,0 4.0262,0 l 17.31907,0 -2.81195,-9.52229 c -2.88048,-9.57117 -3.97058,-38.46295 -1.66161,-44.47997 1.09388,-2.85059 1.8626,-2.81282 6.71034,0.63908 33.11188,23.57774 67.96964,-25.54818 35.59676,-50.16779 -6.36098,-4.83754 -7.77751,-6.8574 -5.49608,-7.73287 19.06916,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23316,-2.11768 -9.39448,-8.30804 -2.87273,-15.31291 -17.6515,-22.36306 -31.0593,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
+ <path d="m 419.39534,72.446632 c -12.89248,-0.21792 -26.46309,6.91624 -29.20596,21.537 -1.16132,6.190358 -2.13136,8.180978 -9.45839,8.308038 -22.57124,0.39142 -32.17031,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.55999,7.73287 -32.37288,24.6196 2.48489,73.74552 35.59676,50.16778 4.84774,-3.4519 5.61646,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31907,0 c 1.71459,0 2.57221,0.006 3.9623,0 1.40744,0.006 2.28396,0 4.0262,0 l 17.31907,0 -2.81195,-9.52229 c -2.88048,-9.57117 -3.97058,-38.46295 -1.66161,-44.47997 1.09388,-2.85059 1.8626,-2.81282 6.71034,0.63908 33.11189,23.57774 67.96965,-25.54818 35.59677,-50.16778 -6.36098,-4.83754 -7.77751,-6.8574 -5.49608,-7.73287 19.06916,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23316,-2.11768 -9.39448,-8.308038 -2.87273,-15.31291 -17.65151,-22.36306 -31.05931,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696-1" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/farmland.svg b/vtm-themes/resources/assets/patterns/farmland.svg
new file mode 100644
index 00000000..02b62fe7
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/farmland.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-311,-468.36218)">
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="64" width="64" y="-596.4" x="-375" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" height="64" width="64" y="468.4" x="375" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="64" width="64" y="-439" x="532.4" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="64" width="64" y="311" x="-532.4" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-594.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-586.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-578.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-570.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-562.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-554.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-546.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-538.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="470.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="478.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="486.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="494.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="502.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="510.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="518.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="526.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-437" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-429" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-421" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-413" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-405" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-397" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-389" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-381" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="313" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="321" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="329" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="337" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="345" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="353" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="361" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="369" x="-532.4" fill="#efe9c9"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/grass.svg b/vtm-themes/resources/assets/patterns/grass.svg
new file mode 100644
index 00000000..223e5490
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/grass.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3781" d="m 185.62513,286.07679 0.32964,-83.39783" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3783" d="M 235.01392,232.12965 208.64307,286.1899" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3785" d="m 268.03405,253.11322 -32.3043,32.96357" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" d="m 140.65911,229.8222 22.74487,56.3677" id="path3787" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" d="m 104.34263,254.10212 31.97466,31.97467" id="path3789" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 385.62513,190.07678 0.32964,-83.39783" id="path3793" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="M 435.01392,136.12964 408.64307,190.1899" id="path3795" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 468.03405,157.11321 -32.3043,32.96357" id="path3797" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3799" d="m 340.65911,133.8222 22.74487,56.3677" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3801" d="m 304.34263,158.10212 31.97466,31.97466" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 289.62513,436.07679 0.32964,-83.39783" id="path3807" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 339.01392,382.12965 -26.37085,54.06026" id="path3809" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 372.03405,403.11322 -32.3043,32.96357" id="path3811" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3813" d="m 244.65911,379.82221 22.74487,56.3677" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3815" d="m 208.34263,404.10213 31.97466,31.97466" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/hills.svg b/vtm-themes/resources/assets/patterns/hills.svg
new file mode 100644
index 00000000..055310cb
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/hills.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path d="m 362.98225,178.74951 c -18.3712,0.59518 -37.24028,3.30167 -53.875,11.21875 -11.25487,7.22101 -22.36174,14.50288 -33.40625,22.03125 -1.46855,1.05996 -6.63905,5.09345 -2.09375,3.0625 23.14953,-7.60492 43.81095,-22.25924 68.19266,-26.47693 20.60973,-5.15501 44.5539,-7.48552 63.05734,4.88318 12.34319,7.70967 22.99577,18.05648 36.3125,24.25 14.27752,7.77103 24.71792,24.76074 41.09375,26.75 -16.38702,-23.13213 -44.74653,-33.04697 -64.59013,-52.78497 -14.71539,-13.83429 -35.8556,-12.62913 -54.69112,-12.93378 z" id="path3656" fill="#999999"/>
+ <path d="m 196.70535,94.254447 c -39.22077,-0.83704 -81.18443,5.73512 -111.323742,32.742223 -17.84714,15.20614 -33.7635,33.63041 -55.27001,43.75778 -2.650844,3.00967 2.800086,3.75932 4.90625,3 9.019234,-2.2793 15.95483,-9.35158 24.07693,-13.84356 15.98596,-10.61568 29.67645,-23.9299 42.574182,-37.94328 13.17695,-9.53662 29.87141,-12.00889 45.2614,-16.37281 24.51897,-5.32234 49.90938,-8.779243 74.99374,-6.652853 17.9245,4.576333 29.12992,21.095083 44.84375,29.968753 15.17614,9.89258 31.52486,18.7369 45.25,30.25 1.11555,-1.9244 -0.91505,-5.53366 -1.15625,-7.84375 -3.15304,-7.06153 -11.43345,-9.86687 -17.1875,-14.53125 -15.56308,-9.47906 -31.54849,-18.77017 -44.28125,-31.8125 -7.39152,-7.118783 -17.21364,-11.069463 -27.5,-10.468753 -8.38657,-0.4434 -16.79286,-0.33168 -25.1875,-0.25 z" id="path3658" fill="#999999"/>
+ <path d="m 230.65504,246.00676 c -31.62382,2.61225 -64.4086,9.42287 -89.71169,29.65518 -17.03503,12.8395 -31.04208,29.79465 -50.069559,39.68857 -1.92089,2.78152 2.84221,7.28577 4.9375,3.78125 24.244999,-13.1651 41.551299,-35.81632 64.843749,-50.21875 22.74862,-11.9244 48.95265,-14.49799 74.09375,-17.625 17.57282,-0.89735 36.19959,4.8049 47.5625,18.71875 15.26441,12.85776 34.81496,19.83178 48.8125,34.1875 6.33889,5.2207 11.49959,13.49618 19.4375,15.4375 -0.53075,-5.86255 -6.28126,-9.81487 -9.53125,-14.34375 -14.02641,-15.2832 -32.85089,-24.47094 -49.75,-35.9375 -9.35849,-7.95098 -17.80511,-19.73683 -31.38058,-19.94438 -9.72254,-1.54075 -19.3656,-3.61775 -29.24442,-3.39937 z" id="path3660" fill="#999999"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/quarry.svg b/vtm-themes/resources/assets/patterns/quarry.svg
new file mode 100644
index 00000000..f2f4d134
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/quarry.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path d="m 162.09375,118.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path2845" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3720" d="m 213.09375,306.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 317.8125,219.03125 c -6.94506,1.66919 -15.66332,-1.75576 -21.21875,3.96875 -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" id="path3722" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 179.90625,216.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3724" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 353.8125,325.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" id="path3736" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3742" d="m 278.90625,291.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 110.84375,257.34375 c -5.18653,1.2232 -12.129845,-1.78199 -16.25,2.0625 1.142733,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" id="path3744" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3750" d="m 125.84375,403.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 81.09375,509.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3752" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 184.90625,492.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3754" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3758" d="M 86.8125,336.03125 C 79.86744,337.70044 71.14918,334.27549 65.59375,340 c -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3760" d="m 467.09375,281.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3762" d="m 46.812499,151.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3764" d="m 520.8125,504.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 496.90625,459.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3766" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3768" d="m 397.84375,514.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3770" d="m 407.8125,418.03125 c -6.94506,1.66919 -15.66332,-1.75576 -21.21875,3.96875 -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 284.09375,450.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3772" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 499.09375,133.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3774" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3776" d="m 456.90625,89.406249 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.843751 5.20747,2.21591 11.12585,-0.341641 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.437501 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3778" d="m 387.84375,174.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3780" d="m 241.8125,21.906249 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3782" d="m 270.90625,73.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 163.84375,50.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" id="path3784" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3786" d="m 553.84375,171.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/scrub.svg b/vtm-themes/resources/assets/patterns/scrub.svg
new file mode 100644
index 00000000..97222920
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/scrub.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path d="m 91.846983,454.74639 376.797227,0" id="path3752" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="12" stroke-opacity=".733"/>
+ <g id="g3779" transform="matrix(0.74835908,0,0,0.74835908,47.4084,40.634415)" stroke="#87b987" stroke-opacity=".733">
+  <path d="m 219.43574,376.07932 0.44048,-111.44093" id="path3781" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path d="m 285.43186,303.99208 -35.23824,72.23839" id="path3783" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path d="m 329.55523,332.03152 -43.16684,44.0478" id="path3785" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path id="path3787" d="m 159.34959,300.90874 30.39298,75.32173" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path id="path3789" d="m 110.82144,333.35295 42.72636,42.72637" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+ </g>
+ <g transform="matrix(0.74835908,0,0,0.74835908,247.4084,-55.36559)" id="g3791" stroke="#87b987" stroke-opacity=".733">
+  <path sodipodi:nodetypes="cc" id="path3793" d="m 219.43574,376.07932 0.44048,-111.44093" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" id="path3795" d="m 285.43186,303.99208 -35.23824,72.23839" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" id="path3797" d="m 329.55523,332.03152 -43.16684,44.0478" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" d="m 159.34959,300.90874 30.39298,75.32173" id="path3799" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" d="m 110.82144,333.35295 42.72636,42.72637" id="path3801" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+ </g>
+ <path id="path3803" d="m 346.41953,394.74639 169.65214,0" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="12" stroke-opacity=".733"/>
+</svg>
diff --git a/vtm-themes/resources/assets/patterns/swamp.svg b/vtm-themes/resources/assets/patterns/swamp.svg
new file mode 100644
index 00000000..92ea81d1
--- /dev/null
+++ b/vtm-themes/resources/assets/patterns/swamp.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path inkscape:connector-curvature="0" d="m 181.73921,194.70571 c -0.36208,-47.80432 1.03597,-56.4901 0.0356,-77.88187 -0.70547,-15.15612 -3.35673,-41.490921 0.14412,-39.682489 13.97763,7.21985 27.08725,184.465759 5.24773,184.465759 -7.57632,0 -9.08557,-18.58927 -5.43179,-66.9014 l 0.004,0 1e-5,0 z" id="path3683" sodipodi:nodetypes="csssccc" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="csssscccsssc" id="path3685" d="m 268.61521,245.51493 c 0,-8.85071 1.81377,-23.3155 7.5572,-39.2584 7.32509,-20.33329 22.5433,-25.46652 6.40886,-19.27518 -6.99753,2.68517 -18.97163,16.77542 -24.20646,31.79213 -11.82358,33.917 -9.98259,42.83363 1.34396,42.83363 4.89294,0 8.89626,-7.24146 8.89626,-16.09218 l 1.8e-4,0 z m -35.58505,-10.01745 c 0,-34.3596 8.12745,-55.66267 18.25122,-84.10944 10.42588,-29.29575 34.4997,-50.04067 11.69084,-31.16476 -33.48633,27.71221 -64.71212,141.38383 -38.83832,141.38383 4.89295,0 8.89626,-11.74929 8.89626,-26.10963 z" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" d="m 278.32812,317.3576 c -11.73052,0.48378 -23.69834,0.39217 -35.19543,2.76424 -2.88537,1.6697 -1.19132,6.25193 2.00331,6.17633 17.49808,4.03041 35.74826,2.75786 53.61207,2.74633 7.66155,-0.34655 15.65922,-0.50312 22.85408,-3.1995 2.85708,-1.90147 0.91299,-6.4662 -2.37491,-6.24875 -13.37358,-2.92705 -27.26954,-2.38486 -40.89912,-2.23865 z" id="path3687" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" d="m 101.122,245.51493 c 0,-8.85071 -1.813771,-23.3155 -7.557198,-39.2584 -7.32509,-20.33329 -22.543301,-25.46652 -6.408863,-19.27518 6.99753,2.68517 18.971631,16.77542 24.206461,31.79213 11.82357,33.917 9.98258,42.83363 -1.34396,42.83363 -4.89294,0 -8.89626,-7.24146 -8.89626,-16.09218 l -1.8e-4,0 z m 35.58505,-10.01745 c 0,-34.3596 -8.12745,-55.66267 -18.25122,-84.10944 -10.42588,-29.29575 -34.499697,-50.04067 -11.69084,-31.16476 33.48632,27.71221 64.71211,141.38383 38.83832,141.38383 -4.89295,0 -8.89626,-11.74929 -8.89626,-26.10963 z" id="path3689" sodipodi:nodetypes="csssscccsssc" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" d="m 223.76353,283.99202 c -28.7682,0.42228 -57.64822,0.51219 -86.31446,2.60851 -2.70507,0.43595 -4.05156,4.4494 -1.09012,5.58689 14.32727,3.21782 29.2919,2.53438 43.93539,3.29402 40.22877,0.85238 80.55721,1.25187 120.71225,-1.60044 2.83845,-0.56816 8.41438,-0.63035 7.80607,-4.71089 -1.96973,-3.87654 -7.56813,-2.5836 -11.0959,-3.34824 -24.59864,-1.90498 -49.29685,-1.88353 -73.95323,-1.82985 z" id="path3713" fill="#60b8ff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/alpinehut.svg b/vtm-themes/resources/assets/symbols/accommodation/alpinehut.svg
old mode 100755
new mode 100644
index d949def5..c6d92f51
--- a/vtm-themes/resources/assets/symbols/accommodation/alpinehut.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/alpinehut.svg
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 292.5262,455.65339 L 302.89454,540.80137 C 304.14266,550.0975 309.72218,555.51628 319.63318,557.05772 C 326.45137,557.99397 332.41627,556.06004 337.52792,551.25594 C 342.63911,546.45188 344.73145,540.64065 343.8049,533.82221 L 331.56409,437.07068 C 330.32503,429.94032 326.00325,425.62529 321.87774,419.87263 L 290.14433,375.62306 L 320.8271,322.17291 L 336.16139,341.69185 C 337.40003,343.55503 339.26302,344.94992 341.75038,345.87653 L 376.21612,362.61516 C 377.75733,363.23001 379.14748,363.53734 380.38661,363.5372 C 384.72702,363.53734 388.44828,361.83275 391.55043,358.42341 C 394.65198,355.01437 396.2029,351.13942 396.2032,346.79856 C 396.2029,339.05357 392.48164,333.94215 385.03936,331.46426 L 358.47484,316.59809 L 320.35898,270.56683 C 315.09133,264.37284 307.6535,260.50027 298.04553,258.94909 C 281.31618,256.47165 268.76696,262.35854 260.39777,276.60977 L 218.09726,349.59306 C 215.30739,354.24601 214.06854,359.97684 214.38069,366.78563 L 215.77087,459.28787 L 183.69795,528.08652 C 182.45904,530.87627 181.6883,533.19792 181.38573,535.0515 C 180.44945,540.94308 181.68594,546.13489 185.09519,550.62694 C 188.50433,555.11889 193.15474,557.83301 199.04641,558.76928 C 208.95713,560.3107 215.92681,556.90151 219.95553,548.54169 L 255.29108,473.23201 C 256.52978,470.44228 257.14922,467.5012 257.14934,464.40876 L 256.68123,407.22788 L 292.5262,455.65339 z M 317.11053,254.76443 C 325.47967,254.76469 332.76143,251.74323 338.95589,245.70003 C 345.14992,239.65738 348.24704,232.29994 348.24725,223.62772 C 348.24704,215.2587 345.14992,207.97457 338.95589,201.77529 C 332.76143,195.57664 325.47967,192.47717 317.11053,192.47684 C 308.42897,192.47717 301.06681,195.57664 295.02407,201.77529 C 288.98096,207.97457 285.9595,215.2587 285.95964,223.62772 C 285.9595,232.29994 288.98096,239.65738 295.02407,245.70003 C 301.06681,251.74323 308.42897,254.76469 317.11053,254.76443 L 317.11053,254.76443 z M 208.33779,339.83357 L 254.82297,259.88531 C 257.92469,254.61811 256.84187,250.5895 251.57453,247.79947 L 236.69415,238.96201 C 231.42659,235.8699 227.39797,236.95743 224.60829,242.22464 L 178.12313,322.17291 C 175.0307,327.44057 176.11822,331.46918 181.38573,334.25878 L 196.25192,343.08201 C 201.5193,346.18402 205.54793,345.10123 208.33779,339.83357 L 208.33779,339.83357 z" id="flowRoot3192" sodipodi:nodetypes="cccsccscccccsssccccccccccscccccccsscsssscccccccccccc" fill="#ffffff"/>
- <path d="M 378.7668,360.28972 L 378.7668,540.66063" id="path2770" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="12.867"/>
- <g id="g3548" transform="translate(0,-94)">
-  <path d="M 31.672085,267.24336 L 288.29972,130.37529 L 544.92735,267.24336 L 527.74447,284.74081 L 441.94873,250.13486 L 288.20798,231.63196 L 134.11608,249.86754 L 48.769323,284.35596 L 31.672085,267.24336 z" id="path7057" sodipodi:nodetypes="ccccccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.944"/>
-  <rect id="rect7061" width="31.996" height="308.13" x="456.8" y="266.58" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25.17" rx="0"/>
-  <rect y="266.58" x="84.8" height="308.13" width="31.996" id="rect3546" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25.17" rx="0"/>
- </g>
+ <path id="path4143" d="m 39.8,167 c -6.9,3.6 -8.1,12.7 -2.7,18 18.4,25.6 22,21.5 47,11.3 l 0,274 c 0,6.3 5.1,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.5,-5.2 11.5,-11.5 0,-105 -0.2,-177 -0.2,-295 l 8.1,-3.1 144,-17 144,17.2 5.8,2.4 c -0.6,98 -0.3,197 -0.3,296 0,6.4 5,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.3,-5.1 11.4,-11.5 l 0,-274 c 32,13.6 26.7,13.4 50,-10.6 5.3,-5.4 3.9,-14.4 -2.7,-18 L 295,36.8 c -3.4,-1.7 -7.5,-1.8 -10.75,0.1 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4145" d="m 316.9,254.7 c 17.2,-1.3 29.6,-14 29.8,-29.8 -1.4,-17 -14.3,-29.5 -29.8,-29.7 -17.3,1.3 -29.4,13.9 -29.6,29.7 1.3,17.5 13.7,29.6 29.6,29.8 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4147" d="m 185.5,318.4 c -2.9,5 -1.8,8.8 3.1,11.5 l 14,8.4 c 5,3 8.9,1.9 11.6,-3 l 44,-76 c 3,-5 2,-8.8 -3,-11.6 -6.4,-2.3 -10.2,-6.3 -19.4,-10 -2.6,0 -4.8,1.6 -6.35,4.75 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4149" d="m 223.5,345.2 c -2.5,4.4 -3.8,9.9 -3.5,16.4 l 1.4,89 -30.6,66 c -8.2,26.5 24.3,39 34.5,19.5 l 33.5,-71.8 c 1.2,-2.6 1.8,-5.5 1.8,-8.3 l -0.5,-54 34,46 10,81 c 10.4,23 42,15.6 39,-6.8 l -11.8,-93 c -1.2,-6.9 -5.3,-11 -9.1,-16.4 l -30,-42 29,-51 14.6,18.6 c 1.2,1.8 2.9,3 5.4,3.9 l 29,14.2 0,171 c 1.3,13.6 12.3,13 12.3,0 l 0,-170 c 14.2,-8.1 12.7,-25 -0.3,-29.8 L 357,313 321,269 c -5.1,-6 -12,-9.5 -24.4,-11.4 -16,-0.5 -26,5.3 -33.1,17.3 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 39.8,167 c -6.9,3.6 -8.1,12.7 -2.7,18 18.4,25.6 22,21.5 47,11.3 l 0,274 c 0,6.3 5.1,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.5,-5.2 11.5,-11.5 0,-105 -0.2,-177 -0.2,-295 l 8.1,-3.1 144,-17 144,17.2 5.8,2.4 c -0.6,98 -0.3,197 -0.3,296 0,6.4 5,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.3,-5.1 11.4,-11.5 l 0,-274 c 32,13.6 26.7,13.4 50,-10.6 5.3,-5.4 3.9,-14.4 -2.7,-18 L 295,36.8 c -3.4,-1.7 -7.5,-1.8 -10.75,0.1 z" id="path4140" fill="#0092da" fill-rule="evenodd"/>
+ <path d="m 316.9,254.7 c 17.2,-1.3 29.6,-14 29.8,-29.8 -1.4,-17 -14.3,-29.5 -29.8,-29.7 -17.3,1.3 -29.4,13.9 -29.6,29.7 1.3,17.5 13.7,29.6 29.6,29.8 z" id="path4138" fill="#0092da" fill-rule="evenodd"/>
+ <path d="m 185.5,318.4 c -2.9,5 -1.8,8.8 3.1,11.5 l 14,8.4 c 5,3 8.9,1.9 11.6,-3 l 44,-76 c 3,-5 2,-8.8 -3,-11.6 -6.4,-2.3 -10.2,-6.3 -19.4,-10 -2.6,0 -4.8,1.6 -6.35,4.75 z" id="path4136" fill="#0092da" fill-rule="evenodd"/>
+ <path d="m 223.5,345.2 c -2.5,4.4 -3.8,9.9 -3.5,16.4 l 1.4,89 -30.6,66 c -8.2,26.5 24.3,39 34.5,19.5 l 33.5,-71.8 c 1.2,-2.6 1.8,-5.5 1.8,-8.3 l -0.5,-54 34,46 10,81 c 10.4,23 42,15.6 39,-6.8 l -11.8,-93 c -1.2,-6.9 -5.3,-11 -9.1,-16.4 l -30,-42 29,-51 14.6,18.6 c 1.2,1.8 2.9,3 5.4,3.9 l 29,14.2 0,171 c 1.3,13.6 12.3,13 12.3,0 l 0,-170 c 14.2,-8.1 12.7,-25 -0.3,-29.8 L 357,313 321,269 c -5.1,-6 -12,-9.5 -24.4,-11.4 -16,-0.5 -26,5.3 -33.1,17.3 z" id="path4142" fill="#0092da" fill-rule="evenodd"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/camping.svg b/vtm-themes/resources/assets/symbols/accommodation/camping.svg
old mode 100755
new mode 100644
index d67767b7..ff9b2e1d
--- a/vtm-themes/resources/assets/symbols/accommodation/camping.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/camping.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 288.27197,138.47099 C 286.76224,146.8004 92.8253,507.19334 92.8253,507.19334 L 483.17348,506.5467 L 288.27197,138.47099 z" id="path2443" sodipodi:nodetypes="cccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
- <path sodipodi:nodetypes="csccc" id="path2383" d="M 288.27197,162.58083 C 287.53256,166.66023 275.50214,187.26222 301.10443,277.13002 C 327.77756,370.75661 399.37636,507.19334 399.37636,507.19334 L 483.17348,506.5467 L 288.27197,162.58083 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
- <path d="M 291.6525,162.58083 C 292.3919,166.66023 304.42233,187.26222 278.82004,277.13002 C 252.14691,370.75661 180.54811,507.19334 180.54811,507.19334 L 96.75099,506.5467 L 291.6525,162.58083 z" id="path3155" sodipodi:nodetypes="csccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
- <path sodipodi:nodetypes="ccc" id="path3157" d="M 249.69622,63.73048 L 483.17348,506.5467 L 249.69622,63.73048 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
- <path d="M 328.51443,66.14146 L 95.393229,506.5467 L 328.51443,66.14146 z" id="path3161" sodipodi:nodetypes="ccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.28"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4136" d="m 238,69.9 35.5,69.6 C 201.85647,277.57135 133.9648,402.34008 70.8,520 l 434.2,0 0,0 1,0 C 438.24843,393.7415 371.88254,266.72481 305,140 L 340,72 317,60 290,111 261,58 Z M 378,494 202,494 c 20,-40 66,-134 88,-208 22,73 67,167 88,208 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 238,69.9 35.5,69.6 C 201.85647,277.57135 133.9648,402.34008 70.8,520 l 434.2,0 0,0 1,0 C 438.24843,393.7415 371.88254,266.72481 305,140 L 340,72 317,60 290,111 261,58 Z M 378,494 202,494 c 20,-40 66,-134 88,-208 22,73 67,167 88,208 z" id="path2443" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#0092da" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/caravan_park.svg b/vtm-themes/resources/assets/symbols/accommodation/caravan_park.svg
old mode 100755
new mode 100644
index 7b0398e3..2b3c2001
--- a/vtm-themes/resources/assets/symbols/accommodation/caravan_park.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/caravan_park.svg
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path transform="matrix(14.685839,0,0,14.685839,565.76584,1146.0639)" d="M -8.7426758,-60.988525 C -8.7427061,-60.215399 -9.115834,-59.828844 -9.8620605,-59.828857 L -13.822021,-59.828857 C -14.569116,-59.828844 -14.942651,-60.215399 -14.942627,-60.988525 L -14.942627,-62.868408 C -14.942651,-63.615461 -14.569116,-63.988996 -13.822021,-63.989014 L -9.8620605,-63.989014 C -9.115834,-63.988996 -8.7427061,-63.615461 -8.7426758,-62.868408 L -8.7426758,-60.988525 z M -20.021973,-60.948242 C -20.021992,-60.201972 -20.408954,-59.828844 -21.182861,-59.828857 L -29.742432,-59.828857 C -30.489511,-59.828844 -30.863045,-60.201972 -30.863037,-60.948242 L -30.863037,-62.868408 C -30.863045,-63.615461 -30.489511,-63.988996 -29.742432,-63.989014 L -21.182861,-63.989014 C -20.408954,-63.988996 -20.021992,-63.615461 -20.021973,-62.868408 L -20.021973,-60.948242 z M -2.4621582,-51.947998 L -5.3430176,-51.947998 L -5.3430176,-61.947998 C -5.3430513,-63.495018 -5.8830084,-64.80178 -6.9628906,-65.868286 C -8.042837,-66.934753 -9.3428845,-67.467996 -10.863037,-67.468018 L -29.58252,-67.468018 C -31.129565,-67.467996 -32.436327,-66.934753 -33.502808,-65.868286 C -34.5693,-64.80178 -35.102543,-63.495018 -35.102539,-61.947998 L -35.102539,-54.86792 C -35.102543,-53.748121 -34.70256,-52.788242 -33.902588,-51.988281 C -33.102626,-51.188309 -32.142748,-50.788325 -31.022949,-50.78833 L -24.58252,-50.78833 C -24.502781,-51.934971 -24.049494,-52.908278 -23.222656,-53.708252 C -22.39585,-54.508211 -21.395688,-54.908194 -20.222168,-54.908203 C -19.075541,-54.908194 -18.082296,-54.508211 -17.242432,-53.708252 C -16.402611,-52.908278 -15.955834,-51.948399 -15.9021,-50.828613 L -1.3427734,-50.828613 C -1.3428112,-51.574864 -1.715939,-51.947992 -2.4621582,-51.947998 L -2.4621582,-51.947998 z M -20.222168,-49.148926 C -20.595722,-49.148923 -20.915749,-49.282183 -21.182251,-49.548706 C -21.448789,-49.815223 -21.582049,-50.13525 -21.582031,-50.508789 C -21.582049,-50.908361 -21.448789,-51.234899 -21.182251,-51.488403 C -20.915749,-51.741897 -20.595722,-51.868647 -20.222168,-51.868652 C -19.849466,-51.868647 -19.529642,-51.741897 -19.262695,-51.488403 C -18.995788,-51.234899 -18.862325,-50.908361 -18.862305,-50.508789 C -18.862325,-50.13525 -18.995788,-49.815223 -19.262695,-49.548706 C -19.529642,-49.282183 -19.849466,-49.148923 -20.222168,-49.148926 L -20.222168,-49.148926 z M -20.222168,-53.667969 C -21.10272,-53.667961 -21.849586,-53.361362 -22.462769,-52.748169 C -23.075984,-52.134963 -23.382584,-51.388504 -23.382568,-50.508789 C -23.382584,-49.655107 -23.075984,-48.921669 -22.462769,-48.308472 C -21.849586,-47.69527 -21.10272,-47.388671 -20.222168,-47.388672 C -19.369323,-47.388671 -18.636088,-47.69527 -18.022461,-48.308472 C -17.408876,-48.921669 -17.102073,-49.655107 -17.102051,-50.508789 C -17.102073,-51.388504 -17.408876,-52.134963 -18.022461,-52.748169 C -18.636088,-53.361362 -19.369323,-53.667961 -20.222168,-53.667969 L -20.222168,-53.667969 z" id="flowRoot3192" fill="#ffffff"/>
+ <path id="path4154" d="m 437.37231,250.39628 c -4.5e-4,11.35401 -5.48014,17.03089 -16.43911,17.0307 l -58.15534,0 c -10.97172,1.9e-4 -16.45739,-5.67669 -16.45704,-17.0307 l 0,-27.60765 c -3.5e-4,-10.9711 5.48532,-16.45678 16.45704,-16.45704 l 58.15534,0 c 10.95897,2.6e-4 16.43866,5.48594 16.43911,16.45704 l 0,27.60765 z m -165.64595,0.59155 c -2.7e-4,10.9596 -5.68314,16.4393 -17.04861,16.43911 l -125.70448,0 c -10.97148,1.9e-4 -16.45714,-5.47951 -16.45702,-16.43911 l 0,-28.19925 c -1.2e-4,-10.9711 5.48554,-16.45677 16.45702,-16.45704 l 125.70448,0 c 11.36547,2.7e-4 17.04834,5.48594 17.04861,16.45704 l 0,28.19925 z m 257.88062,132.17613 -42.30784,0 0,-146.85839 c -4.9e-4,-22.71928 -7.93022,-41.91018 -23.78919,-57.57271 -15.85992,-15.66197 -34.95221,-23.49309 -57.27693,-23.49341 l -274.91131,0 c -22.71965,3.2e-4 -41.910547,7.83144 -57.572716,23.49341 -15.662329,15.66253 -23.49345,34.85343 -23.493391,57.57271 l 0,103.97689 c -5.9e-5,16.44518 5.874027,30.54181 17.622287,42.28991 11.748113,11.74826 25.844727,17.62236 42.28991,17.62229 l 94.58311,0 c 1.17104,-16.83939 7.82793,-31.13322 19.97074,-42.88151 12.14234,-11.74806 26.83056,-17.62215 44.06468,-17.62228 16.83918,1.3e-4 31.42582,5.87422 43.75993,17.62228 12.33347,11.74829 18.89477,25.84492 19.6839,42.28992 l 213.81592,0 c -5.5e-4,-10.95932 -5.48025,-16.43902 -16.4391,-16.43911 l 0,0 z m -260.82065,41.10672 c -5.48595,5e-5 -10.18582,-1.95699 -14.09962,-5.8711 -3.91434,-3.91403 -5.87137,-8.61389 -5.87111,-14.09963 -2.6e-4,-5.86805 1.95677,-10.66353 5.87111,-14.38645 3.9138,-3.72277 8.61367,-5.5842 14.09962,-5.58428 5.47344,8e-5 10.17033,1.86151 14.09067,5.58428 3.91975,3.72292 5.87977,8.5184 5.88006,14.38645 -2.9e-4,5.48574 -1.96031,10.1856 -5.88006,14.09963 -3.92034,3.91411 -8.61723,5.87115 -14.09067,5.8711 l 0,0 z m 0,-66.36594 c -12.93164,1.2e-4 -23.9,4.50279 -32.9051,13.50804 -9.00558,9.00544 -13.50826,19.96782 -13.50802,32.88717 -2.4e-4,12.53704 4.50244,23.30819 13.50802,32.3135 9.0051,9.00539 19.97346,13.50805 32.9051,13.50804 12.52475,1e-5 23.29292,-4.50265 32.30455,-13.50804 9.01101,-9.00531 13.51667,-19.77646 13.51699,-32.3135 -3.2e-4,-12.91935 -4.50598,-23.88173 -13.51699,-32.88717 -9.01163,-9.00525 -19.7798,-13.50792 -32.30455,-13.50804 l 0,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 437.37231,250.39628 c -4.5e-4,11.35401 -5.48014,17.03089 -16.43911,17.0307 l -58.15534,0 c -10.97172,1.9e-4 -16.45739,-5.67669 -16.45704,-17.0307 l 0,-27.60765 c -3.5e-4,-10.9711 5.48532,-16.45678 16.45704,-16.45704 l 58.15534,0 c 10.95897,2.6e-4 16.43866,5.48594 16.43911,16.45704 l 0,27.60765 z m -165.64595,0.59155 c -2.7e-4,10.9596 -5.68314,16.4393 -17.04861,16.43911 l -125.70448,0 c -10.97148,1.9e-4 -16.45714,-5.47951 -16.45702,-16.43911 l 0,-28.19925 c -1.2e-4,-10.9711 5.48554,-16.45677 16.45702,-16.45704 l 125.70448,0 c 11.36547,2.7e-4 17.04834,5.48594 17.04861,16.45704 l 0,28.19925 z m 257.88062,132.17613 -42.30784,0 0,-146.85839 c -4.9e-4,-22.71928 -7.93022,-41.91018 -23.78919,-57.57271 -15.85992,-15.66197 -34.95221,-23.49309 -57.27693,-23.49341 l -274.91131,0 c -22.71965,3.2e-4 -41.910547,7.83144 -57.572716,23.49341 -15.662329,15.66253 -23.49345,34.85343 -23.493391,57.57271 l 0,103.97689 c -5.9e-5,16.44518 5.874027,30.54181 17.622287,42.28991 11.748113,11.74826 25.844727,17.62236 42.28991,17.62229 l 94.58311,0 c 1.17104,-16.83939 7.82793,-31.13322 19.97074,-42.88151 12.14234,-11.74806 26.83056,-17.62215 44.06468,-17.62228 16.83918,1.3e-4 31.42582,5.87422 43.75993,17.62228 12.33347,11.74829 18.89477,25.84492 19.6839,42.28992 l 213.81592,0 c -5.5e-4,-10.95932 -5.48025,-16.43902 -16.4391,-16.43911 l 0,0 z m -260.82065,41.10672 c -5.48595,5e-5 -10.18582,-1.95699 -14.09962,-5.8711 -3.91434,-3.91403 -5.87137,-8.61389 -5.87111,-14.09963 -2.6e-4,-5.86805 1.95677,-10.66353 5.87111,-14.38645 3.9138,-3.72277 8.61367,-5.5842 14.09962,-5.58428 5.47344,8e-5 10.17033,1.86151 14.09067,5.58428 3.91975,3.72292 5.87977,8.5184 5.88006,14.38645 -2.9e-4,5.48574 -1.96031,10.1856 -5.88006,14.09963 -3.92034,3.91411 -8.61723,5.87115 -14.09067,5.8711 l 0,0 z m 0,-66.36594 c -12.93164,1.2e-4 -23.9,4.50279 -32.9051,13.50804 -9.00558,9.00544 -13.50826,19.96782 -13.50802,32.88717 -2.4e-4,12.53704 4.50244,23.30819 13.50802,32.3135 9.0051,9.00539 19.97346,13.50805 32.9051,13.50804 12.52475,1e-5 23.29292,-4.50265 32.30455,-13.50804 9.01101,-9.00531 13.51667,-19.77646 13.51699,-32.3135 -3.2e-4,-12.91935 -4.50598,-23.88173 -13.51699,-32.88717 -9.01163,-9.00525 -19.7798,-13.50792 -32.30455,-13.50804 l 0,0 z" id="flowRoot3192" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/chalet.svg b/vtm-themes/resources/assets/symbols/accommodation/chalet.svg
old mode 100755
new mode 100644
index 94ea0318..0d17e535
--- a/vtm-themes/resources/assets/symbols/accommodation/chalet.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/chalet.svg
@@ -9,16 +9,13 @@
    <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
   </symbol>
  </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
+ <g id="g8101">
+  <path id="path8105" d="M 184.57,66.176 22.128,206.55 l 32.488,0 0,210.57 97.464,0 0,-107.01 67.21,0 0,107.01 95.24,0 0,-210.57 32.48,0 -162.44,-140.374 0,0 0,0 z m 215.05,114.724 -7.38,15.7 -5.95,12.61 C 365.63,253 344.9,296.77 324.13,340.5 c -9.95,-13.67 -19.9,-27.32 -29.95,-40.92 l -7.18,-9.75 -6.36,10.26 C 241.5,362.73 202.75,425.6 163.4,488 l -7.79,12.41 14.67,0.1 c 122.88,1.05 245.76,2.02 368.63,3.08 l 13.13,0.1 -5.64,-11.79 C 500.09,393.37 453.52,295 407.01,196.6 l -7.39,-15.7 z m 0,138.99 c 2.49,0 4.94,1.21 6.46,3.18 7.34,9.24 14.49,16.8 17.34,17.95 1.42,0.57 1.08,0.66 2.56,-0.31 1.49,-0.97 4.49,-4.12 7.8,-10.57 1.39,-2.68 4.36,-4.45 7.38,-4.41 3.03,0 5.97,1.9 7.29,4.62 l 66.87,141.55 c 2.44,5.01 -1.92,11.87 -7.49,11.79 l -302.17,-2.56 c -2.88,-0 -5.69,-1.68 -7.08,-4.21 -1.38,-2.53 -1.3,-5.85 0.21,-8.31 l 59.49,-95.49 c 2.58,-4.16 9.22,-4.97 12.72,-1.54 5.3,5.26 9.89,8.04 15.38,8.41 5.5,0.37 13.19,-1.68 24.52,-10.05 3.47,-2.62 9.04,-1.78 11.59,1.75 l 5.23,7.18 21.54,-45.55 c 1.26,-2.75 4.15,-4.71 7.18,-4.82 3.03,-0.1 6.04,1.65 7.49,4.31 2.13,3.87 4.25,6.03 5.84,6.98 1.6,0.95 2.62,1.12 4.52,0.71 3.78,-0.8 11.09,-5.99 18.67,-17.02 1.47,-2.17 4.04,-3.55 6.66,-3.59 z" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-width="40"/>
  </g>
- <g id="g3757" transform="matrix(3.2822464,0,0,3.2822464,-751.11276,-1010.2429)" opacity=".5">
-  <path id="path3734" d="m 348.78208,372.60284 c -6.88742,14.60266 -13.78726,29.19945 -20.71875,43.78125 -3.83966,-5.29946 -7.70451,-10.58057 -11.59375,-15.84375 -11.91853,19.07569 -23.7213,38.22363 -35.71875,57.25 37.43746,0.31752 74.87509,0.61481 112.3125,0.9375 -14.10629,-30.01312 -28.29628,-59.98684 -42.46875,-89.96875 -0.60417,1.28125 -1.20833,2.5625 -1.8125,3.84375 z" fill="none" stroke="#ffffff" stroke-width="5"/>
-  <path id="path3744" d="m 350.59375,362.90625 -2.25,4.78125 -1.8125,3.84375 c -6.29252,13.34135 -12.61036,26.67706 -18.9375,40 -3.0311,-4.16567 -6.06341,-8.3256 -9.125,-12.46875 l -2.1875,-2.96875 -1.9375,3.125 c -11.92389,19.08426 -23.73037,38.23802 -35.71875,57.25 l -2.375,3.78125 4.46875,0.0312 c 37.43836,0.31753 74.87622,0.61482 112.3125,0.9375 l 4,0.0312 -1.71875,-3.59375 C 381.20423,427.63902 367.0158,397.66853 352.84375,367.6875 l -2.25,-4.78125 z m 0,42.34375 c 0.75716,0.002 1.50495,0.37027 1.96875,0.96875 2.23609,2.81658 4.41247,5.11927 5.28125,5.46875 0.43439,0.17479 0.32832,0.20284 0.78125,-0.0937 0.45293,-0.29659 1.36745,-1.25512 2.375,-3.21875 0.42481,-0.81769 1.32863,-1.35665 2.25,-1.34375 0.92136,0.0129 1.81697,0.577 2.21875,1.40625 l 20.375,43.125 c 0.74253,1.52641 -0.58397,3.61605 -2.28125,3.59375 L 291.5,454.375 c -0.87906,-0.0121 -1.73306,-0.51067 -2.15625,-1.28125 -0.42315,-0.77058 -0.399,-1.78298 0.0625,-2.53125 l 18.125,-29.09375 c 0.7864,-1.26885 2.80873,-1.51348 3.875,-0.46875 1.6156,1.60179 3.01438,2.44959 4.6875,2.5625 1.67312,0.11291 4.01716,-0.51385 7.46875,-3.0625 1.05857,-0.79816 2.75437,-0.54304 3.53125,0.53125 l 1.59375,2.1875 6.5625,-13.875 c 0.3838,-0.83866 1.26576,-1.43655 2.1875,-1.46875 0.92174,-0.0322 1.83981,0.5027 2.28125,1.3125 0.64944,1.17852 1.29638,1.8353 1.78125,2.125 0.48487,0.28965 0.79816,0.34143 1.375,0.21875 1.15368,-0.24536 3.37836,-1.82644 5.6875,-5.1875 0.44955,-0.66088 1.23205,-1.08225 2.03125,-1.09375 z" color="#000000" stroke-width="5" fill="#ffffff"/>
- </g>
- <path d="M 184.57113,66.176498 22.127529,206.5523 l 32.488502,0 0,210.56359 97.466389,0 0,-107.00635 67.20514,0 2.2e-4,107.00635 95.23845,0 0,-210.56359 32.4887,0 -162.4438,-140.375802 0,0 0,0 z" id="path645" sodipodi:nodetypes="ccccccccccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width=".852"/>
- <g transform="matrix(3.2822464,0,0,3.2822464,-751.11276,-1010.2429)" id="g5238" opacity=".25">
-  <path d="m 348.78208,372.60284 c -6.88742,14.60266 -13.78726,29.19945 -20.71875,43.78125 -3.83966,-5.29946 -7.70451,-10.58057 -11.59375,-15.84375 -11.91853,19.07569 -23.7213,38.22363 -35.71875,57.25 37.43746,0.31752 74.87509,0.61481 112.3125,0.9375 -14.10629,-30.01312 -28.29628,-59.98684 -42.46875,-89.96875 -0.60417,1.28125 -1.20833,2.5625 -1.8125,3.84375 z" id="path5240" fill="none" stroke="#ffffff" stroke-width="5"/>
-  <path d="m 350.59375,362.90625 -2.25,4.78125 -1.8125,3.84375 c -6.29252,13.34135 -12.61036,26.67706 -18.9375,40 -3.0311,-4.16567 -6.06341,-8.3256 -9.125,-12.46875 l -2.1875,-2.96875 -1.9375,3.125 c -11.92389,19.08426 -23.73037,38.23802 -35.71875,57.25 l -2.375,3.78125 4.46875,0.0312 c 37.43836,0.31753 74.87622,0.61482 112.3125,0.9375 l 4,0.0312 -1.71875,-3.59375 C 381.20423,427.63902 367.0158,397.66853 352.84375,367.6875 l -2.25,-4.78125 z" id="path5242" sodipodi:nodetypes="ccccccccccccccc" color="#000000" stroke-width="5" fill="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path5240-1" d="m 393.67597,212.73143 c -22.60621,47.92953 -45.25319,95.83979 -68.00405,143.70085 -12.60271,-17.39413 -25.2881,-34.72804 -38.05354,-52.00309 -39.11955,62.61111 -77.85915,125.45937 -117.23774,187.90861 122.87897,1.04217 245.7585,2.01795 368.6373,3.0771 -46.30032,-98.51045 -92.87536,-196.89159 -139.3929,-295.2996 -1.98304,4.20537 -3.96604,8.41075 -5.94907,12.61613 z" fill="#ffffff"/>
+ <path inkscape:connector-curvature="0" id="path5240" d="m 393.67597,212.73143 c -22.60621,47.92953 -45.25319,95.83979 -68.00405,143.70085 -12.60271,-17.39413 -25.2881,-34.72804 -38.05354,-52.00309 -39.11955,62.61111 -77.85915,125.45937 -117.23774,187.90861 122.87897,1.04217 245.7585,2.01795 368.6373,3.0771 -46.30032,-98.51045 -92.87536,-196.89159 -139.3929,-295.2996 -1.98304,4.20537 -3.96604,8.41075 -5.94907,12.61613 z" opacity="0.25" fill="#0092da" stroke="#0092da"/>
+ <g id="g8092">
+  <path fill="#0092da" stroke-width="5" color="#000000" opacity="0.5" id="path3744" d="m 399.62231,180.90483 -7.38505,15.69324 -5.94907,12.61614 c -20.6536,43.7896 -41.39031,87.56068 -62.15754,131.28985 -9.94882,-13.67275 -19.90161,-27.32667 -29.9505,-40.92551 l -7.17992,-9.74416 -6.35935,10.25702 c -39.13714,62.63924 -77.88892,125.5066 -117.23774,187.9086 l -7.79533,12.411 14.66754,0.1024 c 122.88192,1.04221 245.7622,2.01799 368.6373,3.07711 l 13.12898,0.1024 -5.64136,-11.79557 C 500.09345,393.37373 453.52353,295.0032 407.00737,196.59807 l -7.38506,-15.69324 z m 0,138.98262 c 2.48519,0.007 4.93962,1.21532 6.46193,3.17968 7.33939,9.24471 14.48281,16.80271 17.33436,17.94978 1.42578,0.57371 1.07763,0.66578 2.56426,-0.30754 1.48662,-0.97348 4.4883,-4.11961 7.79533,-10.56473 1.39433,-2.68386 4.36089,-4.45286 7.38505,-4.41052 3.02414,0.0423 5.96375,1.89386 7.28249,4.61566 l 66.87577,141.54687 c 2.43717,5.01006 -1.91673,11.86877 -7.48763,11.79558 l -302.1718,-2.56442 c -2.8853,-0.0397 -5.68833,-1.67615 -7.07735,-4.20538 -1.38888,-2.52923 -1.30961,-5.85218 0.20514,-8.30819 l 59.49072,-95.49285 c 2.58116,-4.16468 9.21894,-4.96762 12.7187,-1.53856 5.3028,5.25747 9.89394,8.04016 15.38553,8.41076 5.4916,0.3706 13.18531,-1.68658 24.51428,-10.05188 3.47449,-2.61976 9.04052,-1.78239 11.59043,1.74369 l 5.23108,7.17992 21.53975,-45.54117 c 1.25972,-2.75269 4.15453,-4.71511 7.17991,-4.8208 3.02538,-0.10569 6.03871,1.64999 7.48762,4.30795 2.13163,3.86819 4.25504,6.02391 5.84651,6.97477 1.59146,0.95071 2.61975,1.12066 4.51308,0.71799 3.78667,-0.80533 11.08861,-5.99482 18.66778,-17.02665 1.47553,-2.16917 4.04389,-3.55221 6.66706,-3.58996 z" inkscape:connector-curvature="0"/>
+  <path stroke-width="0.852" fill-rule="evenodd" fill="#0092da" sodipodi:nodetypes="ccccccccccccc" id="path645" d="M 184.57113,66.176498 22.127529,206.5523 l 32.488502,0 0,210.56359 97.466389,0 0,-107.00635 67.20514,0 2.2e-4,107.00635 95.23845,0 0,-210.56359 32.4887,0 -162.4438,-140.375802 0,0 0,0 z"/>
  </g>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/hostel.svg b/vtm-themes/resources/assets/symbols/accommodation/hostel.svg
old mode 100755
new mode 100644
index de705f15..fafe4c84
--- a/vtm-themes/resources/assets/symbols/accommodation/hostel.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/hostel.svg
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 47.545774,43.393944 44.346778,538.12088" id="path2157" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
- <path d="m 50.744772,485.34997 479.849548,3.19899" id="path2159" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="35.829"/>
- <path d="m 533.79332,528.52389 3.19899,-384.4845" id="path2161" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
- <rect id="rect2163" width="207.97" height="38.605" x="237.13" y="393.63" fill="#ffffff" stroke="#ffffff" stroke-width="34.702" rx="19.303"/>
- <path sodipodi:type="arc" id="path2167" sodipodi:cx="7.7678571" sodipodi:cy="16.017857" sodipodi:rx="1.5178572" sodipodi:ry="1.3392857" d="m 9.2857143,16.017857 a 1.5178572,1.3392857 0 1 1 -3.0357144,0 1.5178572,1.3392857 0 1 1 3.0357144,0 z" transform="matrix(18.921389,0,0,19.889185,29.572525,29.582841)" fill="#ffffff" stroke="#ffffff" stroke-width="2.3"/>
- <rect id="rect2169" width="80.29" height="6.894" x="119.98" y="423.96" fill="#ffffff" stroke="#ffffff" stroke-width="30.18" rx="3.447"/>
- <path d="m 55.503588,249.65197 479.849542,3.19899" id="path2159-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="35.829"/>
- <rect id="rect2163-5" width="207.97" height="38.605" x="241.67" y="159.19" fill="#ffffff" stroke="#ffffff" stroke-width="34.702" rx="19.303"/>
- <path sodipodi:type="arc" id="path2167-9" sodipodi:cx="7.7678571" sodipodi:cy="16.017857" sodipodi:rx="1.5178572" sodipodi:ry="1.3392857" d="m 9.2857143,16.017857 a 1.5178572,1.3392857 0 1 1 -3.0357144,0 1.5178572,1.3392857 0 1 1 3.0357144,0 z" transform="matrix(18.921389,0,0,19.889185,34.117797,-204.86148)" fill="#ffffff" stroke="#ffffff" stroke-width="2.3"/>
- <rect id="rect2169-6" width="80.29" height="6.894" x="124.52" y="189.52" fill="#ffffff" stroke="#ffffff" stroke-width="30.18" rx="3.447"/>
+ <path id="path4151" d="M 56.699219 35 C 38.699219 35.5 38.8 55 39.5 68 C 38.7 223 37.000781 377 36.800781 531 C 41.000781 555 73.000781 543 70.800781 522 L 71 494 L 506 497 C 507 511 502 531 519 535 C 538 539 542 518 540 504 C 541 385 543 266 543 147 C 539 123 503 134 509 156 L 508 237 L 73 234 C 73 172 74 111 74 49 C 72.8 41 64.899219 34.8 56.699219 35 z M 72 267 L 508 269 L 506 461 L 71 459 L 72 267 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4153" d="m 143,144 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67.1 C 149,73 125,114 143,144 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4155" d="m 235,204 c 16,19 42,11 63,13 44,-1 89,1 133,-1 28,-4 34,-62 -3,-66 -55.66676,-0.3014 -111.33294,-3 -167,-3 -28,0 -45,37 -26,57 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4157" d="m 134,178 c -26,-1 -20,41 4,35 l 69,0 c 23,-5 15,-36 6,-36 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4159" d="m 138,368 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67 -34,0 -58,41 -40,71 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4161" d="m 256,444 c 44,0 127,0 171,-2 46,-7 37,-68 -6,-69 l -163,0 c -53,8 -37,69 -2,71 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4163" d="m 130,404 c -22,-1 -23,36 5,35 23,0 46,1 69,0 23,-5 16,-36 -7,-35 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 56.699219 35 C 38.699219 35.5 38.8 55 39.5 68 C 38.7 223 37.000781 377 36.800781 531 C 41.000781 555 73.000781 543 70.800781 522 L 71 494 L 506 497 C 507 511 502 531 519 535 C 538 539 542 518 540 504 C 541 385 543 266 543 147 C 539 123 503 134 509 156 L 508 237 L 73 234 C 73 172 74 111 74 49 C 72.8 41 64.899219 34.8 56.699219 35 z M 72 267 L 508 269 L 506 461 L 71 459 L 72 267 z " id="path4148" fill="#0092da"/>
+ <path d="m 143,144 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67.1 C 149,73 125,114 143,144 Z" id="path4146" fill="#0092da"/>
+ <path d="m 235,204 c 16,19 42,11 63,13 44,-1 89,1 133,-1 28,-4 34,-62 -3,-66 -55.66676,-0.3014 -111.33294,-3 -167,-3 -28,0 -45,37 -26,57 z" id="path4144" fill="#0092da"/>
+ <path d="m 134,178 c -26,-1 -20,41 4,35 l 69,0 c 23,-5 15,-36 6,-36 z" id="path4142" fill="#0092da"/>
+ <path d="m 138,368 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67 -34,0 -58,41 -40,71 z" id="path4138" fill="#0092da"/>
+ <path d="m 256,444 c 44,0 127,0 171,-2 46,-7 37,-68 -6,-69 l -163,0 c -53,8 -37,69 -2,71 z" id="path4136" fill="#0092da"/>
+ <path d="m 130,404 c -22,-1 -23,36 5,35 23,0 46,1 69,0 23,-5 16,-36 -7,-35 z" id="path4189" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/hotel2.svg b/vtm-themes/resources/assets/symbols/accommodation/hotel2.svg
old mode 100755
new mode 100644
index 15dd12c4..4b08130d
--- a/vtm-themes/resources/assets/symbols/accommodation/hotel2.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/hotel2.svg
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 47.545774,192.59912 L 44.346778,442.12088" id="path2157" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
- <path d="M 50.744772,349.34997 L 530.59432,352.54896" id="path2159" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="35.829"/>
- <path d="M 533.79332,432.52389 L 536.99231,269.37504" id="path2161" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="35.829"/>
- <rect id="rect2163" width="252.72" height="44.786" x="233.09" y="258.18" fill="#ffffff" stroke="#ffffff" stroke-width="41.2" rx="22.393"/>
- <path sodipodi:type="arc" id="path2167" sodipodi:cx="7.7678571" sodipodi:cy="16.017857" sodipodi:rx="1.5178572" sodipodi:ry="1.3392857" d="M 9.2857143,16.017857 A 1.5178572,1.3392857 0 1 1 6.2499999,16.017857 A 1.5178572,1.3392857 0 1 1 9.2857143,16.017857 z" transform="matrix(22.993274,0,0,23.073314,-16.698545,-171.11131)" fill="#ffffff" stroke="#ffffff" stroke-width="2.3"/>
- <rect id="rect2169" width="97.57" height="7.997" x="90.73" y="293.37" fill="#ffffff" stroke="#ffffff" stroke-width="35.829" rx="3.999"/>
+ <path id="path4142" d="M 167,138.19922 C 136.5,137.69922 109,160.6 109,192 c 0,31.4 28,55 58,55 30.5,0 58,-22.9 58,-54 0,-31.4 -28,-54.00078 -58,-54.80078 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4144" d="m 58.199219,171.59961 c -9.4,0.5 -17,8.10039 -17,16.90039 L 37.900391,426 c -0.3,9.5 7.30039,17.4 16.90039,17.5 9.5,0.1 17.398828,-7.6 17.298828,-17 l 1,-71 434.000001,2.90039 L 506,417.30078 c -0.3,9.5 7.20078,17.39961 16.80078,17.59961 9.5,0.2 17.4,-7.4 17.5,-17 l 3.09961,-155 c 0.3,-9.6 -7.4,-17.59961 -17,-17.59961 -9.5,0 -17.00117,7.6 -17.20117,17 L 508,325.19922 74,322.30078 l 1.699219,-132 c 0.285904,-11.70664 -8.981794,-19.13181 -17.5,-18.70117 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4146" d="m 257,231 c -22.5,0 -41,18.6 -41,41 0,22.4 18.6,41 41,41 l 199,0 c 22.5,0 41,-18.6 41,-41 0,-22.4 -18.6,-41 -41,-41 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4148" d="m 103,266.30078 c -11.3,0 -20.900391,9.49883 -20.900391,20.79883 C 82.099609,298.39961 91.7,308 103,308 l 86,0 c 11.3,0 20.90039,-9.50078 20.90039,-20.80078 0,-11.3 -9.60039,-20.89844 -20.90039,-20.89844 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 167,138.19922 C 136.5,137.69922 109,160.6 109,192 c 0,31.4 28,55 58,55 30.5,0 58,-22.9 58,-54 0,-31.4 -28,-54.00078 -58,-54.80078 z" id="path4140" fill="#0092da"/>
+ <path d="m 58.199219,171.59961 c -9.4,0.5 -17,8.10039 -17,16.90039 L 37.900391,426 c -0.3,9.5 7.30039,17.4 16.90039,17.5 9.5,0.1 17.398828,-7.6 17.298828,-17 l 1,-71 434.000001,2.90039 L 506,417.30078 c -0.3,9.5 7.20078,17.39961 16.80078,17.59961 9.5,0.2 17.4,-7.4 17.5,-17 l 3.09961,-155 c 0.3,-9.6 -7.4,-17.59961 -17,-17.59961 -9.5,0 -17.00117,7.6 -17.20117,17 L 508,325.19922 74,322.30078 l 1.699219,-132 c 0.285904,-11.70664 -8.981794,-19.13181 -17.5,-18.70117 z" id="path4138" fill="#0092da"/>
+ <path d="m 257,231 c -22.5,0 -41,18.6 -41,41 0,22.4 18.6,41 41,41 l 199,0 c 22.5,0 41,-18.6 41,-41 0,-22.4 -18.6,-41 -41,-41 z" id="path4136" fill="#0092da"/>
+ <path d="m 103,266.30078 c -11.3,0 -20.900391,9.49883 -20.900391,20.79883 C 82.099609,298.39961 91.7,308 103,308 l 86,0 c 11.3,0 20.90039,-9.50078 20.90039,-20.80078 0,-11.3 -9.60039,-20.89844 -20.90039,-20.89844 z" id="path4151" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/accommodation/shelter2.svg b/vtm-themes/resources/assets/symbols/accommodation/shelter2.svg
old mode 100755
new mode 100644
index 7e133eaf..fc27d1ce
--- a/vtm-themes/resources/assets/symbols/accommodation/shelter2.svg
+++ b/vtm-themes/resources/assets/symbols/accommodation/shelter2.svg
@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path sodipodi:nodetypes="cc" id="path15803" d="M 134.69281,73.992992 L 55.840019,152.84578" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15805" d="M 241.42628,44.008171 L 162.5735,122.86096" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15807" d="M 114.62614,184.10203 L 52.744667,245.98349" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15809" d="M 275.86078,105.04094 L 197.008,183.89373" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15813" d="M 456.75653,87.944376 L 377.90375,166.79717" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15815" d="M 546.20521,80.62071 L 487.85946,136.84506" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15819" d="M 548.32665,157.79575 L 487.85944,216.84866" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15821" d="M 446.74834,185.50249 L 419.51667,210.61275" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15823" d="M 353.96491,119.46757 L 314.71189,157.30632" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <path sodipodi:nodetypes="cc" id="path15825" d="M 370.55596,33.1566 L 324.23155,80.89529" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="19.2"/>
- <g id="g5417" transform="matrix(0.8724801,0,0,0.8724801,43.27383,78.888966)">
-  <path d="M 48.288912,272.40193 L 288.29972,144.39616 L 528.31052,272.40193 L 512.24025,288.7664 L 431.99984,256.40121 L 288.21392,239.09639 L 144.09958,256.1512 L 64.279091,288.40647 L 48.288912,272.40193 z" id="path7057" sodipodi:nodetypes="ccccccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="21.459"/>
-  <rect id="rect7061" width="30.829" height="258.64" x="415" y="255.09" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.631" rx="0"/>
-  <rect y="255.09" x="129" height="258.64" width="30.829" id="rect2747" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.631" rx="0"/>
- </g>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4685" d="m 354,40 c -16,16 -37,36 -50,52 -4,9 10,18 16,9 16,-16 32,-31 46,-48 3,-5 2,-14 -6,-14.1 -1,0 -3,0.1 -6,1.1 z M 228,52 c -28,26 -58,55 -81,80 -6,9 8,19 15,11 26,-26 53,-52 78,-79.2 3,-4.8 -1,-12.8 -7,-12.8 -2,0 -3,0.6 -5,1 z M 123,82 c -26,26 -57,55 -80.2,79 -5.8,9 8,19 14.9,11 C 84,146 111,120 137,93 c 3,-5 -1,-13 -8,-13 -2,0 -4,1 -6,2 z m 404,5 c -21,17 -45,40 -62,58 -6,9 8,19 15,12 19,-19 39,-38 58,-57 3,-5 -1,-14 -7,-14 -1,0 -2,0 -4,1 z m -96,14 c -17,16 -50,49 -74,74 -5,9 8,19 15,11 26,-26 53,-52 79,-79 5,-4 4,-16 -5,-15 -3,0 -9,2 -15,9 z m -169,10 c -25,23 -59,57 -82,80 -5,9 8,19 15,11 26,-26 53,-52 79,-79 3,-5 -2,-13 -8,-13 -1,0 -3,1 -4,1 z m 77,14 c -14,11 -30,27 -44,41 -4,10 10,18 16,10 13,-13 28,-25 40,-39 2,-5 -2,-13 -7,-13 -2,0 -3,0 -5,1 z m 191,36 c -21,19 -47,44 -65,63 -6,8 8,19 15,11 20,-20 41,-40 60,-60 3,-5 1,-15 -6,-15 -1,0 -3,0 -4,1 z m -102,31 -24,25 c -6,10 5,21 14,11 l 24,-27 c 4,-5 1,-14 -5,-14 -3,0 -6,1 -9,5 z m -323,-3 c -21,19 -47,43 -65.2,63 -5.8,9 8,19 14.9,11 C 75,242 97,222 117,201 c 3,-5 -1,-13 -8,-14 -1,0 -3,1 -4,2 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4687" d="M 98.9,346.4 139,330 c 0.1,67 -0.3,135 0.2,202 -1.2,16 46,14.4 45,-0.3 0.3,-71 0,-143 0.1,-214 33.5,-3.8 67,-8.2 101,-11.6 l 98,11.6 c 0.1,72 -0.3,143 0.2,215 -0.2,16 45,14.4 45,-0.3 0.3,-68 0,-135 0.1,-203 15.8,5.8 31,13.6 47,18.2 12.7,-3.8 31.5,-23 13,-33.7 -67,-35 -199,-105 -202,-106 -0.9,-0.3 -1.8,0 -2.6,-0.2 -3.1,1.6 -148,76.9 -210,110.15 -9.8,15.55 18.6,31.85 24.9,28.55 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 354,40 c -16,16 -37,36 -50,52 -4,9 10,18 16,9 16,-16 32,-31 46,-48 3,-5 2,-14 -6,-14.1 -1,0 -3,0.1 -6,1.1 z M 228,52 c -28,26 -58,55 -81,80 -6,9 8,19 15,11 26,-26 53,-52 78,-79.2 3,-4.8 -1,-12.8 -7,-12.8 -2,0 -3,0.6 -5,1 z M 123,82 c -26,26 -57,55 -80.2,79 -5.8,9 8,19 14.9,11 C 84,146 111,120 137,93 c 3,-5 -1,-13 -8,-13 -2,0 -4,1 -6,2 z m 404,5 c -21,17 -45,40 -62,58 -6,9 8,19 15,12 19,-19 39,-38 58,-57 3,-5 -1,-14 -7,-14 -1,0 -2,0 -4,1 z m -96,14 c -17,16 -50,49 -74,74 -5,9 8,19 15,11 26,-26 53,-52 79,-79 5,-4 4,-16 -5,-15 -3,0 -9,2 -15,9 z m -169,10 c -25,23 -59,57 -82,80 -5,9 8,19 15,11 26,-26 53,-52 79,-79 3,-5 -2,-13 -8,-13 -1,0 -3,1 -4,1 z m 77,14 c -14,11 -30,27 -44,41 -4,10 10,18 16,10 13,-13 28,-25 40,-39 2,-5 -2,-13 -7,-13 -2,0 -3,0 -5,1 z m 191,36 c -21,19 -47,44 -65,63 -6,8 8,19 15,11 20,-20 41,-40 60,-60 3,-5 1,-15 -6,-15 -1,0 -3,0 -4,1 z m -102,31 -24,25 c -6,10 5,21 14,11 l 24,-27 c 4,-5 1,-14 -5,-14 -3,0 -6,1 -9,5 z m -323,-3 c -21,19 -47,43 -65.2,63 -5.8,9 8,19 14.9,11 C 75,242 97,222 117,201 c 3,-5 -1,-13 -8,-14 -1,0 -3,1 -4,2 z" id="path4160" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M 98.9,346.4 139,330 c 0.1,67 -0.3,135 0.2,202 -1.2,16 46,14.4 45,-0.3 0.3,-71 0,-143 0.1,-214 33.5,-3.8 67,-8.2 101,-11.6 l 98,11.6 c 0.1,72 -0.3,143 0.2,215 -0.2,16 45,14.4 45,-0.3 0.3,-68 0,-135 0.1,-203 15.8,5.8 31,13.6 47,18.2 12.7,-3.8 31.5,-23 13,-33.7 -67,-35 -199,-105 -202,-106 -0.9,-0.3 -1.8,0 -2.6,-0.2 -3.1,1.6 -148,76.9 -210,110.15 -9.8,15.55 18.6,31.85 24.9,28.55 z" id="path15803" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/firestation3.svg b/vtm-themes/resources/assets/symbols/amenity/firestation3.svg
old mode 100755
new mode 100644
index 86c2fc91..4964cd80
--- a/vtm-themes/resources/assets/symbols/amenity/firestation3.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/firestation3.svg
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata1976"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 287.54752,24.82936 c -24.5642,0.06768 -44.92229,15.567008 -65.52354,26.987265 -23.6266,12.365832 -50.62737,17.687102 -77.22099,16.180484 -8.00914,0.305743 -20.08645,0.324417 -22.53392,9.886424 -2.15787,9.897214 7.83419,15.915256 12.76404,22.905207 11.45648,13.41133 23.07625,26.52693 35.15395,39.32286 1.82819,-2.55786 9.43787,-4.26659 4.7588,-7.46361 -13.46471,-16.05758 -28.7322,-30.82111 -40.62307,-48.084441 -1.04162,-7.231398 7.6892,-8.790534 13.09269,-8.177775 20.58788,-0.158094 42.23864,1.050276 60.8922,-9.1012 27.49688,-12.521769 52.84281,-33.892662 84.49479,-34.171994 30.38666,0.588659 55.36729,20.333943 81.25868,33.786037 18.35049,10.37796 38.78565,17.893659 60.09046,17.16022 6.97194,0.550013 15.773,-1.034926 20.84165,4.690856 2.87596,7.13959 -5.66769,10.852295 -9.18145,15.653647 -11.7667,11.78781 -23.58354,23.52236 -35.41137,35.23323 2.9898,1.25929 5.99773,7.36385 8.65624,4.72247 16.12086,-16.62216 33.67318,-31.88907 48.28719,-49.849689 2.29368,-6.32431 -0.55094,-15.255652 -8.28454,-15.638991 C 441.06622,74.794223 422.07122,76.909676 404.28451,71.322273 370.47919,62.297039 344.54784,34.736063 310.4674,26.610697 302.99921,25.016955 295.24308,24.686109 287.54752,24.82936 z M 86.939209,111.3133 c -7.480359,-0.10892 -9.42973,8.79164 -9.365986,14.63106 -1.74212,17.58642 -1.18225,35.93733 -8.565617,52.31922 -12.430588,34.66836 -41.044731,62.89874 -44.79943,100.6102 -2.552721,26.14426 10.564347,49.89374 22.505126,72.18771 13.453163,25.22346 25.051864,53.10611 22.323464,82.31766 -0.379358,8.12228 -0.29675,19.85888 8.372287,23.45428 7.600494,2.07507 12.74036,-5.647 18.644668,-8.877 15.058949,-11.14712 28.974229,-23.48771 42.841169,-36.0424 -2.82391,-2.3273 -4.80551,-10.40584 -8.45925,-4.86144 -15.04154,12.38722 -29.14242,26.10343 -45.069945,37.2521 -7.002255,1.01076 -8.498645,-7.66615 -7.659752,-12.82563 0.49503,-17.5436 0.175452,-35.66235 -8.045709,-51.51035 -13.134565,-30.46259 -35.800093,-58.28599 -37.259646,-92.68893 -0.07709,-31.58405 20.166541,-57.80352 34.647018,-84.1979 10.455182,-18.12728 18.315784,-38.22984 17.605553,-59.4373 0.619876,-6.21604 -1.35145,-15.1109 4.839301,-18.88218 7.453385,-2.05341 11.07661,6.79784 16.26955,10.33176 11.6531,11.40284 22.69484,23.27382 34.64702,34.40951 2.69949,-3.46275 8.27333,-6.92192 2.19535,-10.04834 -16.36459,-16.41676 -31.74328,-33.8695 -50.113335,-48.05296 -1.845609,-0.16378 -3.701492,-0.12879 -5.551836,-0.0891 z m 407.421611,11.3115 c -7.35395,3.57028 -11.69328,11.1389 -18.43645,15.64292 -11.53353,10.66344 -23.31673,21.05092 -34.64741,31.91879 2.70845,1.84416 4.59348,9.76923 7.77213,5.39132 15.1099,-13.23809 29.08548,-28.1614 45.4008,-40.00865 6.86617,-1.56278 8.89515,6.98407 7.89726,12.05372 -0.43005,18.62403 0.45963,37.86428 9.22682,54.71696 13.0417,31.06158 34.53943,60.16856 35.72227,94.9451 -0.83228,30.28543 -20.72727,55.03345 -34.82515,80.3977 -10.19431,17.1618 -17.7315,36.52991 -16.92271,56.85436 -0.69502,6.52265 1.09037,15.72452 -5.28463,19.77285 -7.27002,2.38507 -11.53184,-6.10985 -16.437,-9.71802 -10.90632,-10.40093 -21.81604,-20.79828 -32.72792,-31.19337 -1.24026,2.86873 -7.84194,5.8402 -3.35486,8.31291 17.02487,15.734 32.42127,33.41155 51.00564,47.02732 7.70962,1.2974 13.22536,-6.475 13.06314,-13.53817 2.43855,-16.4053 1.1859,-33.65916 7.77851,-49.28368 10.40368,-32.05008 35.33582,-57.40908 43.76153,-90.16537 5.32885,-23.21576 -0.24145,-47.67258 -11.34119,-68.37368 -14.68592,-30.88062 -33.06529,-62.6132 -31.41092,-98.09233 -0.41235,-8.64176 0.68502,-19.2053 -5.96748,-25.71064 -3.21457,-1.3148 -6.8931,-0.84761 -10.27238,-0.95004 z M 156.38169,440.5045 c -14.42676,16.34815 -32.17238,29.66881 -44.41469,47.79923 -2.41602,7.88733 5.31381,15.11765 12.9903,14.61794 16.48463,2.15517 33.7904,0.89995 49.44559,7.55971 30.51758,9.87269 55.22918,33.16025 86.13153,42.20025 26.66016,7.00514 55.22902,1.12873 78.64851,-12.65283 29.06686,-14.16175 59.6492,-29.8491 92.97915,-27.70364 8.02831,-0.40369 17.63905,0.23055 23.89998,-5.25801 2.97274,-5.84104 1.25082,-13.02853 -4.01377,-16.95623 -13.3288,-15.82981 -27.88544,-30.90815 -41.44003,-46.60783 -1.37399,2.31848 -9.79202,4.42475 -5.19557,6.56126 12.84137,14.87015 27.72134,28.63501 39.42695,44.68189 2.58939,6.57768 -5.79706,9.97262 -11.07399,9.11451 -22.49335,-1.60489 -45.15583,2.26282 -65.28602,12.6178 -28.67962,13.3844 -57.45313,32.64058 -90.55133,30.69839 -33.26122,-2.25785 -59.17506,-25.66237 -88.02777,-39.63476 -15.51146,-7.85626 -32.70407,-11.49812 -50.0259,-11.3115 -5.50746,-0.008 -15.09661,0.40621 -15.31951,-7.15504 1.11914,-6.84299 8.58545,-10.01724 12.24261,-15.41228 10.40026,-10.75101 20.75797,-21.53492 31.16265,-32.26819 -3.31886,-1.71288 -6.56929,-8.6647 -9.44451,-3.09113 -0.71139,0.73349 -1.42279,1.46698 -2.13418,2.20046 z" id="path3575" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="9.5"/>
- <g id="g5215" transform="matrix(1.0478814,0,0,1.0478814,-14.016475,-23.016508)">
-  <path sodipodi:nodetypes="cscccccccccccc" id="path4356" d="m 198.67153,429.13471 c -27.9052,-15.73923 -44.91267,-52.53932 -32.35461,-107.5395 8.80965,-38.58338 34.48036,-86.20137 14.80642,-125.85126 23.86554,16.49562 48.67818,55.72148 73.70237,100.02462 1.72552,-47.91091 -23.1357,-79.3021 -5.26444,-144.77247 12.26268,80.9952 61.45228,86.01536 86.42474,159.68842 10.62203,-34.63889 32.71786,-46.03994 21.93521,-132.05003 108.58157,148.29018 46.69562,200.96776 25.00613,254.00987 l 7.0193,-73.70234 c -34.05505,98.44168 -61.34018,116.60289 -85.98606,138.63059 13.7744,-46.21019 19.20596,-92.4204 -8.77412,-138.63059 -6.79301,75.87173 -25.9655,60.08286 -29.83187,121.08241 -38.33494,-28.93346 -46.20823,-58.61344 -53.08324,-107.04388 -5.21553,5.66709 -14.0221,29.35386 -13.59983,56.15416 z" fill="#ffffff" fill-rule="evenodd"/>
-  <path sodipodi:nodetypes="ccc" id="path4358" d="M 278.07704,75.100248 C 249.68045,190.40668 301.5257,189.3936 330.28289,257.16259 350.4538,152.66532 290.11046,176.17723 278.07704,75.100248 z" fill="#ffffff" fill-rule="evenodd"/>
- </g>
- <path d="m 83.620844,116.43162 -5.563986,44.51188 -15.102245,38.9479 -27.025072,50.07587 -10.333115,37.35818 17.486811,49.28102 24.640506,48.48616 10.333115,66.76782 56.434712,-43.71703 29.40963,31.7942 -48.48615,50.87073 8.7434,7.94855 32.58905,3.17941 30.2045,7.94856 51.66557,30.20448 36.56334,11.12798 34.97362,-4.76913 44.51188,-19.87138 38.9479,-15.10225 42.12732,-5.56398 18.28166,-11.12797 -45.30673,-46.89644 32.58905,-30.2045 48.48616,46.10159 8.74341,-14.30739 4.76913,-42.92217 21.46109,-41.33246 23.05079,-43.71703 5.56399,-30.99935 -14.30739,-39.74274 -23.84565,-44.51189 -9.53826,-45.30674 -3.97429,-34.97362 -27.81992,20.66623 -28.61478,25.43536 -28.61478,-30.99935 45.30674,-49.281008 -9.53826,-10.333115 -42.92218,-4.76913 -40.53761,-15.897101 -44.51188,-24.640506 -32.58906,-7.153696 -38.94789,8.743406 -37.35819,22.255941 -34.17877,10.333116 -54.05014,3.974275 0,9.53826 46.1016,52.460428 -33.38392,28.61479 -56.434706,-48.48616 z" id="path6053" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4141" d="m 265,52.1 c -25,9.7 -46,29.8 -74,32 -20.4,0 -72.9,0 -47,32.6 12.7,9.8 24,38.5 39.7,39 l -20.8,17.8 c -12,-18.5 -29.7,-43 -53,-47.9 -4.5,-0.6 -9.7,2.1 -11.4,6.4 -4.4,26 -3.3,54 -19.5,77 -17.4,30 -40,64.9 -26.8,101 12.7,37.7 43.6,72 35.8,114 1.2,33 35.5,12.1 49.9,-2.5 9,-6.2 15.8,-14.8 18.4,-21.5 l 17.6,19 c -3,0.5 -6.3,2.3 -9.2,5.7 -10.7,9.5 -19.9,20.5 -30,30.5 -24.6,26 22.3,34 40.7,32.4 41.8,10.3 75,51 121,43.7 43,-5.3 79,-44 124,-37 27,2.8 24.5,-29.6 13.7,-40 -5.5,-7 -19.9,-25.7 -31,-27.9 L 418.7,412 c 5,8.4 19,18.7 24,24.5 10.3,12.2 47,24 43.6,-6.3 0.5,-25.6 9.3,-49.7 23.7,-71 16.6,-26 31.8,-58.8 18.9,-90 -12.5,-36.7 -39.6,-70 -35.6,-111 0.7,-11 -4.7,-26.3 -18.5,-23.7 -13.2,12.4 -43.1463,28.5284 -48.1463,45.5284 l -18.00947,-19.15473 c 4.9,-1 8.72829,-6.96321 13.15577,-11.17367 13.97491,-13.28991 49,-35.5 22.8,-55 C 415,94 385,92 361,74 340,60 315,46.7 290,47 c -8.4,0.1 -16.8,1.7 -25,5.1 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 265,52.1 c -25,9.7 -46,29.8 -74,32 -20.4,0 -72.9,0 -47,32.6 12.7,9.8 24,38.5 39.7,39 l -20.8,17.8 c -12,-18.5 -29.7,-43 -53,-47.9 -4.5,-0.6 -9.7,2.1 -11.4,6.4 -4.4,26 -3.3,54 -19.5,77 -17.4,30 -40,64.9 -26.8,101 12.7,37.7 43.6,72 35.8,114 1.2,33 35.5,12.1 49.9,-2.5 9,-6.2 15.8,-14.8 18.4,-21.5 l 17.6,19 c -3,0.5 -6.3,2.3 -9.2,5.7 -10.7,9.5 -19.9,20.5 -30,30.5 -24.6,26 22.3,34 40.7,32.4 41.8,10.3 75,51 121,43.7 43,-5.3 79,-44 124,-37 27,2.8 24.5,-29.6 13.7,-40 -5.5,-7 -19.9,-25.7 -31,-27.9 L 418.7,412 c 5,8.4 19,18.7 24,24.5 10.3,12.2 47,24 43.6,-6.3 0.5,-25.6 9.3,-49.7 23.7,-71 16.6,-26 31.8,-58.8 18.9,-90 -12.5,-36.7 -39.6,-70 -35.6,-111 0.7,-11 -4.7,-26.3 -18.5,-23.7 -13.2,12.4 -43.1463,28.5284 -48.1463,45.5284 l -18.00947,-19.15473 c 4.9,-1 8.72829,-6.96321 13.15577,-11.17367 13.97491,-13.28991 49,-35.5 22.8,-55 C 415,94 385,92 361,74 340,60 315,46.7 290,47 c -8.4,0.1 -16.8,1.7 -25,5.1 z" id="path3575" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M 295,63.900391 C 273,64.000391 251,74 233,87 c -22,17 -54,13 -76,18 6,19 34,27 33,49 -3,2 -4.49023,1.87305 -6.49023,1.87305 l -20.61915,17.61718 C 137.7476,196.40419 127.964,143.37781 111,149 c 3,36 -20,67 -36,97 -14,22 -15.2,50 -3,74 11,28 35,54 31,86 -1,33 25,-4 36,-11 16,-9 21.16992,-4.08008 17.16992,4.91992 l 17.64063,19.08985 C 183.81055,417.00977 190,429 176,438 c -11,9 -44,38 -10,33 48,2 81,53 131,44 42,-7 77,-44 121,-36 15,-14 -24,-28 -27,-45 2,-6 7.5293,-8.63672 12.5293,-7.63672 l 15.38086,-14.49023 C 415.91016,406.87305 415,402 427,400 c 16,6 33,43 43,25 -3,-37 23,-66 38,-97 17,-29 4,-63 -11,-90 -13,-23 -23,-49 -20,-75 -16,-15 -29,34 -50,27 -1,-4 -1,-7 0,-10 l -18,-19 c -10,2 -16.82475,-5.14106 -7,-16 9.82475,-10.85894 38,-27 26,-36 C 391,113 359,91 328,74 318,67 307,64.000391 295,63.900391 Z M 278.90234,79.193359 C 290.19809,174.26445 347.61717,152.61478 327.84961,250.50977 301.49286,186.5015 252.5456,187.44263 278.90234,79.193359 Z m -25.88672,71.539061 c 11.57815,76.24514 58.36163,80.95137 80.95313,150.60742 9.97791,-32.56891 30.78141,-43.30032 20.61523,-124.25195 102.60306,139.3121 43.95969,189.20105 23.53321,239.08984 l 6.58789,-69.65625 c -32.00463,92.24721 -57.42032,110.13129 -80.95313,130.83985 12.99011,-43.29971 17.88529,-86.59884 -8.2832,-130.83985 -6.40092,71.44452 -24.47379,56.47731 -28.05078,113.89649 -35.76987,-27.20351 -43.29949,-55.53645 -49.88867,-100.71875 -4.89483,5.3654 -13.17926,27.67436 -12.80274,52.71289 l -0.1875,0 c -26.26261,-14.77838 -42.26597,-48.94736 -30.12304,-100.71875 8.28355,-36.3341 32.47549,-80.9516 13.93164,-118.60352 22.49736,15.53142 45.84104,52.43136 69.65625,94.13086 1.60023,-45.08817 -21.64952,-74.36261 -4.98829,-136.48828 z" id="path6053" opacity="0.9" fill="#ffffff" fill-rule="evenodd"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/fountain2.svg b/vtm-themes/resources/assets/symbols/amenity/fountain2.svg
old mode 100755
new mode 100644
index 25c6cec1..ad77c989
--- a/vtm-themes/resources/assets/symbols/amenity/fountain2.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/fountain2.svg
@@ -1,37 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734a08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g3903" transform="matrix(31.324341,0,0,31.324341,37.064868,-32426.481)" fill="#ffffff">
-  <g id="g3890" transform="matrix(1.0752098,0,0,1.1328229,-44.033537,-140.05992)">
-   <path inkscape:connector-curvature="0" id="path2853" d="m 45.15625,1043.2973 c -0.409367,-0.086 -0.845035,0.032 -1.21875,0.2867 -0.373715,0.2542 -0.704782,0.6543 -1.03125,1.1757 -0.652935,1.0429 -1.243941,2.8667 -1.424583,3.6942 -0.180642,0.8276 -0.389137,1.7889 -0.476559,2.5026 0.155401,-0.6834 0.443128,-1.7111 0.682113,-2.499 0.238984,-0.788 0.965501,-2.574 1.590238,-3.4681 0.330229,-0.4725 0.6827,-0.8352 0.972541,-1.0323 0.289841,-0.1972 0.529512,-0.2533 0.78125,-0.2008 0.503476,0.105 1.373689,0.6712 1.912038,2.0587 0.538349,1.3874 1.118533,3.4851 1.413995,6.3035 l 0.142717,0.039 c -0.297953,-2.8423 -0.751198,-4.948 -1.3125,-6.3947 -0.561302,-1.4465 -1.212516,-2.2953 -2.03125,-2.466 l 0,-5e-4 0,-10e-5 0,5e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="path2857" d="m 47.321232,1038.5625 c -0.111416,-0.068 -0.2879,-0.036 -0.394168,0.031 -0.212539,0.1349 -0.356502,0.3299 -0.464022,0.625 -0.08661,0.2377 -0.28025,0.861 -0.437941,1.6327 -0.15769,0.7717 -0.158855,1.2135 -0.211834,1.8834 0.08208,-0.6739 0.232192,-1.1009 0.418407,-1.8384 0.208593,-0.7179 0.529922,-1.2927 0.669269,-1.5105 0.09744,-0.1523 0.159428,-0.2601 0.208048,-0.261 0.130879,0 0.278134,0.6184 0.371201,1.0335 0.381554,1.7019 0.706663,5.2951 0.852646,11.8213 l 0.292168,-0.011 c -0.146227,-6.5371 -0.43595,-10.3842 -0.788329,-12.1563 -0.08809,-0.443 -0.189334,-0.7475 -0.303202,-0.9687 -0.05694,-0.1107 -0.100822,-0.2133 -0.212243,-0.2813 l 0,10e-5 0,2e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3670" d="m 45.687498,1043.2973 c -0.369195,-0.091 -0.773732,0.029 -1.093748,0.2867 -0.320016,0.2585 -0.600622,0.6554 -0.875,1.1757 -0.548755,1.0407 -0.928739,2.4195 -1.142608,3.6341 -0.213869,1.2145 -0.317812,2.6173 -0.317812,2.6173 0,0 0.263321,-1.3631 0.508059,-2.5715 0.244738,-1.2083 0.739287,-2.5054 1.252513,-3.4788 0.256613,-0.4867 0.679824,-0.8108 0.918596,-1.0036 0.238772,-0.1929 0.437471,-0.2472 0.625,-0.2008 0.187529,0.047 0.500041,0.1701 0.743442,0.5229 0.243401,0.3528 0.662303,0.9037 0.889532,1.5991 0.454459,1.3908 0.796724,3.4731 1.045698,6.2934 l 0.290078,-0.013 c -0.250747,-2.8404 -0.653431,-4.9513 -1.125,-6.3945 -0.235784,-0.7217 -0.468602,-1.284 -0.75,-1.6918 -0.281398,-0.4079 -0.599555,-0.6829 -0.96875,-0.7744 l 0,-3e-4 0,-2e-4 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3672" d="m 45.90625,1043.3259 c -0.155576,0.06 -0.284523,0.1552 -0.40625,0.2868 -0.243454,0.2633 -0.452347,0.6578 -0.65625,1.1757 -0.407806,1.0357 -0.748827,2.5203 -0.949467,3.7665 -0.20064,1.2462 -0.235254,2.2685 -0.235254,2.2685 0,0 0.199903,-0.9721 0.492186,-2.2308 0.292283,-1.259 0.73188,-2.6534 1.117091,-3.6317 0.192606,-0.4892 0.432883,-0.8443 0.606694,-1.0323 0.08691,-0.094 0.164685,-0.1513 0.21875,-0.1721 0.05407,-0.021 0.07729,-0.015 0.125,0 0.09543,0.032 0.398818,0.1449 0.581783,0.5001 0.182965,0.3552 0.456591,0.9136 0.626943,1.6118 0.340704,1.3963 0.711467,3.4806 0.89755,6.3035 l 0.237474,-0.012 c -0.187076,-2.8379 -0.492958,-4.9282 -0.84375,-6.3659 -0.175396,-0.7188 -0.353579,-1.2864 -0.5625,-1.6919 -0.208921,-0.4055 -0.429704,-0.668 -0.75,-0.7742 -0.160148,-0.053 -0.344424,-0.06 -0.5,0 l 0,-7e-4 0,-10e-5 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3674" d="m 47.1875,1043.2686 c -0.08892,0.01 -0.161002,0.045 -0.21875,0.087 -0.115497,0.083 -0.185339,0.1853 -0.25,0.3154 -0.129323,0.2601 -0.235257,0.6346 -0.34375,1.147 -0.216986,1.0247 -0.438374,2.5935 -0.59375,4.6168 l -0.0096,1.3525 0.29781,-1.3242 c 0.154544,-2.0124 0.463433,-3.5698 0.672986,-4.5593 0.104777,-0.4948 0.318721,-0.841 0.413832,-1.0324 0.01818,-0.036 0.0156,-0.035 0.03125,-0.057 0.01153,0.017 0.0186,0 0.03125,0.029 0.04519,0.092 0.163081,0.2496 0.248731,0.4211 0.172696,0.3458 0.300294,0.8834 0.392509,1.5861 0.18443,1.4053 0.398714,3.501 0.498925,6.3272 l 0.234835,-0.018 c -0.100499,-2.8344 -0.249996,-4.937 -0.4375,-6.3658 -0.09375,-0.7145 -0.202483,-1.2375 -0.3125,-1.6346 -0.05501,-0.1985 -0.09209,-0.3855 -0.15625,-0.5161 -0.06416,-0.1306 -0.153501,-0.2367 -0.28125,-0.3155 -0.06388,-0.039 -0.129827,-0.062 -0.21875,-0.057 l 0,-8e-4 -2.8e-5,0 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3678" d="m 47.712764,1038.6562 c -0.07788,0.082 -0.186925,0.4033 -0.271629,0.6573 -0.0847,0.254 -0.275193,1.0681 -0.327523,1.514 -0.05233,0.4459 -0.105675,1.7017 -0.09913,1.7017 0,0 0.221347,-1.388 0.275207,-1.6965 0.05386,-0.3085 0.207936,-0.9201 0.336609,-1.2563 0.107193,-0.2801 0.249003,-0.4256 0.329478,-0.4258 0.08047,-2e-4 0.177845,0.2335 0.257127,1.3257 0.07928,1.0923 0.06389,5.2513 0.11832,11.4766 l 0.188682,0.016 c -0.05712,-6.5336 -0.01996,-11.1392 -0.09319,-12.125 -0.07323,-0.9858 -0.353625,-1.3128 -0.486766,-1.3126 -0.133141,2e-4 -0.149311,0.043 -0.227188,0.1249 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="path3680" d="m 49.351947,1050.9606 c -3.21981,-0.3605 -4.972634,1.3107 -7.440408,1.2353 0,0 0,0.4153 0,0.4153 0.930051,0 1.860102,0 6.510357,0"/>
-  </g>
- </g>
- <g id="g3903-1" transform="matrix(-31.324341,0,0,31.324341,539.66897,-32426.481)" fill="#ffffff">
-  <g id="g3890-7" transform="matrix(1.0752098,0,0,1.1328229,-44.033537,-140.05992)">
-   <path inkscape:connector-curvature="0" id="path2853-4" d="m 45.15625,1043.2973 c -0.409367,-0.086 -0.845035,0.032 -1.21875,0.2867 -0.373715,0.2542 -0.704782,0.6543 -1.03125,1.1757 -0.652935,1.0429 -1.243941,2.8667 -1.424583,3.6942 -0.180642,0.8276 -0.389137,1.7889 -0.476559,2.5026 0.155401,-0.6834 0.443128,-1.7111 0.682113,-2.499 0.238984,-0.788 0.965501,-2.574 1.590238,-3.4681 0.330229,-0.4725 0.6827,-0.8352 0.972541,-1.0323 0.289841,-0.1972 0.529512,-0.2533 0.78125,-0.2008 0.503476,0.105 1.373689,0.6712 1.912038,2.0587 0.538349,1.3874 1.118533,3.4851 1.413995,6.3035 l 0.142717,0.039 c -0.297953,-2.8423 -0.751198,-4.948 -1.3125,-6.3947 -0.561302,-1.4465 -1.212516,-2.2953 -2.03125,-2.466 l 0,-5e-4 0,-10e-5 0,5e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="path2857-0" d="m 47.321232,1038.5625 c -0.111416,-0.068 -0.2879,-0.036 -0.394168,0.031 -0.212539,0.1349 -0.356502,0.3299 -0.464022,0.625 -0.08661,0.2377 -0.28025,0.861 -0.437941,1.6327 -0.15769,0.7717 -0.158855,1.2135 -0.211834,1.8834 0.08208,-0.6739 0.232192,-1.1009 0.418407,-1.8384 0.208593,-0.7179 0.529922,-1.2927 0.669269,-1.5105 0.09744,-0.1523 0.159428,-0.2601 0.208048,-0.261 0.130879,0 0.278134,0.6184 0.371201,1.0335 0.381554,1.7019 0.706663,5.2951 0.852646,11.8213 l 0.292168,-0.011 c -0.146227,-6.5371 -0.43595,-10.3842 -0.788329,-12.1563 -0.08809,-0.443 -0.189334,-0.7475 -0.303202,-0.9687 -0.05694,-0.1107 -0.100822,-0.2133 -0.212243,-0.2813 l 0,10e-5 0,2e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3670-9" d="m 45.687498,1043.2973 c -0.369195,-0.091 -0.773732,0.029 -1.093748,0.2867 -0.320016,0.2585 -0.600622,0.6554 -0.875,1.1757 -0.548755,1.0407 -0.928739,2.4195 -1.142608,3.6341 -0.213869,1.2145 -0.317812,2.6173 -0.317812,2.6173 0,0 0.263321,-1.3631 0.508059,-2.5715 0.244738,-1.2083 0.739287,-2.5054 1.252513,-3.4788 0.256613,-0.4867 0.679824,-0.8108 0.918596,-1.0036 0.238772,-0.1929 0.437471,-0.2472 0.625,-0.2008 0.187529,0.047 0.500041,0.1701 0.743442,0.5229 0.243401,0.3528 0.662303,0.9037 0.889532,1.5991 0.454459,1.3908 0.796724,3.4731 1.045698,6.2934 l 0.290078,-0.013 c -0.250747,-2.8404 -0.653431,-4.9513 -1.125,-6.3945 -0.235784,-0.7217 -0.468602,-1.284 -0.75,-1.6918 -0.281398,-0.4079 -0.599555,-0.6829 -0.96875,-0.7744 l 0,-3e-4 0,-2e-4 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3672-4" d="m 45.90625,1043.3259 c -0.155576,0.06 -0.284523,0.1552 -0.40625,0.2868 -0.243454,0.2633 -0.452347,0.6578 -0.65625,1.1757 -0.407806,1.0357 -0.748827,2.5203 -0.949467,3.7665 -0.20064,1.2462 -0.235254,2.2685 -0.235254,2.2685 0,0 0.199903,-0.9721 0.492186,-2.2308 0.292283,-1.259 0.73188,-2.6534 1.117091,-3.6317 0.192606,-0.4892 0.432883,-0.8443 0.606694,-1.0323 0.08691,-0.094 0.164685,-0.1513 0.21875,-0.1721 0.05407,-0.021 0.07729,-0.015 0.125,0 0.09543,0.032 0.398818,0.1449 0.581783,0.5001 0.182965,0.3552 0.456591,0.9136 0.626943,1.6118 0.340704,1.3963 0.711467,3.4806 0.89755,6.3035 l 0.237474,-0.012 c -0.187076,-2.8379 -0.492958,-4.9282 -0.84375,-6.3659 -0.175396,-0.7188 -0.353579,-1.2864 -0.5625,-1.6919 -0.208921,-0.4055 -0.429704,-0.668 -0.75,-0.7742 -0.160148,-0.053 -0.344424,-0.06 -0.5,0 l 0,-7e-4 0,-10e-5 0,-4e-4 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3674-8" d="m 47.1875,1043.2686 c -0.08892,0.01 -0.161002,0.045 -0.21875,0.087 -0.115497,0.083 -0.185339,0.1853 -0.25,0.3154 -0.129323,0.2601 -0.235257,0.6346 -0.34375,1.147 -0.216986,1.0247 -0.438374,2.5935 -0.59375,4.6168 l -0.0096,1.3525 0.29781,-1.3242 c 0.154544,-2.0124 0.463433,-3.5698 0.672986,-4.5593 0.104777,-0.4948 0.318721,-0.841 0.413832,-1.0324 0.01818,-0.036 0.0156,-0.035 0.03125,-0.057 0.01153,0.017 0.0186,0 0.03125,0.029 0.04519,0.092 0.163081,0.2496 0.248731,0.4211 0.172696,0.3458 0.300294,0.8834 0.392509,1.5861 0.18443,1.4053 0.398714,3.501 0.498925,6.3272 l 0.234835,-0.018 c -0.100499,-2.8344 -0.249996,-4.937 -0.4375,-6.3658 -0.09375,-0.7145 -0.202483,-1.2375 -0.3125,-1.6346 -0.05501,-0.1985 -0.09209,-0.3855 -0.15625,-0.5161 -0.06416,-0.1306 -0.153501,-0.2367 -0.28125,-0.3155 -0.06388,-0.039 -0.129827,-0.062 -0.21875,-0.057 l 0,-8e-4 -2.8e-5,0 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="use3678-8" d="m 47.712764,1038.6562 c -0.07788,0.082 -0.186925,0.4033 -0.271629,0.6573 -0.0847,0.254 -0.275193,1.0681 -0.327523,1.514 -0.05233,0.4459 -0.105675,1.7017 -0.09913,1.7017 0,0 0.221347,-1.388 0.275207,-1.6965 0.05386,-0.3085 0.207936,-0.9201 0.336609,-1.2563 0.107193,-0.2801 0.249003,-0.4256 0.329478,-0.4258 0.08047,-2e-4 0.177845,0.2335 0.257127,1.3257 0.07928,1.0923 0.06389,5.2513 0.11832,11.4766 l 0.188682,0.016 c -0.05712,-6.5336 -0.01996,-11.1392 -0.09319,-12.125 -0.07323,-0.9858 -0.353625,-1.3128 -0.486766,-1.3126 -0.133141,2e-4 -0.149311,0.043 -0.227188,0.1249 z" color="#000000" stroke-width="0.507"/>
-   <path inkscape:connector-curvature="0" id="path3680-2" d="m 49.351947,1050.9606 c -3.21981,-0.3605 -4.972634,1.3107 -7.440408,1.2353 0,0 0,0.4153 0,0.4153 0.930051,0 1.860102,0 6.510357,0"/>
-  </g>
- </g>
+ <path id="path4137" d="m 256,65.6 c -2.1,-4.9 -3.4,-10 -8.8,-12.7 -40,-5.9 -48,104 -51,141 10.2,-33.6 39.6,-163 50.7,-111 -5.4,14 -14.8,50 -9.5,101 4.9,-26.4 7.1,-53.8 14.7,-80 10.8,58.9 17,123 20.4,175 -5.4,-22.5 -8.4,-53.7 -22.4,-65 -6.3,-3.8 -18,3.9 -21,8 -8.9,-7.6 -17.2,-13.4 -31.4,-7.2 -7.8,-2.4 -16.2,-4.3 -23.6,-1.9 C 78,206 45,393 34,466 69,369 83,286 141,237 102,308 96,343 77,463 c 37,-96 49,-221 101,-229 -39,62 -51.8,164 -54.6,234 21,-78 30,-171 71.8,-226 7.9,6.1 14.6,13.6 20.5,21.8 -12.3,67 -21,135 -20.8,203 15,-62 18.2,-125 30.7,-187 29.7,67 36,137 47,194 -76,-5.4 -140,43 -209,40.8 0.8,6 -3.9,14 6.5,14 l 439,0 c 10.4,0.1 5.7,-8 6.5,-14 -68,2.3 -133,-46 -209,-40.8 11.3,-57 17.7,-128 47,-194 12.5,62 15.6,126 30.7,187 0.2,-68 -8.5,-136 -20.8,-203 5.9,-8.2 12.6,-15.7 20.5,-21.8 41.5,56 50.6,148 71.8,226 -2.8,-69.9 -15.4,-172 -54.6,-234 51,8.1 64,133 101,230 -19,-120 -25,-155 -64,-227 58,48.8 71.8,132 107,229 -10.9,-73 -43,-259 -140,-252 -7.4,-2.3 -15.8,-0.5 -23.6,1.9 -14.2,-6.2 -22.4,-0.4 -31.4,7.2 -3,-4.2 -14.9,-11.8 -21,-8 -14,11.3 -17,42.6 -22.4,65 3.3,-52 9.6,-116 20.4,-175 7.5,25.8 9.8,53 14.7,80 5.3,-51 -4.1,-87 -9.5,-101 11.2,-52 40.5,78 50.7,111 -2.9,-37.6 -10.8,-147 -51,-141 -5.4,2.7 -6.8,7.8 -8.9,12.7 -2.3,-5.5 -4.6,-13 -12,-13.7 C 302,54 295,69 290,92 285,69 278,54 268,51.9 c -7.5,0.7 -9.8,8.2 -12,13.7 z M 279,188 C 281,175 257,81 262.9,81.85 271,80.9 279,170 279,188 Z m 22,0 c 0,-18 8,-107.1 16,-106 4,-1 -12,75 -16,106 z m -57,44 c 16.9,22 22.7,74 25.7,101 -9.9,-34 -15.9,-66.8 -29.9,-97 1.16391,-1.46884 3.28268,-3.46903 4.2,-4 z m 97.2,3.4 c -14,30.6 -20,63 -29.9,97 3,-26 8.8,-79 25.7,-100.7 1.5,0.3 2.9,1.6 4.2,3.7 z m -89.3,63.9 c -6.4,-17.4 -11.2,-33.6 -18.8,-48 0.2,-1.1 0.6,-1.6 0.95,-1.65 C 238,249.1 250,291.6 251.9,299.3 Z m 97.2,-48 c -7.6,14.5 -12.4,30.7 -18.8,48 1.9,-7.4 13.9,-50 17.85,-49.7 0.35,0.2 0.65,0.7 0.95,1.7 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 256,65.6 c -2.1,-4.9 -3.4,-10 -8.8,-12.7 -40,-5.9 -48,104 -51,141 10.2,-33.6 39.6,-163 50.7,-111 -5.4,14 -14.8,50 -9.5,101 4.9,-26.4 7.1,-53.8 14.7,-80 10.8,58.9 17,123 20.4,175 -5.4,-22.5 -8.4,-53.7 -22.4,-65 -6.3,-3.8 -18,3.9 -21,8 -8.9,-7.6 -17.2,-13.4 -31.4,-7.2 -7.8,-2.4 -16.2,-4.3 -23.6,-1.9 C 78,206 45,393 34,466 69,369 83,286 141,237 102,308 96,343 77,463 c 37,-96 49,-221 101,-229 -39,62 -51.8,164 -54.6,234 21,-78 30,-171 71.8,-226 7.9,6.1 14.6,13.6 20.5,21.8 -12.3,67 -21,135 -20.8,203 15,-62 18.2,-125 30.7,-187 29.7,67 36,137 47,194 -76,-5.4 -140,43 -209,40.8 0.8,6 -3.9,14 6.5,14 l 439,0 c 10.4,0.1 5.7,-8 6.5,-14 -68,2.3 -133,-46 -209,-40.8 11.3,-57 17.7,-128 47,-194 12.5,62 15.6,126 30.7,187 0.2,-68 -8.5,-136 -20.8,-203 5.9,-8.2 12.6,-15.7 20.5,-21.8 41.5,56 50.6,148 71.8,226 -2.8,-69.9 -15.4,-172 -54.6,-234 51,8.1 64,133 101,230 -19,-120 -25,-155 -64,-227 58,48.8 71.8,132 107,229 -10.9,-73 -43,-259 -140,-252 -7.4,-2.3 -15.8,-0.5 -23.6,1.9 -14.2,-6.2 -22.4,-0.4 -31.4,7.2 -3,-4.2 -14.9,-11.8 -21,-8 -14,11.3 -17,42.6 -22.4,65 3.3,-52 9.6,-116 20.4,-175 7.5,25.8 9.8,53 14.7,80 5.3,-51 -4.1,-87 -9.5,-101 11.2,-52 40.5,78 50.7,111 -2.9,-37.6 -10.8,-147 -51,-141 -5.4,2.7 -6.8,7.8 -8.9,12.7 -2.3,-5.5 -4.6,-13 -12,-13.7 C 302,54 295,69 290,92 285,69 278,54 268,51.9 c -7.5,0.7 -9.8,8.2 -12,13.7 z M 279,188 C 281,175 257,81 262.9,81.85 271,80.9 279,170 279,188 Z m 22,0 c 0,-18 8,-107.1 16,-106 4,-1 -12,75 -16,106 z m -57,44 c 16.9,22 22.7,74 25.7,101 -9.9,-34 -15.9,-66.8 -29.9,-97 1.16391,-1.46884 3.28268,-3.46903 4.2,-4 z m 97.2,3.4 c -14,30.6 -20,63 -29.9,97 3,-26 8.8,-79 25.7,-100.7 1.5,0.3 2.9,1.6 4.2,3.7 z m -89.3,63.9 c -6.4,-17.4 -11.2,-33.6 -18.8,-48 0.2,-1.1 0.6,-1.6 0.95,-1.65 C 238,249.1 250,291.6 251.9,299.3 Z m 97.2,-48 c -7.6,14.5 -12.4,30.7 -18.8,48 1.9,-7.4 13.9,-50 17.85,-49.7 0.35,0.2 0.65,0.7 0.95,1.7 z" id="path4151" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/library.svg b/vtm-themes/resources/assets/symbols/amenity/library.svg
old mode 100755
new mode 100644
index d4516b7c..21514a9c
--- a/vtm-themes/resources/assets/symbols/amenity/library.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/library.svg
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 73.931354,159.8883 L 302.43289,419.37306 L 521.25215,293.50359 L 298.56009,35.95529 L 73.931354,159.8883 z" id="path3470" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 61.6534,188.60064 L 286.28195,444.21251 L 287.2502,541.03514 L 60.685154,284.9392 L 61.6534,188.60064 z" id="path3474" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 519.50933,327.13704 L 313.25992,447.99014 L 313.11567,451.17546 L 519.19198,330.40891 L 519.50933,327.13704 z" id="path3476" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
- <path sodipodi:nodetypes="ccccc" id="path3505" d="M 519.50933,367.13704 L 313.25992,487.99014 L 313.11567,491.17546 L 519.19198,370.40891 L 519.50933,367.13704 z" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
- <path d="M 519.50933,407.13704 L 313.25992,527.99014 L 313.11567,531.17546 L 519.19198,410.40891 L 519.50933,407.13704 z" id="path3507" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4139" d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4141" d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 448.78613,440.70065 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.01734,39.87078 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" id="path3474" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 448.78613,440.70065 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.01734,39.87078 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" id="path3507" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/playground.svg b/vtm-themes/resources/assets/symbols/amenity/playground.svg
old mode 100755
new mode 100644
index 1e8abca4..60670baf
--- a/vtm-themes/resources/assets/symbols/amenity/playground.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/playground.svg
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 44.421016,269.96274 540.35091,367.8097" id="path2383" fill="#ffffff" stroke="#ffffff" stroke-linecap="round" stroke-width="34.524" stroke-miterlimit="1.1"/>
- <path d="m 292.38579,322.02486 -52.29327,109.83729 104.58725,0 -52.29398,-109.83729 z" id="path2385" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="2.023"/>
- <g transform="matrix(2.1357106,0.90429401,-0.84164613,2.2946826,-206.63356,-1194.9871)" id="g3185" fill="#ffffff" stroke="#ffffff">
-  <path d="m 338.53918,463.22191 c -8.9525,1.66739 -20.95672,48.62705 -20.95672,48.62705 l 34.61374,-4.78652 c 0,0 -4.32951,15.51183 -8.18502,27.01742 -2.40466,7.17586 5.60707,9.49056 9.63988,1.52914 7.449,-14.70555 13.0522,-30.95967 13.0522,-30.95967 0,0 -18.70966,-43.18825 -28.16408,-41.42742 z" id="path3181" fill-rule="evenodd" stroke-width="1.335"/>
-  <path d="m 286.86472,449.50504 c 0.004,5.13117 -3.71051,9.29292 -8.29328,9.29292 -4.58277,0 -8.29684,-4.16175 -8.29328,-9.29292 -0.004,-5.13117 3.71051,-9.29292 8.29328,-9.29292 4.58277,0 8.29684,4.16175 8.29328,9.29292 z" transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)" id="path3183" stroke-width="5.9"/>
- </g>
- <g transform="matrix(-2.3075369,-0.23175279,-0.36219803,2.4172678,1457.3558,-786.99777)" id="g3193" fill="#ffffff" stroke="#ffffff">
-  <path d="m 338.53918,463.22191 c -8.9525,1.66739 -20.95672,48.62705 -20.95672,48.62705 l 34.61374,-4.78652 c 0,0 -4.32951,15.51183 -8.18502,27.01742 -2.40466,7.17586 5.60707,9.49056 9.63988,1.52914 7.449,-14.70555 13.0522,-30.95967 13.0522,-30.95967 0,0 -18.70966,-43.18825 -28.16408,-41.42742 z" id="path3195" fill-rule="evenodd" stroke-width="1.335"/>
-  <path d="m 286.86472,449.50504 c 0.004,5.13117 -3.71051,9.29292 -8.29328,9.29292 -4.58277,0 -8.29684,-4.16175 -8.29328,-9.29292 -0.004,-5.13117 3.71051,-9.29292 8.29328,-9.29292 4.58277,0 8.29684,4.16175 8.29328,9.29292 z" transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)" id="path3197" stroke-width="5.9"/>
- </g>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4137" d="m 129,148 c -11,18 -4,43 16,53 19,11 44,5 56,-13 10,-32 -6,-59 -36,-59 -18,-1 -30,9 -36,19 z m 311,84 0,0 c 2,22 21,39 43,39 22,0 41,-18 39,-40 -1,-22 -20,-39 -42,-39 -22,0 -41,18 -40,40 z M 57,273 c -25,-2 -25.3,28 -7,32 l 63,12 c -7,11 -49,55 -24,60 13,4 48,-39 59,-53 l 134,27 c -15,31 -30,62 -45,94 l 106,0 c -14,-30 -29,-61 -43,-91 l 121,24 c 4,15 13,87 36,72 13,1 -1,-51 -2,-66 l 69,14 c 27,3 32,-27 1,-33 -7,-21 -9,-89 -31,-93 -22,-5 -52,53 -66,74 L 157,292 C 148,265 152,200 132,197.5 112,195 76,245 57,273 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 129,148 c -11,18 -4,43 16,53 19,11 44,5 56,-13 10,-32 -6,-59 -36,-59 -18,-1 -30,9 -36,19 z m 311,84 0,0 c 2,22 21,39 43,39 22,0 41,-18 39,-40 -1,-22 -20,-39 -42,-39 -22,0 -41,18 -40,40 z M 57,273 c -25,-2 -25.3,28 -7,32 l 63,12 c -7,11 -49,55 -24,60 13,4 48,-39 59,-53 l 134,27 c -15,31 -30,62 -45,94 l 106,0 c -14,-30 -29,-61 -43,-91 l 121,24 c 4,15 13,87 36,72 13,1 -1,-51 -2,-66 l 69,14 c 27,3 32,-27 1,-33 -7,-21 -9,-89 -31,-93 -22,-5 -52,53 -66,74 L 157,292 C 148,265 152,200 132,197.5 112,195 76,245 57,273 Z" id="path4165" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/police2.svg b/vtm-themes/resources/assets/symbols/amenity/police2.svg
old mode 100755
new mode 100644
index d846903b..a19573ff
--- a/vtm-themes/resources/assets/symbols/amenity/police2.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/police2.svg
@@ -1,42 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata1976"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 178.55078,226.45042 c 1.13144,8.8371 8.46479,15.38618 16.12978,14.40482 l 7.36403,-0.94286 c 7.66503,-0.98136 13.11183,-9.16674 11.9804,-18.00385 l -3.86245,-30.16762 c -1.13144,-8.8371 -8.46476,-15.38626 -16.12983,-14.40479 l -7.36398,0.94284 c -7.66503,0.98135 -13.11185,9.16674 -11.98042,18.00383 l 3.86247,30.16763 z m 14.31001,-2.18259 c -3.93581,-3.51488 -6.69751,-25.08498 -3.77415,-29.47806 2.9233,-4.39311 2.83007,-4.38119 6.76589,-0.86627 3.93581,3.51487 6.6975,25.08498 3.77414,29.47807 -2.92329,4.39311 -2.83006,4.38116 -6.76588,0.86626 z" id="rect3389" sodipodi:nodetypes="cccccccccczzzz" fill="#ffffff"/>
- <path sodipodi:nodetypes="cccccccccczzzz" id="path3395" d="m 259.93524,142.03746 c 7.60381,5.44209 17.71418,4.87846 22.23787,-1.23975 l 4.34607,-5.87792 c 4.52371,-6.11823 1.9559,-15.75568 -5.64791,-21.19783 L 254.91376,95.143927 c -7.60384,-5.44209 -17.71421,-4.878534 -22.23789,1.239758 l -4.34605,5.877905 c -4.52375,6.11821 -1.95593,15.75568 5.64791,21.19784 l 25.95751,18.57803 z m 8.17482,-11.66981 c -5.4262,0.30249 -23.98607,-12.98089 -25.3642,-18.15341 -1.37815,-5.17241 -1.43317,-5.09802 3.99307,-5.40052 5.42623,-0.30251 23.98606,12.98091 25.36421,18.1534 1.37813,5.17244 1.43318,5.09804 -3.99308,5.40053 z" fill="#ffffff"/>
- <path d="m 235.90887,119.66591 c 8.87648,-0.76323 15.72468,-7.81806 15.06273,-15.51721 l -0.36157,7.0331 c -0.66197,-7.69921 -8.6139,-13.48154 -17.49039,-12.718358 l -30.30208,2.605328 c -8.87647,0.7632 -15.72479,7.81798 -15.06272,15.51722 l 0.36155,-7.03313 c 0.66196,7.69921 8.61388,13.4815 17.49038,12.71834 l 30.3021,-2.60529 z m -1.58597,-14.38838 c -3.67543,3.7863 -25.34163,5.64915 -29.60948,2.54572 -4.26778,-3.10333 -3.98535,11.42022 -0.30991,7.63389 3.67542,-3.78631 25.34167,-5.64916 29.60946,-2.54574 4.26781,3.10336 3.98537,-11.42022 0.30993,-7.63387 z" id="path3397" sodipodi:nodetypes="cccccccccczzzz" fill="#ffffff"/>
- <path d="m 207.30775,126.38134 c 5.59935,-7.48875 5.24652,-17.60867 -0.77608,-22.25888 l -5.78609,-4.467607 c -6.02262,-4.650222 -15.7115,-2.283797 -21.31091,5.204947 l -19.11491,25.56475 c -5.59936,7.48876 -5.24662,17.60868 0.77609,22.25888 l 5.78606,4.46759 c 6.02262,4.65026 15.7115,2.28382 21.31092,-5.20494 l 19.11492,-25.56474 z m -11.49693,-8.41621 c 0.18935,5.43131 -13.4779,23.71034 -18.67803,24.98038 -5.19999,1.27007 -5.12676,1.32662 -5.31613,-4.10473 -0.18936,-5.43136 13.47793,-23.71035 18.67801,-24.98041 5.20004,-1.27005 5.1268,-1.32663 5.31615,4.10476 z" id="path3534" sodipodi:nodetypes="cccccccccczzzz" fill="#ffffff"/>
- <path sodipodi:nodetypes="cccccccccczzzz" id="path3536" d="m 178.13476,185.55291 c 2.94996,8.40668 11.48811,13.28199 18.77977,10.72335 l -6.90153,1.40149 c 7.29173,-2.55867 10.91132,-11.70018 7.96139,-20.10689 L 187.9041,148.87257 c -2.94992,-8.40667 -11.48805,-13.28211 -18.77976,-10.72335 l 6.90154,-1.4015 c -7.29172,2.55868 -10.91128,11.70014 -7.96139,20.10687 l 10.07027,28.69832 z m 13.53998,-5.11956 c -4.5824,-2.61661 -11.78276,-23.13609 -9.84008,-28.04238 1.9426,-4.90622 -12.05293,-1.01544 -7.47052,1.60115 4.5824,2.61658 11.78277,23.1361 9.8401,28.04235 -1.94264,4.90626 12.05292,1.01546 7.4705,-1.60112 z" fill="#ffffff"/>
- <g id="g3540" transform="matrix(0.74204582,0,0,0.74204582,67.476143,46.031302)">
-  <g transform="matrix(1.0907181,-0.2914957,0.2914957,1.0907181,-98.8285,72.452649)" id="g3490">
-   <g transform="matrix(0.9826633,-0.1853992,0.1853992,0.9826633,-60.17152,31.061258)" id="g3500">
-    <path sodipodi:nodetypes="cccsszzzssc" id="path3313" d="m 137.92957,221.66212 c -7.58542,0.60458 -11.32119,13.81445 -12.99324,20.91531 -0.79855,11.74113 9.76035,31.84764 15.41118,30.63495 40.72202,-3e-5 66.02183,27.71772 66.02183,68.43978 4e-5,40.72201 -27.11324,70.25322 -67.83529,70.25322 -16.18798,-3e-5 -24.46001,-14.39283 -40.587827,-11.81862 -15.673332,2.50166 -23.662466,9.76279 -28.251302,18.06731 -4.857361,8.79047 -9.926486,22.86389 6.128076,35.08654 16.487744,12.55244 31.261093,13.74345 53.039363,13.74342 67.62255,6e-5 127.14539,-57.70923 127.14531,-125.33187 -4e-5,-67.62265 -50.45552,-119.98994 -118.0781,-119.99004 z" fill="#ffffff"/>
-    <path sodipodi:nodetypes="csccssccc" id="path3325" d="m 133.09373,224.64754 c -64.403852,-4e-5 -117.1032,52.60083 -117.103104,117.00462 3.1e-5,47.37503 23.678013,91.92373 64.401738,110.29016 l 26.601846,-46.2725 c -30.109595,-5.8038 -45.895746,-25.45708 -45.895746,-61.65394 -6.2e-5,-43.94094 30.509229,-77.95879 74.450206,-77.95879 12.23459,3e-5 16.71534,4.92072 29.06145,9.41063 l 11.3262,-42.64562 c -13.2782,-5.25876 -27.74167,-8.17456 -42.84259,-8.17456 z" opacity=".8" fill="#ffffff"/>
-    <path sodipodi:nodetypes="ccsccscc" d="m 156.75706,289.14862 15.23845,10.68689 c 30.42126,23.19058 49.37576,21.86305 67.63242,-3.7246 18.25666,-25.58769 -19.43768,-82.55651 -19.43768,-82.55651 0,0 -0.55988,-0.3995 -0.55988,-0.3995 0,0 -66.13262,-17.11106 -84.38924,8.47659 -18.25666,25.58769 -13.34578,43.94302 18.47989,65.16529 l 15.06289,10.93293" id="path3374" fill="#ffffff" fill-rule="evenodd"/>
-   </g>
-  </g>
-  <path d="m 187.12038,514.0683 c 0,19.4203 -15.74327,35.16356 -35.16356,35.16356 -19.4203,0 -35.16356,-15.74326 -35.16356,-35.16356 0,-19.4203 15.74326,-35.16356 35.16356,-35.16356 19.42029,0 35.16356,15.74326 35.16356,35.16356 z" sodipodi:ry="35.163559" sodipodi:rx="35.163559" sodipodi:cy="514.0683" sodipodi:cx="151.95682" id="path3538" sodipodi:type="arc" fill="#ffffff"/>
- </g>
- <g id="g3548" transform="matrix(-0.54186052,0.50697067,0.50697067,0.54186052,241.93057,-91.527701)">
-  <g id="g3550" transform="matrix(1.0907181,-0.2914957,0.2914957,1.0907181,-98.8285,72.452649)">
-   <g id="g3552" transform="matrix(0.9826633,-0.1853992,0.1853992,0.9826633,-60.17152,31.061258)">
-    <path d="m 137.92957,221.66212 c -7.58542,0.60458 -11.32119,13.81445 -12.99324,20.91531 -0.79855,11.74113 9.76035,31.84764 15.41118,30.63495 40.72202,-3e-5 66.02183,27.71772 66.02183,68.43978 4e-5,40.72201 -27.11324,70.25322 -67.83529,70.25322 -16.18798,-3e-5 -24.46001,-14.39283 -40.587827,-11.81862 -15.673332,2.50166 -23.662466,9.76279 -28.251302,18.06731 -4.857361,8.79047 -9.926486,22.86389 6.128076,35.08654 16.487744,12.55244 31.261093,13.74345 53.039363,13.74342 67.62255,6e-5 127.14539,-57.70923 127.14531,-125.33187 -4e-5,-67.62265 -50.45552,-119.98994 -118.0781,-119.99004 z" id="path3554" sodipodi:nodetypes="cccsszzzssc" fill="#ffffff"/>
-    <path d="m 133.09373,224.64754 c -64.403852,-4e-5 -117.1032,52.60083 -117.103104,117.00462 3.1e-5,47.37503 23.678013,91.92373 64.401738,110.29016 l 26.601846,-46.2725 c -30.109595,-5.8038 -45.895746,-25.45708 -45.895746,-61.65394 -6.2e-5,-43.94094 30.509229,-77.95879 74.450206,-77.95879 12.23459,3e-5 16.71534,4.92072 29.06145,9.41063 l 11.3262,-42.64562 c -13.2782,-5.25876 -27.74167,-8.17456 -42.84259,-8.17456 z" id="path3556" sodipodi:nodetypes="csccssccc" opacity=".8" fill="#ffffff"/>
-    <path id="path3558" d="m 156.75706,289.14862 15.23845,10.68689 c 30.42126,23.19058 49.37576,21.86305 67.63242,-3.7246 18.25666,-25.58769 -19.43768,-82.55651 -19.43768,-82.55651 0,0 -0.55988,-0.3995 -0.55988,-0.3995 0,0 -66.13262,-17.11106 -84.38924,8.47659 -18.25666,25.58769 -13.34578,43.94302 18.47989,65.16529 l 15.06289,10.93293" sodipodi:nodetypes="ccsccscc" fill="#ffffff" fill-rule="evenodd"/>
-   </g>
-  </g>
-  <path sodipodi:type="arc" id="path3560" sodipodi:cx="151.95682" sodipodi:cy="514.0683" sodipodi:rx="35.163559" sodipodi:ry="35.163559" d="m 187.12038,514.0683 c 0,19.4203 -15.74327,35.16356 -35.16356,35.16356 -19.4203,0 -35.16356,-15.74326 -35.16356,-35.16356 0,-19.4203 15.74326,-35.16356 35.16356,-35.16356 19.42029,0 35.16356,15.74326 35.16356,35.16356 z" fill="#ffffff"/>
- </g>
- <path d="M 287.6875,25.0625 C 272.41161,37.008643 256.01475,48.391322 237.11047,53.712259 201.20204,65.107791 160.7002,60.414033 127.75,42.4375 119.76442,41.891892 115.58812,50.31637 109.23306,53.702178 94.143447,66.235988 78.306382,78.103405 64.125,91.59375 c -2.587389,5.722936 3.816552,10.18596 4.764815,15.5784 13.563158,29.81377 28.3726,62.13252 22.391435,95.7341 -6.105692,42.81579 -32.442664,79.65745 -40.080591,122.14596 -8.492787,54.88025 16.152824,114.42702 63.657481,144.18714 55.0913,38.30318 122.89175,51.32536 180.01686,85.76065 7.67782,3.62806 13.56669,-4.8136 20.00415,-7.38842 54.4043,-32.98846 118.58948,-48.56028 168.99585,-88.64283 28.88568,-21.5948 48.32841,-54.80724 53.78039,-90.48785 5.74572,-33.51024 -0.65606,-68.54754 -16.90555,-98.2645 -15.51203,-33.18508 -33.4428,-68.04724 -30.00081,-105.80243 2.68903,-27.36665 15.23092,-52.46165 24.84472,-77.85147 0.10994,-6.795344 -8.17884,-8.262472 -11.77613,-12.651977 C 486.81365,61.01643 470.13483,46.86311 451.66745,36.163247 c -11.4803,2.505969 -20.74452,11.507531 -32.47995,13.618003 -43.525,14.40095 -94.32737,5.198662 -129.5625,-24.5 -0.59909,-0.283146 -1.28983,-0.348406 -1.9375,-0.21875 z" id="path3610" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16"/>
- <path sodipodi:nodetypes="cccscccccsccc" d="m 299.36814,552.79365 0,0 c 87.57849,-60.48622 234.86567,-71.30416 236.1719,-209.53289 0.62341,-61.98162 -36.26078,-81.56678 -49.04661,-158.18473 -5.84658,-35.03514 25.93859,-99.834935 25.93859,-99.834935 l -61.067,-46.035909 C 414.77305,62.373172 346.03301,76.290957 288.27326,28.720954 232.49025,78.52803 163.23714,67.171581 125.73251,45.378908 L 66.579838,93.646237 c 0,0 34.391022,63.571493 29.9707,98.797203 -9.666746,77.03468 -45.728329,97.97381 -42.58992,159.88557 6.915079,138.07616 154.530342,143.42038 244.497622,200.61111 l 0,0" id="path4295" opacity=".1" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="9.548"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4140" d="m 145,51.4 c -18.8,4.5 -31,23 -46.6,34 -12.9,8.3 -23.3,22.7 -11.8,37 15,32.7 27.4,70 14.5,106 -14,43.6 -39.6,86 -31.5,134 4.9,45.9 32.7,88 73,110 45,28.7 107,51 151,72.9 24.9,-11.4 33.39752,-20.51553 62,-34 50.9,-24 110,-47.7 137,-100 23,-44 22.6,-99 -0.4,-143 -14.9,-33 -34.2205,-81.20497 -22.7205,-119.20497 C 481.40745,121.55155 502.54348,105.53602 484.2,89.3 467,74 450,57 429,45 412,48.7 398,62 380,63 340,72 308,46.7 286,35 271,38.9 261,54.8 246,59 213.5,73.7 175,68 145,51.4 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 145,51.4 c -18.8,4.5 -31,23 -46.6,34 -12.9,8.3 -23.3,22.7 -11.8,37 15,32.7 27.4,70 14.5,106 -14,43.6 -39.6,86 -31.5,134 4.9,45.9 32.7,88 73,110 45,28.7 107,51 151,72.9 24.9,-11.4 33.39752,-20.51553 62,-34 50.9,-24 110,-47.7 137,-100 23,-44 22.6,-99 -0.4,-143 -14.9,-33 -34.2205,-81.20497 -22.7205,-119.20497 C 481.40745,121.55155 502.54348,105.53602 484.2,89.3 467,74 450,57 429,45 412,48.7 398,62 380,63 340,72 308,46.7 286,35 271,38.9 261,54.8 246,59 213.5,73.7 175,68 145,51.4 Z" id="path4158" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 444.8,74.9 c 24.78695,22.245963 43.44099,26.48199 24.24099,48.16149 C 452.0795,153.9795 449.1,193.9 462.6,228.9 c 11.7,35.8 35,69 34.5,108 1.6,43.9 -19.5,88 -56,112 -45,33 -82.9441,37.53354 -151,80 C 234,493 169,482 120,436 81,397 72,334 95,285 c 36,-71 35,-101 0,-177 16,-15 32,-28.1 48,-42 43,25 102,20.6 139,-13 40.9,20 77,33.7 119,19.7 16.3,-7.6 23.49503,-20.022981 43.8,2.2 z" id="path4150" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.9" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 209.3,113.2 c -7.3,-5.6 -16.5,-1.6 -20.3,3.5 l -16.6,23.8 c -5.8,12.4 -3,20 7.3,25.9 l 8,24 c -5.3,7.4 -1,24.6 0.5,37 -14.8,5 -35.6,14.8 -38,30 -0.8,6.6 -2.2,14.2 0.5,19.7 18,20.2 47.9,25 74,23.7 24.7,28.5 12.4,76 -11.7,90 -8.4,4.3 -16.4,0.7 -24,2.5 -29.7,5.4 -29.5,42.6 -0.2,48 68,1.1 103,-87 80,-140 -6.3,-14 -15,-25.6 -25.4,-34.5 -2.5,-12 -14.2,-24 -24,-32.5 3.6,-16.3 -3,-44 -12.9,-50 l -8,-24.5 c 4.9,-9.4 13,-18.4 18.5,-27 l 17.9,-1.7 c 9.6,8 18.7,16 28,21.8 -1.8,13.2 -2.4,30 3.4,40.7 -4.9,91 70,122 120,107 13.9,-4.7 23.4,-8.7 31.5,-19.4 17.7,-24.8 -12.4,-50.6 -31,-35 -6.9,4.4 -10.4,12.9 -19.2,15.8 -43.8,7.7 -66,-21.5 -65.9,-56.6 23,-15.9 44,-52 38,-72 -15.9,-23.7 -32.6,-22.5 -59.7,-7.2 -7.7,-5.9 -15.6,-11.7 -23.4,-17.5 -7.3,-5.7 -15.7,-4.6 -21.8,2.7 -9,0.3 -17.2,1.2 -25.5,1.8 z m 55.9,27.8 c -5,-2 -13,-8.1 -17,-12.7 2.5,-2.5 4.8,-4.9 3.8,-8 6.7,4.9 12.5,7.9 18.25,12.05 1.95,0.65 -4.65,6.95 -5.05,8.65 z m -60.7,-8.9 c -1.5,5 -7.7,14.2 -12.2,18.6 -3.1,-2 -5.7,-3.2 -8.3,-0.7 4.1,-8.5 9,-18.6 15.35,-23.4 1.05,2.2 2.85,4.2 5.15,5.5 z m -4.1,92.8 c -2.1,-6.2 -3.2,-17.7 -1.9,-22.4 2.7,1.2 4.6,-0.2 6.2,-2.3 3.5,7.3 5.8,17.5 3.75,25.35 -2.75,-2.15 -5.25,-1.35 -8.05,-0.65 z" id="rect3389" fill="#734a08"/>
+ <path d="m 189.9,396.5 c -69,-6.3 -69.9,-102 -3.1,-111 l -6,-33.5 C 63,269 86,434 187,438 Z" id="path3325" opacity="0.8" fill="#734a08"/>
+ <path id="path3556" d="M 387,250 C 439,193 359.2,135 318,167 L 301,138 C 402,79 492,209 416,278.5 Z" opacity="0.8" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/post_box.svg b/vtm-themes/resources/assets/symbols/amenity/post_box.svg
old mode 100755
new mode 100644
index 7f787525..80a73ce1
--- a/vtm-themes/resources/assets/symbols/amenity/post_box.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/post_box.svg
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 126.19975,188.66899 L 226.02765,288.98257 L 126.19975,388.81046 L 126.19975,188.66899 z M 436.76562,169.86019 L 313.80202,292.35284 C 307.68915,298.46559 299.97235,301.52189 290.6516,301.52176 C 281.0066,301.52189 272.96602,298.3037 266.52985,291.86715 L 144.52289,169.86019 L 436.76562,169.86019 z M 456.06009,388.81046 L 356.23219,288.98257 L 456.06009,188.66899 L 456.06009,388.81046 z M 144.03721,407.61925 L 244.35077,307.79135 L 248.69241,312.13298 C 260.26985,323.38697 274.25623,329.01391 290.6516,329.0138 C 307.04649,329.01391 320.87099,323.38697 332.12515,312.13298 L 336.46676,307.79135 L 436.76562,407.61925 L 144.03721,407.61925 z M 99.193389,434.62562 L 484.0378,434.62562 L 484.0378,142.36816 L 99.193389,142.36816 L 99.193389,434.62562 z" id="flowRoot3192" fill="#ffffff"/>
+ <path id="path4141" d="m 484,435 0,-292 -385,0 0,292 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 484,435 0,-292 -385,0 0,292 z" id="flowRoot3192" fill="#734a08"/>
+ <path d="M 226,289 126,389 126,189 Z" id="path4156" opacity="0.9" fill="#ffffff"/>
+ <path d="m 314,292 c -6.1,6.1 -13.8,9.2 -23,9.2 -9.6,0 -17.7,-3.2 -24,-9.6 l -122,-122 292,0.2 z" id="path4154" opacity="0.9" fill="#ffffff"/>
+ <path d="m 356,289 100,-100 0,200 z" id="path4152" opacity="0.9" fill="#ffffff"/>
+ <path d="m 244,308 4.3,4.3 c 11.6,11.3 25.6,16.9 42,16.9 16.4,0 30,-5.6 41.5,-16.9 l 4.3,-4.3 100,100 -292.55,0 z" id="path4150" opacity="0.9" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/post_office.svg b/vtm-themes/resources/assets/symbols/amenity/post_office.svg
old mode 100755
new mode 100644
index c91b36a6..98597bc5
--- a/vtm-themes/resources/assets/symbols/amenity/post_office.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/post_office.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 131.79596,192.04629 L 228.24657,288.96614 L 131.79596,385.41673 L 131.79596,192.04629 z M 431.85502,173.87381 L 313.05143,292.22239 C 307.14536,298.12834 299.68963,301.08124 290.68421,301.08111 C 281.36551,301.08124 273.59696,297.97192 267.37853,291.75313 L 149.49921,173.87381 L 431.85502,173.87381 z M 450.49674,385.41673 L 354.04613,288.96614 L 450.49674,192.04629 L 450.49674,385.41673 z M 149.02996,403.5892 L 245.9498,307.1386 L 250.14455,311.33334 C 261.33031,322.2066 274.84352,327.64317 290.68421,327.64306 C 306.52444,327.64317 319.88125,322.2066 330.75466,311.33334 L 334.94939,307.1386 L 431.85502,403.5892 L 149.02996,403.5892 z M 105.70326,429.68191 L 477.52793,429.68191 L 477.52793,147.31187 L 105.70326,147.31187 L 105.70326,429.68191 z" id="flowRoot3192" fill="#ffffff"/>
- <path sodipodi:type="arc" id="path2207" sodipodi:cx="217.14285" sodipodi:cy="305.71429" sodipodi:rx="288.57144" sodipodi:ry="288.57144" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" transform="matrix(0.9469422,0,0,0.9469422,85.693279,2.9720757)" fill="none" stroke="#ffffff" stroke-width="25.14"/>
- <path transform="matrix(0.9469422,0,0,0.9469422,85.693279,2.9720757)" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" sodipodi:ry="288.57144" sodipodi:rx="288.57144" sodipodi:cy="305.71429" sodipodi:cx="217.14285" id="path3267" sodipodi:type="arc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-width="25.14"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4144" d="M 32,290 C 32,432 148,548 290,548 432,548 548,432 548,290 548,148 432,32 290,32 148,32 32,148 32,290 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 32,290 C 32,432 148,548 290,548 432,548 548,432 548,290 548,148 432,32 290,32 148,32 32,148 32,290 Z" id="path4183" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M 525,290 C 525,420 420,525 290,525 160,525 55,420 55,290 55,160 160,55 290,55 420,55 525,160 525,290 Z" id="circle4177" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M 122 163 L 122 417 L 457 417 L 457 163 L 122 163 z M 163 187 L 417 187.19922 L 310 293 C 304.7 298.3 298 301 290 301 C 281.6 301 274.59961 298.19961 269.09961 292.59961 L 163 187 z M 146 203 L 233 290 L 146 377 L 146 203 z M 434 203 L 434 377 L 347 290 L 434 203 z M 249 307 C 260.29741 318.49378 276.25955 325.22887 289.30078 325.40039 C 307.93883 323.32024 317.64861 318.35139 329 307 L 416 394 L 161 394 L 249 307 z " id="path4145" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/recycling.svg b/vtm-themes/resources/assets/symbols/amenity/recycling.svg
old mode 100755
new mode 100644
index 306860e3..707767c0
--- a/vtm-themes/resources/assets/symbols/amenity/recycling.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/recycling.svg
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 215.29767,353.28001 L 153.07069,244.8576 L 27.922348,244.8576 L 78.794486,274.30668 L 47.344036,328.50767 C 44.661797,333.4228 43.320736,338.55563 43.320819,343.90613 C 43.320736,349.25693 44.661797,354.38976 47.344036,359.3046 L 96.847881,445.63 C 99.080577,439.3808 101.31344,434.02333 103.54642,429.5576 L 165.11988,323.83094 L 215.29767,353.28001 z M 122.29416,440.27934 C 118.71329,446.07933 116.92292,452.32177 116.92307,459.00667 C 116.92292,469.27234 120.60575,477.97226 127.97157,485.10646 C 135.33707,492.24067 144.14591,495.80778 154.39813,495.80779 L 277.54508,495.80779 L 277.54508,396.10574 L 147.72002,396.10574 C 146.82124,397.88939 143.47198,403.68933 137.6722,413.5056 L 122.29416,440.27934 z M 288.92035,193.33194 L 413.39474,193.33194 L 476.29567,84.929954 L 425.44395,114.37903 L 393.97307,60.157607 C 388.17267,49.906007 379.25493,44.779997 367.21976,44.779546 L 268.1712,44.779546 C 272.1873,49.232072 275.53656,53.690954 278.21902,58.156212 L 339.09813,163.88287 L 329.07074,169.90746 L 288.92035,193.33194 z M 228.02081,50.130223 C 213.7385,50.130657 203.03039,56.373094 195.89641,68.857531 L 133.66943,175.93207 C 157.30473,189.76511 186.07983,206.27318 219.99482,225.45634 C 240.06293,191.1062 261.69701,153.63117 284.89713,113.03113 L 260.14522,68.857531 C 253.0107,56.373094 242.30259,50.130657 228.02081,50.130223 L 228.02081,50.130223 z M 387.96889,394.75786 L 387.96889,382.70866 L 387.96889,336.55408 L 325.72148,444.95607 L 387.96889,552.70454 L 387.96889,494.48033 L 450.19588,494.48033 C 462.24457,494.48033 471.38698,489.34751 477.62313,479.08186 L 527.14739,392.75646 C 520.46191,394.54011 514.88661,395.43188 510.42147,395.43179 L 387.96889,394.75786 z M 480.31888,211.40574 C 478.08551,212.74027 449.3036,229.24835 393.97307,260.93001 C 421.63812,308.6641 443.50366,346.36377 459.56974,374.02915 L 509.74753,374.02915 C 524.47831,374.02926 535.41108,367.78001 542.54588,355.2814 C 549.2302,343.23233 549.00556,330.96531 541.87193,318.48028 L 480.31888,211.40574 z" id="flowRoot3192" fill="#ffffff"/>
+ <path id="path4146" d="m 184.2,239 -100,0 40.7,23.6 -25,43 c -4.23491,8.05447 -3.850557,17.30188 0,24.6 l 39.6,69 c 1.8,-5 3.6,-9.3 5.4,-12.9 l 49,-85 40.05,24.15 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4148" d="m 164.4,430.8 c 5.9,5.7 12.9,8.6 21,8.6 l 99,0 0,-80 -104,0 c -6.78203,11.95881 -12.71982,22.08356 -20.4,35.4 -7.18414,12.33935 -4.47208,27.18332 4.4,36 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4150" d="m 293.1,196.7 100,0 50,-87 -40.7,23.6 -25,-43 C 372,83 365,79 356,79 l -79,0 c 3.2,3.6 5.9,7.1 8,10.7 l 48.7,85 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4152" d="m 218.3,98 -49.8,86 c 18.9,11 41.9,24.3 69,39.6 16,-27.5 33.4,-57 51.9,-90 L 270,98 C 264.3,88 255.7,83 244.15,83 232.6,83 224,88 218.3,98 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4154" d="m 372.3,312.5 -49.8,87 49.8,86 0,-46.6 49.8,0 c 9.6,0 16.9,-4.1 21.9,-12.3 l 39.6,-69 c -5.4,1.4 -9.8,2.1 -13.4,2.1 l -97.95,-0.6 c 0.0935,-15.53311 0.05,-31.06668 0.05,-46.6 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4156" d="m 377.1,251.8 c 22,38 39.6,68 53,91 l 40,0 c 11.8,0 20.5,-5 26,-15 5.4,-9.6 5.2,-19.4 -0.5,-29.4 l -49.25,-86.1 c -2.05,1 -25.05,14.2 -69.25,39.5 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 184.2,239 -100,0 40.7,23.6 -25,43 c -4.23491,8.05447 -3.850557,17.30188 0,24.6 l 39.6,69 c 1.8,-5 3.6,-9.3 5.4,-12.9 l 49,-85 40.05,24.15 z" id="path4144" fill="#734a08"/>
+ <path d="m 164.4,430.8 c 5.9,5.7 12.9,8.6 21,8.6 l 99,0 0,-80 -104,0 c -6.78203,11.95881 -12.71982,22.08356 -20.4,35.4 -7.18414,12.33935 -4.47208,27.18332 4.4,36 z" id="path4142" fill="#734a08"/>
+ <path d="m 293.1,196.7 100,0 50,-87 -40.7,23.6 -25,-43 C 372,83 365,79 356,79 l -79,0 c 3.2,3.6 5.9,7.1 8,10.7 l 48.7,85 z" id="path4140" fill="#734a08"/>
+ <path d="m 218.3,98 -49.8,86 c 18.9,11 41.9,24.3 69,39.6 16,-27.5 33.4,-57 51.9,-90 L 270,98 C 264.3,88 255.7,83 244.15,83 232.6,83 224,88 218.3,98 Z" id="path4138" fill="#734a08"/>
+ <path d="m 372.3,312.5 -49.8,87 49.8,86 0,-46.6 49.8,0 c 9.6,0 16.9,-4.1 21.9,-12.3 l 39.6,-69 c -5.4,1.4 -9.8,2.1 -13.4,2.1 l -97.95,-0.6 c 0.0935,-15.53311 0.05,-31.06668 0.05,-46.6 z" id="path4136" fill="#734a08"/>
+ <path d="m 377.1,251.8 c 22,38 39.6,68 53,91 l 40,0 c 11.8,0 20.5,-5 26,-15 5.4,-9.6 5.2,-19.4 -0.5,-29.4 l -49.25,-86.1 c -2.05,1 -25.05,14.2 -69.25,39.5 z" id="flowRoot3192" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/telephone.svg b/vtm-themes/resources/assets/symbols/amenity/telephone.svg
old mode 100755
new mode 100644
index e6407a79..f50d1f7e
--- a/vtm-themes/resources/assets/symbols/amenity/telephone.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/telephone.svg
@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3634" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3631" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2611">
-   <path id="path1325" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2608">
-   <path id="path1322" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g1331" transform="matrix(0.9537247,0.6649405,-0.6649405,0.9537247,190.65781,-211.89377)">
-  <path d="M 309.337,64.0439 C 286.958,66.5479 205.583,103.742 203.208,295.523 C 200.708,497.548 286.958,540.048 309.578,539.59 L 309.578,406.154 C 290.958,406.154 287.212,385.879 282.958,344.048 C 280.144,316.369 279.324,282.106 282.958,248.048 C 285.51,224.151 289.958,200.825 309.458,200.825 L 309.337,64.0439 z" id="path1333" fill="#ffffff"/>
-  <path d="M 357.583,539.825 C 366.208,539.825 372.394,532.798 372.394,524.923 L 372.456,524.861 C 372.456,524.861 372.394,420.861 372.394,420.798 C 372.394,412.548 365.708,406.044 357.583,406.044 L 319.784,406.044 L 319.784,539.825 C 319.784,539.825 357.491,539.883 357.522,539.852 L 357.583,539.825 z" id="path1335" fill="#ffffff"/>
-  <path d="M 357.583,200.825 C 366.208,200.825 372.394,193.798 372.394,185.923 L 372.456,185.861 C 372.456,185.861 372.394,78.8609 372.394,78.7979 C 372.394,70.5479 365.708,64.0439 357.583,64.0439 L 319.784,64.0439 L 319.784,200.825 C 319.784,200.825 357.491,200.883 357.522,200.852 L 357.583,200.825 z" id="path1337" fill="#ffffff"/>
- </g>
+ <path id="path4146" d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4148" d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4150" d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" id="path4152" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" id="path4154" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" id="path4156" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" id="path4138" fill="#734a08"/>
+ <path d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" id="path4136" fill="#734a08"/>
+ <path d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" id="path1333" fill="#734a08"/>
+ <path id="path4140" d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" fill="#734a08"/>
+ <path id="path4142" d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" fill="#734a08"/>
+ <path id="path4144" d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/amenity/toilets.svg b/vtm-themes/resources/assets/symbols/amenity/toilets.svg
old mode 100755
new mode 100644
index 8e015df2..92bfefcd
--- a/vtm-themes/resources/assets/symbols/amenity/toilets.svg
+++ b/vtm-themes/resources/assets/symbols/amenity/toilets.svg
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 282.64529,512.4583 L 318.45711,512.4583 L 318.45711,61.17178 L 282.64529,61.17178 L 282.64529,512.4583 z M 174.96393,143.59872 L 102.68057,143.59872 C 91.409786,143.59908 81.273089,147.65375 72.270419,155.76278 C 65.507937,162.05819 61.006552,169.04048 58.766246,176.7097 L 27.675745,280.06296 C 26.782291,282.3173 26.335581,284.34465 26.335632,286.14498 C 26.335581,296.50868 31.510451,301.69043 41.860261,301.69023 C 49.076158,301.69043 53.811209,297.63574 56.065415,289.52617 L 84.434463,194.93518 L 99.959105,194.93518 L 53.343962,363.14964 L 98.618995,363.14964 L 98.618995,494.21221 C 98.61888,505.92269 104.24733,511.77792 115.50436,511.77794 C 126.76111,511.77792 132.38957,505.92269 132.38972,494.21221 L 132.38972,362.4899 L 149.29569,362.4899 L 149.29569,494.89257 C 149.29553,506.14948 154.92397,511.77792 166.18106,511.77794 C 177.43776,511.77792 183.06622,506.14948 183.06641,494.89257 L 183.06641,363.14964 L 228.32083,363.14964 L 181.04594,194.93518 L 197.25095,194.93518 L 225.62,289.52617 C 227.87388,297.63574 232.60206,301.69043 239.80454,301.69023 C 250.16776,301.69043 255.34951,296.50868 255.34978,286.14498 C 255.34951,283.89107 254.9028,281.86372 254.00968,280.06296 L 222.91917,176.7097 C 220.66479,169.49405 215.48992,162.51175 207.39454,155.76278 C 197.4844,147.65375 186.6742,143.59908 174.96393,143.59872 L 174.96393,143.59872 z M 140.51284,136.15597 C 150.86243,136.15632 159.64183,132.55522 166.85111,125.35263 C 174.06002,118.1508 177.66455,109.59472 177.66475,99.68441 C 177.66455,89.32131 174.06002,80.53845 166.85111,73.33581 C 159.64183,66.13403 150.86243,62.53293 140.51284,62.5325 C 130.60277,62.53293 122.04326,66.13403 114.8343,73.33581 C 107.62508,80.53845 104.02054,89.32131 104.02065,99.68441 C 104.02054,109.59472 107.62508,118.1508 114.8343,125.35263 C 122.04326,132.55522 130.60277,136.15632 140.51284,136.15597 L 140.51284,136.15597 z M 456.528,135.49621 C 466.43739,135.49658 474.9969,131.89203 482.20653,124.68258 C 489.41507,117.47387 493.01961,108.91436 493.02017,99.00405 C 493.01961,88.65469 489.41507,79.98867 482.20653,73.00595 C 474.9969,66.02408 466.43739,62.53293 456.528,62.5325 C 446.61756,62.53293 438.06149,66.02408 430.85977,73.00595 C 423.65706,79.98867 420.05596,88.65469 420.05644,99.00405 C 420.05596,108.91436 423.65706,117.47387 430.85977,124.68258 C 438.06149,131.89203 446.61756,135.49658 456.528,135.49621 L 456.528,135.49621 z M 504.50386,142.91837 L 407.89239,142.91837 C 394.83447,142.9187 383.68753,147.53693 374.45153,156.77301 C 365.21467,166.00978 360.59646,177.3835 360.59688,190.89423 L 360.59688,303.03034 C 360.59646,313.8476 365.55141,319.25613 375.46177,319.25595 C 384.91767,319.25613 389.64585,313.8476 389.64631,303.03034 L 389.64631,193.59506 L 407.21203,193.59506 L 407.21203,490.85163 C 407.21155,504.36266 413.96707,511.11818 427.47858,511.1182 C 440.98911,511.11818 447.74462,504.36266 447.74513,490.85163 L 447.74513,318.57559 L 465.31086,318.57559 L 465.31086,490.85163 C 465.31033,504.36266 472.06584,511.11818 485.57741,511.1182 C 499.54147,511.11818 506.52377,504.36266 506.52433,490.85163 L 506.52433,193.59506 L 523.4097,193.59506 L 523.4097,303.03034 C 523.40911,314.28743 528.13728,319.91587 537.59423,319.91571 C 547.06371,319.91587 551.79875,314.28743 551.79936,303.03034 L 551.79936,191.55397 C 551.79875,178.49682 547.40733,167.12653 538.62508,157.44307 C 529.84162,147.76028 518.4679,142.9187 504.50386,142.91837 L 504.50386,142.91837 z" id="flowRoot3192" sodipodi:nodetypes="ccccccccccssccccccsccccsccccccssccccccssssssscccsccssscccccsccsccccsccccsccccsccccc" fill="#ffffff"/>
+ <path id="path4145" d="M 543,290 A 253,253 0 0 1 290,543 253,253 0 0 1 37,290 253,253 0 0 1 290,37 253,253 0 0 1 543,290 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 543,290 A 253,253 0 0 1 290,543 253,253 0 0 1 37,290 253,253 0 0 1 290,37 253,253 0 0 1 543,290 Z" id="path3267" fill="#734a08"/>
+ <path d="m 305.6,471 0,-361 -28.6,0 0,361 z" id="path4143" fill="#ffffff"/>
+ <path d="m 133.2,176 c -9,0 -17,3.2 -24.3,9.7 -5.4,5 -9,10.6 -10.8,16.8 l -24.9,83 c -3.3816,9.92675 3.72505,17.15425 11.3,17.3 5.8,0 9.6,-3.2 11.4,-9.7 l 22.7,-76 12.4,0 -37,135 36,0 0,105 c 0,9.4 4.5,14 13.5,14 9,0 13.5,-4.7 13.5,-14 l 0,-105 13.5,0 0,106 c 0,9 4.5,13.5 13.5,13.5 9,0 13.5,-4.5 13.5,-13.5 l 0,-105 36,0 -37.8,-135 13,0 22.7,76 c 1.8,6.5 5.6,9.7 11.3,9.7 10.17001,-1.81294 15.15147,-8.88598 11.3,-17.3 l -24.9,-83 c -1.8,-5.8 -5.9,-11.4 -12.4,-16.8 -7.9,-6.5 -16.6,-9.7 -25.8,-10.2 z" id="path4141" fill="#ffffff"/>
+ <path d="m 192.9,142 c -1.30386,-17.62038 -13.69624,-29.38975 -29.7,-29.6 -17.28496,1.33431 -28.98803,13.98417 -29.2,29.6 1.32728,16.94133 13.77172,28.88968 29.2,29.1 17.16182,-1.21895 29.4786,-13.38168 29.7,-29.1 z" id="path4139" fill="#ffffff"/>
+ <path d="m 445.3,141.4 c -1.23748,-17.25187 -13.38979,-28.98634 -29.1,-29.2 -17.3663,1.32487 -28.89595,13.49205 -29.1,29.2 1.28754,16.8883 13.71941,28.98335 29.1,29.2 16.94133,-1.32728 28.88968,-13.77172 29.1,-29.2 z" id="path4137" fill="#ffffff"/>
+ <path d="m 377.2,176.5 c -10.4,0 -19.4,3.7 -26.8,11 -7.4,7.4 -11,16.5 -11,27.3 l 0,90 c 0,8.6 4,13 11.9,13 7.6,0 11.4,-4.3 11.4,-13 l 0,-87 14,0 0,238 c 0,10.8 5.4,16.2 16.2,16.2 10.8,0 16.2,-5.4 16.2,-16.2 l 0,-138 14,0 0,138 c 0,10.8 5.4,16.2 16.2,16.2 11.2,0 16.8,-5.4 16.8,-16.2 l 0,-238 13.5,0 0,88 c 0,9 3.8,13.5 11.4,13.5 7.6,0 11.4,-4.5 11.4,-13.5 l 0,-89 c 0,-10.4 -3.5,-19.5 -10.5,-27.3 -7,-7.8 -16,-11.6 -27.5,-12.3 z" id="flowRoot3192" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/blocks.svg b/vtm-themes/resources/assets/symbols/barrier/blocks.svg
old mode 100755
new mode 100644
index f615a37a..5277545a
--- a/vtm-themes/resources/assets/symbols/barrier/blocks.svg
+++ b/vtm-themes/resources/assets/symbols/barrier/blocks.svg
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <g transform="translate(9.478562,-37.590682)" id="g2325" fill="#ffffff" stroke="#ffffff" stroke-width="5.2">
-  <path d="m 235.146,477.418 c 0,14.09 -11.422,25.512 -25.512,25.512 l -121.976,0 c -14.09,0 -25.512,-11.422 -25.512,-25.512 l 0,-260.974 c 0,-14.09 9.252043,-29.85191 25.512,-25.512 l 115.06098,37.77455 C 220.6064,234.67394 227.146,242.841 227.146,256.931 l 8,220.487 z" id="path6056" sodipodi:nodetypes="ccccccccc"/>
-  <path d="m 522.145,477.418 c 0,14.09 -11.422,25.512 -25.512,25.512 l -121.976,1 c -14.09,0 -25.512,-11.422 -25.512,-25.512 l 14.488,-186.975 c 0,-14.09 11.422,-25.512 25.512,-25.512 l 105.488,7.487 c 14.09,0 25.512,11.422 25.512,25.512 l 2,178.488 z" id="path6058"/>
- </g>
+ <path id="path4142" d="m 333.4082,239.80078 c -4.05705,52.83752 -7.97544,107.27619 -10.74218,151.79892 1.33172,12.36242 11.81493,23 25.33398,23 32.33334,-0.3331 64.66669,-0.66662 97.00003,-1 13.44016,0 24.05695,-9.94808 25.34375,-23 0.22336,-47.57134 -0.40528,-96.53651 -0.74417,-144.5997 0,-14.39987 -12.04379,-25.49157 -25.41406,-25.59375 l -84.09375,-6.00586 c -14.75458,1.04928 -25.63304,15.2893 -26.6836,25.40039 z" shape-rendering="auto" mix-blend-mode="normal" filter-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.8" fill="none" solid-opacity="1" image-rendering="auto" solid-color="#000000" stroke="#ffffff" color="#000000" stroke-linejoin="round" stroke-width="64" color-rendering="auto" filter-gaussianBlur-deviation="0" color-interpolation="sRGB"/>
+ <path id="path4144" d="m 102,163 c -4,4 -6,11 -6,17 l 0,208 c 0,13 10,23 23,23 l 97,0 c 13,0 23,-10 23,-23 l 0,0 0,0 -6,-176 c -0.45443,-5.5379 -2.1836,-11.15846 -5,-15 -4,-4 -9,-7 -16,-10 l -92,-30 c -6.96524,-1.59555 -14.15061,1.02707 -18,6 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 333.4082,239.80078 c -4.05705,52.83752 -7.97544,107.27619 -10.74218,151.79892 1.33172,12.36242 11.81493,23 25.33398,23 32.33334,-0.3331 64.66669,-0.66662 97.00003,-1 13.44016,0 24.05695,-9.94808 25.34375,-23 0.22336,-47.57134 -0.40528,-96.53651 -0.74417,-144.5997 0,-14.39987 -12.04379,-25.49157 -25.41406,-25.59375 l -84.09375,-6.00586 c -14.75458,1.04928 -25.63304,15.2893 -26.6836,25.40039 z" id="path4137" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" fill="#666666" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <path d="m 102,163 c -4,4 -6,11 -6,17 l 0,208 c 0,13 10,23 23,23 l 97,0 c 13,0 23,-10 23,-23 l 0,0 0,0 -6,-176 c -0.45443,-5.5379 -2.1836,-11.15846 -5,-15 -4,-4 -9,-7 -16,-10 l -92,-30 c -6.96524,-1.59555 -14.15061,1.02707 -18,6 z" id="path6056" fill="#666666"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/bollard.svg b/vtm-themes/resources/assets/symbols/barrier/bollard.svg
old mode 100755
new mode 100644
index bda0142e..65b7f2e3
--- a/vtm-themes/resources/assets/symbols/barrier/bollard.svg
+++ b/vtm-themes/resources/assets/symbols/barrier/bollard.svg
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <defs id="defs22">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
-   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
-   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
-   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
-   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 290,109.625 C 267.00676,109.97494 244.29858,119.7799 228.27689,136.27588 C 212.2552,152.77185 203.11669,175.75633 203.4375,198.75 L 203.4375,433.53125 C 222.81381,454.75952 359.10328,456.65758 379.21875,433.53125 L 379.21875,198.75 C 379.54566,175.3137 370.02902,151.8952 353.44673,135.33033 C 336.86444,118.76547 313.43595,109.27345 290,109.625 z" id="path4689" sodipodi:nodetypes="csccccsc" color="#000000" stroke-width="175.8" fill="#ffffff"/>
- <path d="M 293.09375,407.82285 C 259.66039,408.11377 223.34681,407.4427 194.125,415.46045 C 184.39475,418.23702 180.32117,422.97243 180.15538,427.85232 C 179.97524,433.15469 180.68429,448.12305 180.38851,460.9171 C 181.15967,469.35513 250.85878,446.48184 277.561,447.51498 C 313.91784,447.97152 403.73843,469.07255 403.32856,461.81048 C 403.31787,450.18896 403.4126,439.16108 403.26436,427.95697 C 403.22474,424.96229 401.82055,422.00164 397.40625,419.47885 C 384.65837,411.42986 359.97963,409.82547 338.91317,408.70425 C 323.7189,407.92177 308.38624,407.7491 293.09375,407.82285 z" id="path4725" sodipodi:nodetypes="ccscccsccc" color="#000000" stroke-width="35" fill="#ffffff"/>
- <path id="path4739" d="M 293.09375,441.82285 C 259.66039,442.11377 223.34681,441.4427 194.125,449.46045 C 173.80517,455.25881 176.02811,470.40474 198.1875,474.94133 C 221.58608,481.25804 250.85878,480.48184 277.561,481.51498 C 313.91784,481.97152 352.03125,481.68257 385.5625,475.12761 C 401.67721,470.7495 409.51982,460.40181 397.40625,453.47885 C 384.65837,445.42986 359.97963,443.82547 338.91317,442.70425 C 323.7189,441.92177 308.38624,441.7491 293.09375,441.82285 z" color="#000000" stroke-width="35" fill="#ffffff"/>
+ <path id="path4136" d="m 239,159 c -13,13 -20,31 -20,50 l 0,171 c -2,1 -5,1 -7,2 -8,2 -11,6 -11,10 l 0,25 c -1,5 4,10 14,12 19,6 42,5 64,6 29,0 59,0 86,-5 8,-3 14,-7 14,-11 l 0,0 0,-27 c 0,-2 -1,-5 -4,-7 -4,-2 -9,-4 -15,-5 l 0,-171 c 0,-19 -7,-38 -21,-51 -13,-13 -32,-21 -50,-21 -19,1 -37,8 -50,22 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 239,159 c -13,13 -20,31 -20,50 l 0,171 c -2,1 -5,1 -7,2 -8,2 -11,6 -11,10 l 0,25 c -1,5 4,10 14,12 19,6 42,5 64,6 29,0 59,0 86,-5 8,-3 14,-7 14,-11 l 0,0 0,-27 c 0,-2 -1,-5 -4,-7 -4,-2 -9,-4 -15,-5 l 0,-171 c 0,-19 -7,-38 -21,-51 -13,-13 -32,-21 -50,-21 -19,1 -37,8 -50,22 z" id="path4689" fill="#666666" color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/cycle_barrier.svg b/vtm-themes/resources/assets/symbols/barrier/cycle_barrier.svg
old mode 100755
new mode 100644
index c7661bc7..5e208d4a
--- a/vtm-themes/resources/assets/symbols/barrier/cycle_barrier.svg
+++ b/vtm-themes/resources/assets/symbols/barrier/cycle_barrier.svg
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <g transform="translate(-9.2012672,4.4650424)" id="g2325">
-  <line x1="221.75" y1="147" x2="155.75" y2="491.86" id="line6215" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="50"/>
-  <line x1="79.945" y1="499.45" x2="79.945" y2="211.91" id="line6217" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
-  <line x1="82.15" y1="255.08" x2="207.54" y2="255.08" id="line6219" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
-  <line x1="382.55" y1="147" x2="448.55" y2="491.86" id="line6221" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="50"/>
-  <line x1="524.35" y1="499.45" x2="524.35" y2="211.91" id="line6223" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
-  <line x1="522.15" y1="255.08" x2="396.75" y2="255.08" id="line6225" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
- </g>
+ <path id="path4138" d="m 380,421 c 10.8,34.4 53.8,16 49,-10 l -31,-161 49,0 0,172 c 0.7,28 36.7,19.7 34.8,-0.4 L 482,199 c -2,-25.7 -34.9,-19.4 -35,-0.4 l 0,16.4 -56,0 -13,-71 c -14,-35 -55.9,-17.8 -49,9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4140" d="m 189,215 -56,0 0,-16 c -3,-26 -34,-20 -35,0 l 0,223 c 4.3,25.9 34.9,18.6 35,-0.4 l 0,-171.6 49,0 -31,161 c -7.1,39.5 45.7,38 48.7,9.5 L 252,153 c 2,-35.8 -43.9,-37 -49.3,-9.5 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 380,421 c 10.8,34.4 53.8,16 49,-10 l -31,-161 49,0 0,172 c 0.7,28 36.7,19.7 34.8,-0.4 L 482,199 c -2,-25.7 -34.9,-19.4 -35,-0.4 l 0,16.4 -56,0 -13,-71 c -14,-35 -55.9,-17.8 -49,9 z" id="path4136" fill="#666666"/>
+ <path d="m 189,215 -56,0 0,-16 c -3,-26 -34,-20 -35,0 l 0,223 c 4.3,25.9 34.9,18.6 35,-0.4 l 0,-171.6 49,0 -31,161 c -7.1,39.5 45.7,38 48.7,9.5 L 252,153 c 2,-35.8 -43.9,-37 -49.3,-9.5 z" id="line6215" fill="#666666"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/gate.svg b/vtm-themes/resources/assets/symbols/barrier/gate.svg
old mode 100755
new mode 100644
index 1824fa5c..96cc9587
--- a/vtm-themes/resources/assets/symbols/barrier/gate.svg
+++ b/vtm-themes/resources/assets/symbols/barrier/gate.svg
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <defs id="defs22">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
-   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
-   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
-   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
-   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 68.690452,226.50324 451.760378,0" id="path2900" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
- <path sodipodi:nodetypes="cc" id="path3730" d="m 68.690452,360.07403 451.760378,0" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
- <path sodipodi:nodetypes="cc" d="M 132.37824,443.67778 452.51615,144.52914" id="path3732" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
+ <path id="path4137" d="m415 154c-15.3.1-23.8 14.5-34.7 23L333 220c-73 0-147 0-220 0-20 .2-30 27.8-15.3 41 11 10.6 27.3 5.8 41 6.9 48 0 95 0 142 0l-52 47.9c-39.5.3-79-.5-118 .4-19.8 2.6-26.7 31-10.3 42.6 11.8 8.3 26.9 3.9 40 5 12 0 24 0 36 0-10.3 10-22 18.8-31 30-10.9 16.7 6.3 40.6 25.6 35.6 13-3.8 21-16 31.5-24.3C217 392 232 378 247 364c74-.1 147 .1 220-.1 19.9-.8 29.5-28.6 14.2-41-11.3-10-27-5.3-41-6.5-47 0-94 0-141 0l52-47.9c38.7-.1 77 .2 116-.1 19.9-1 29-28.9 13.8-41.6-11.6-10-27.6-5.1-41.5-6.3-12 0-24 0-36 0 10.3-10 22-18.9 31-30 9.8-15.3-2.2-36.7-20.3-36.4z" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-width="64" opacity="0.8"/>
+ <path d="m415 154c-15.3.1-23.8 14.5-34.7 23L333 220c-73 0-147 0-220 0-20 .2-30 27.8-15.3 41 11 10.6 27.3 5.8 41 6.9 48 0 95 0 142 0l-52 47.9c-39.5.3-79-.5-118 .4-19.8 2.6-26.7 31-10.3 42.6 11.8 8.3 26.9 3.9 40 5 12 0 24 0 36 0-10.3 10-22 18.8-31 30-10.9 16.7 6.3 40.6 25.6 35.6 13-3.8 21-16 31.5-24.3C217 392 232 378 247 364c74-.1 147 .1 220-.1 19.9-.8 29.5-28.6 14.2-41-11.3-10-27-5.3-41-6.5-47 0-94 0-141 0l52-47.9c38.7-.1 77 .2 116-.1 19.9-1 29-28.9 13.8-41.6-11.6-10-27.6-5.1-41.5-6.3-12 0-24 0-36 0 10.3-10 22-18.9 31-30 9.8-15.3-2.2-36.7-20.3-36.4" id="path2900" fill="#666666"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/lift_gate.svg b/vtm-themes/resources/assets/symbols/barrier/lift_gate.svg
old mode 100755
new mode 100644
index 3e4da860..42c87b99
--- a/vtm-themes/resources/assets/symbols/barrier/lift_gate.svg
+++ b/vtm-themes/resources/assets/symbols/barrier/lift_gate.svg
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <defs id="defs22">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
-   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
-   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
-   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
-   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path sodipodi:nodetypes="cc" d="M 124.72631,239.07157 494.25422,156.69163" id="path3732" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="54.685"/>
- <path d="m 458.25,264.90625 c -3.72291,-0.002 -7.42352,1.53023 -10.05602,4.16273 -2.6325,2.6325 -4.16438,6.33311 -4.16273,10.05602 l 0,170.53125 c -0.002,3.72291 1.53023,7.42352 4.16273,10.05602 2.6325,2.6325 6.33311,4.16438 10.05602,4.16273 l 51.84375,0 c 3.72291,0.002 7.42352,-1.53023 10.05602,-4.16273 2.6325,-2.6325 4.16438,-6.33311 4.16273,-10.05602 l 0,-170.53125 c 0.002,-3.72291 -1.53023,-7.42352 -4.16273,-10.05602 -2.6325,-2.6325 -6.33311,-4.16438 -10.05602,-4.16273 l -51.84375,0 z" id="rect3827" sodipodi:nodetypes="csccsccsccscc" opacity=".75" color="#000000" stroke-width="28.422" fill="#ffffff"/>
- <path d="M 81.75 121.90625 C 77.111289 121.90642 72.498814 123.81369 69.21875 127.09375 C 65.938686 130.37382 64.031422 134.98629 64.03125 139.625 L 64.03125 446.15625 C 64.031422 450.79496 65.938686 455.40743 69.21875 458.6875 C 72.498814 461.96756 77.111289 463.87483 81.75 463.875 L 126.59375 463.875 C 131.23246 463.87483 135.84493 461.96756 139.125 458.6875 C 142.40506 455.40743 144.31233 450.79496 144.3125 446.15625 L 144.3125 291.6875 C 121.89709 298.56987 95.011402 292.47356 80.53125 273.4375 C 58.570596 247.16863 69.775915 200.74817 102.15625 188.5 C 116.20582 185.24621 130.2603 182.02206 144.3125 178.78125 L 144.3125 139.625 C 144.31233 134.98629 142.40506 130.37382 139.125 127.09375 C 135.84493 123.81369 131.23246 121.90642 126.59375 121.90625 L 81.75 121.90625 z " id="rect3925" opacity=".75" color="#000000" stroke-width="35.435" fill="#ffffff"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4149" d="m 376,171.8 c -75,16.7 -151,32.9 -226,50 -19,6.5 -23.5,35.9 -6.6,47 14.5,10.9 32.7,1.6 48,-0.8 90,-19.7 180,-38.9 269,-59 20,-6.7 23.6,-38 4.6,-48.7 -4,-2.6 -8.8,-4 -13.3,-4.25 C 426.5,159.6 402,166.8 376,171.8 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4151" d="m 398,413 c 0.3,13.9 13.7,25.4 27.4,24 13.8,-0.1 27.5,0.2 41,-0.1 13.5,-1 24,-14.2 22.9,-27.6 l 0,-132 C 489,264 475,253 462,254 l -39,0 c -14.4,-0.4 -26.8,13 -25.2,27.2 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4153" d="m 95.4,175.5 c 0.1,79 -0.2,158 0.1,237 1.3,17.8 19.7,31 37,28 14.2,-0.9 29,2.4 42.8,-2.8 13.4,-6.1 20,-21.6 18.3,-35.8 l 0,-137 c -15.3,4 -32.7,13.7 -47.9,4 -16.9,-9.3 -12.9,-37.7 4.3,-44 14,-3.8 31.8,-5.3 43,-11.4 -0.4,-16.9 1,-34 -0.9,-50.8 -3.8,-16 -21,-26 -37,-23.8 C 146,139 136,139 127,139 108.2,138.2 92.6,157.2 95.4,175.5 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 376,171.8 c -75,16.7 -151,32.9 -226,50 -19,6.5 -23.5,35.9 -6.6,47 14.5,10.9 32.7,1.6 48,-0.8 90,-19.7 180,-38.9 269,-59 20,-6.7 23.6,-38 4.6,-48.7 -4,-2.6 -8.8,-4 -13.3,-4.25 C 426.5,159.6 402,166.8 376,171.8 Z" id="path3732" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#666666" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 398,413 c 0.3,13.9 13.7,25.4 27.4,24 13.8,-0.1 27.5,0.2 41,-0.1 13.5,-1 24,-14.2 22.9,-27.6 l 0,-132 C 489,264 475,253 462,254 l -39,0 c -14.4,-0.4 -26.8,13 -25.2,27.2 z" id="rect3827" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#666666" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 95.4,175.5 c 0.1,79 -0.2,158 0.1,237 1.3,17.8 19.7,31 37,28 14.2,-0.9 29,2.4 42.8,-2.8 13.4,-6.1 20,-21.6 18.3,-35.8 l 0,-137 c -15.3,4 -32.7,13.7 -47.9,4 -16.9,-9.3 -12.9,-37.7 4.3,-44 14,-3.8 31.8,-5.3 43,-11.4 -0.4,-16.9 1,-34 -0.9,-50.8 -3.8,-16 -21,-26 -37,-23.8 C 146,139 136,139 127,139 108.2,138.2 92.6,157.2 95.4,175.5 Z" id="rect3925" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#666666" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/barrier/stile.svg b/vtm-themes/resources/assets/symbols/barrier/stile.svg
old mode 100755
new mode 100644
index 2a627a3d..97350903
--- a/vtm-themes/resources/assets/symbols/barrier/stile.svg
+++ b/vtm-themes/resources/assets/symbols/barrier/stile.svg
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <defs id="defs22">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
-   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
-   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3077">
-   <path id="path3298" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker3074">
-   <path id="path3295" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#666666" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 97.6875,138.375 C 92.456765,138.45674 87.300035,140.68383 83.65625,144.4375 C 80.012464,148.19118 77.926326,153.4254 78,158.65625 L 78,178.65625 L 78,187.5 L 68.6875,187.5 C 62.083592,187.4066 55.484286,190.0505 50.78125,194.6875 C 46.078213,199.3245 43.34375,205.89543 43.34375,212.5 C 43.34375,219.10457 46.078213,225.6755 50.78125,230.3125 C 55.484286,234.9495 62.083592,237.5934 68.6875,237.5 L 78,237.5 L 78,313.0625 L 68.6875,313.0625 C 62.083592,312.9691 55.484286,315.613 50.78125,320.25 C 46.078213,324.887 43.34375,331.45793 43.34375,338.0625 C 43.34375,344.66707 46.078213,351.238 50.78125,355.875 C 55.484286,360.512 62.083592,363.1559 68.6875,363.0625 L 78,363.0625 L 78,409.34375 L 78,429.34375 L 78,449.34375 L 118,449.34375 L 118,429.34375 L 118,409.34375 L 118,363.0625 L 212.3125,363.0625 L 212.3125,335 L 212.3125,334 L 212.3125,333 L 387.6875,333 L 387.6875,363.0625 L 474,363.0625 L 474,409.34375 L 474,429.34375 L 474,449.34375 L 514,449.34375 L 514,429.34375 L 514,409.34375 L 514,363.0625 L 520.4375,363.0625 C 527.04141,363.1559 533.64071,360.512 538.34375,355.875 C 543.04679,351.238 545.78125,344.66707 545.78125,338.0625 C 545.78125,331.45793 543.04679,324.887 538.34375,320.25 C 533.64071,315.613 527.04141,312.9691 520.4375,313.0625 L 514,313.0625 L 514,237.5 L 520.4375,237.5 C 527.04141,237.5934 533.64071,234.9495 538.34375,230.3125 C 543.04679,225.6755 545.78125,219.10457 545.78125,212.5 C 545.78125,205.89543 543.04679,199.3245 538.34375,194.6875 C 533.64071,190.0505 527.04141,187.4066 520.4375,187.5 L 514,187.5 L 514,178.65625 L 514,158.65625 C 514.07514,153.32123 511.9007,147.98864 508.125,144.21875 C 504.3493,140.44885 499.02239,138.29164 493.6875,138.375 C 488.45677,138.45674 483.30004,140.68383 479.65625,144.4375 C 476.01247,148.19118 473.92633,153.4254 474,158.65625 L 474,178.65625 L 474,187.5 L 118,187.5 L 118,178.65625 L 118,158.65625 C 118.07514,153.32123 115.9007,147.98864 112.125,144.21875 C 108.3493,140.44885 103.02239,138.29164 97.6875,138.375 z M 118,237.5 L 474,237.5 L 474,313.0625 L 118,313.0625 L 118,237.5 z" id="path2900" sodipodi:nodetypes="csccccsssccccsssccccccccccccccccccccccccsssccccsssccccsssccccccscccccc" opacity=".75" color="#000000" stroke-width="50" fill="#ffffff"/>
- <path d="M 232,468 L 372,468" id="path4403" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-width="50"/>
- <path id="path4405" d="M 240.31579,386 L 359.68421,386" fill="none" stroke="#ffffff" stroke-width="50"/>
+ <path id="path4140" d="m 121.8,138.8 c -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,59 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,67.4 32,0 0,-67.4 75,0 c 0,-7.86667 0,-15.73333 0,-23.6 l 140,0 0,23.6 69,0 0,67.4 32,0 0,-67.4 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-59 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.6,-4.6 -4.2,0.1 -8.3,1.8 -11.2,4.8 -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 -285,0 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.1,-4.7 -3.7,0 -7.8,1.7 -10.7,4.7 z m 311.5,73.4 0,59 -285,0 0,-59 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4142" d="m 247,354 95,0 0,-50 -95,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4144" d="m 215,418 c 54,0 108,0 162,0 l 0,-50 c -54,0 -108,0 -162,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 121.8,138.8 c -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,59 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,67.4 32,0 0,-67.4 75,0 c 0,-7.86667 0,-15.73333 0,-23.6 l 140,0 0,23.6 69,0 0,67.4 32,0 0,-67.4 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-59 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.6,-4.6 -4.2,0.1 -8.3,1.8 -11.2,4.8 -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 -285,0 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.1,-4.7 -3.7,0 -7.8,1.7 -10.7,4.7 z m 311.5,73.4 0,59 -285,0 0,-59 z" id="path2900" opacity="0.8" fill="#666666" color="#000000"/>
+ <path d="m 247,354 95,0 0,-50 -95,0 z" id="path4138" fill="#666666" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 215,418 c 54,0 108,0 162,0 l 0,-50 c -54,0 -108,0 -162,0 z" id="path4403" fill="#666666" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/bench.svg b/vtm-themes/resources/assets/symbols/bench.svg
new file mode 100644
index 00000000..38162eaa
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/bench.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
+ <metadata id="metadata7"/>
+ <path id="path4141" d="M 72.400391 148.19922 L 72 244 L 144 244 L 144 292 L 48 292 L 48 349 L 77.699219 363.30078 L 102.59961 363.30078 C 97.999609 371.00078 96 380 96 388 C 96 414.5 117.5 436 144 436 C 170.5 436 192 414.5 192 388 C 192 379.5 189.70039 371.1 185.40039 364 C 255.40039 364.1 324.40039 364.1 394.40039 364 C 390.10039 371.3 387.80078 379.7 387.80078 388 C 387.80078 414.5 409.30078 436 435.80078 436 C 462.30078 436 483.80078 414.5 483.80078 388 C 483.80078 379.5 481.49922 371.09922 477.19922 363.69922 L 502.09961 363.69922 L 531.80078 349.40039 L 531.80078 292.40039 L 435.80078 292.40039 L 435.80078 244.40039 L 507.80078 244.40039 L 507.80078 148.40039 L 72.400391 148.19922 z M 168.80078 244.40039 L 411.80078 244.40039 L 411.80078 292.40039 C 330.00078 292.00039 249 292 168 292 L 168.80078 244.40039 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 72.400391 148.19922 L 72 244 L 144 244 L 144 292 L 48 292 L 48 349 L 77.699219 363.30078 L 102.59961 363.30078 C 97.999609 371.00078 96 380 96 388 C 96 414.5 117.5 436 144 436 C 170.5 436 192 414.5 192 388 C 192 379.5 189.70039 371.1 185.40039 364 C 255.40039 364.1 324.40039 364.1 394.40039 364 C 390.10039 371.3 387.80078 379.7 387.80078 388 C 387.80078 414.5 409.30078 436 435.80078 436 C 462.30078 436 483.80078 414.5 483.80078 388 C 483.80078 379.5 481.49922 371.09922 477.19922 363.69922 L 502.09961 363.69922 L 531.80078 349.40039 L 531.80078 292.40039 L 435.80078 292.40039 L 435.80078 244.40039 L 507.80078 244.40039 L 507.80078 148.40039 L 72.400391 148.19922 z M 168.80078 244.40039 L 411.80078 244.40039 L 411.80078 292.40039 C 330.00078 292.00039 249 292 168 292 L 168.80078 244.40039 z " id="path4138" fill="#734a08"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/cable_car.svg b/vtm-themes/resources/assets/symbols/cable_car.svg
old mode 100755
new mode 100644
index 631a9269..424dfef9
--- a/vtm-themes/resources/assets/symbols/cable_car.svg
+++ b/vtm-themes/resources/assets/symbols/cable_car.svg
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="204.29" height="239.29" version="1.0">
- <metadata id="metadata7"/>
- <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(-287.67859,-355.57647)">
-  <path id="path3161" d="m 391.42857,358.07647 0,145.71428" inkscape:connector-curvature="0" fill="none" stroke="#000000" stroke-width="5"/>
-  <rect id="rect3195" width="204.29" height="160" x="287.68" y="434.86" stroke-width="15" rx="43.33"/>
-  <rect ry="32.857" y="449.86" x="431.96" height="91.43" width="51.43" id="rect2989" fill="#ffffff" stroke-width="15" rx="25.714"/>
-  <rect id="rect2991" width="68.57" height="131.43" x="356.25" y="449.86" ry="47.23" fill="#ffffff" stroke-width="15" rx="34.29"/>
-  <rect id="rect2993" width="51.43" height="91.43" x="296.25" y="449.86" ry="32.857" fill="#ffffff" stroke-width="15" rx="25.714"/>
- </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
+ <metadata id="metadata3003"/>
+ <path id="path3760" d="m489 124l-402 0c-14.8 0-26.9 11.8-26.9 26.4l0 283c0 14.5 12 26.5 26.9 26.5l402 0c15 .1 27-10.9 27-25.9l0-283c0-14.5-12-26.4-26.9-26.4"/>
+ <path d="m 84,176 0,89 c 0,8 7,15 16,15 l 89,0 c 8,0 15,-7 15,-15 l 0,-89 c 0,-9 -7,-16 -15,-16 l -89,0 c -9,0 -16,7 -16,16 z m 144,0 0,89 c 0,9 7,16 16,15 l 89,0 c 8,0 15,-7 15,-15 l 0,-89 c 0,-9 -7,-16 -16,-16 l -89,0 c -8,0 -15,7 -15,16 z m 144,0 0,89 c 0,8 7,15 16,15 l 89,0 c 8,0 15,-7 15,-15 l 0,-89 c 0,-9 -7,-16 -15,-16 l -89,0 c -9,0 -16,7 -16,16 z" id="path3758-6" opacity="0.7" fill="#ffffff"/>
+ <path id="rect3015" d="m276 3.6l24 0 0 132-24 0z"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/chair_lift.svg b/vtm-themes/resources/assets/symbols/chair_lift.svg
new file mode 100644
index 00000000..bb1292a0
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/chair_lift.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" height="580" width="580">
+ <metadata id="metadata3003"/>
+ <path id="path15" d="m 156.2,183.43782 30,170 c 5.7,30.7 27.3,56.9 58,66 8.1,2.5 16.3,3.8 24.4,3.8 l 59,0.2 c 26.7,0 26.8,-36 0.2,-35.8 l -56,-0.2 c -5.4,-0.4 -11.2,-0.6 -16.6,-2.3 -18,-5.7 -30.7,-20.8 -34,-38 l -30.2,-169.5 c -2.1,-11.9 -9.9,-17.3 -17.8,-17.7 -10.1,-0.4 -19.8,8.3 -17,23.5 z m 113.40613,-23.43784 c -23.41349,0 -42.39388,-18.98035 -42.39388,-42.39385 0,-23.413508 18.98039,-42.393859 42.39388,-42.393859 23.41349,0 42.39387,18.980351 42.39387,42.393859 0,23.4135 -18.98038,42.39385 -42.39387,42.39385 z M 420,4.6386719 317.51758,235.22656 310.5,194.1875 c -1.5,-8.35 -16.2,-21.14961 -34.25,-21.84961 -20.25,-0.7 -36.25,15.30078 -36.25,35.30078 5.38217,38.23946 12.86696,78.74425 17.18359,103.67188 C 261.50022,336.23818 276.2,349.03711 294,349.03711 l 90,0 0.19922,111.10156 c 0.2,5.1 8.10078,12.59961 17.80078,12.59961 9.7,0 17.60078,-7.49961 17.80078,-12.59961 L 420,323.03711 c 0,-14.6 -12,-26.5 -27,-26.5 l -65,0 -3.81445,-22.31445 L 444,4.6386719 Z"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/chair_lift_2.svg b/vtm-themes/resources/assets/symbols/chair_lift_2.svg
deleted file mode 100644
index a32d3d89..00000000
--- a/vtm-themes/resources/assets/symbols/chair_lift_2.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="120.72" height="214.97" version="1.0">
- <metadata id="metadata7"/>
- <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(-343.74564,-365.25068)">
-  <path id="path3161" d="m 374.28571,367.36557 0,104.27894" inkscape:connector-curvature="0" fill="none" stroke="#000000" stroke-width="4.23"/>
-  <path d="m 409.10714,403.4336 0,68.57143 -62.85714,104.28572 0,-58.57144 62.85714,-114.28571 z" id="path3275" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" fill="#d40000" fill-rule="evenodd" stroke="#000000" stroke-width="5"/>
-  <path d="m 409.56325,470.57211 52.40537,-1.42855 -63.36064,108.58011 -52.36234,0 63.31761,-107.15156 z" id="path3277" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" fill="#d40000" fill-rule="evenodd" stroke="#000000" stroke-width="5"/>
- </g>
-</svg>
diff --git a/vtm-themes/resources/assets/symbols/education/nursery3.svg b/vtm-themes/resources/assets/symbols/education/nursery3.svg
old mode 100755
new mode 100644
index 31424b77..210b608f
--- a/vtm-themes/resources/assets/symbols/education/nursery3.svg
+++ b/vtm-themes/resources/assets/symbols/education/nursery3.svg
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <defs id="defs22">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2959">
-   <path id="path2626" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2956">
-   <path id="path2623" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#39AC39" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 68.564095,150.51046 318.30511,232.32214 313.99924,528.35134 85.78763,423.9338 68.564095,150.51046 z" id="path3933" sodipodi:nodetypes="ccccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30.447"/>
- <path d="M 514.22263,131.13401 318.30511,232.32214 315.0757,529.42783 494.84619,405.63379 514.22263,131.13401 z" id="path3935" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30.447"/>
- <path d="M 273.09339,62.239925 70.986184,148.08842 318.30511,231.24568 512.06968,129.25014 273.09339,62.239925 z" id="path3937" sodipodi:nodetypes="ccccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30.447"/>
- <path d="m 68.837859,135.30745 c -4.195247,-0.0822 -8.386918,1.63409 -11.288544,4.66517 -2.901644,3.03108 -4.469507,7.33125 -4.204406,11.51892 l 17.220788,273.40161 c 0.341089,5.47059 3.883904,10.62375 8.86957,12.9012 L 307.68271,542.21337 c 4.58364,2.09005 10.20101,1.71741 14.45624,-0.9791 4.25524,-2.6965 7.01696,-7.6336 7.08414,-12.67082 l 4.3196,-296.03629 c 0.0923,-6.43689 -4.36479,-12.68188 -10.48222,-14.68663 L 73.330238,136.05618 c -1.44873,-0.47251 -2.968712,-0.72584 -4.492379,-0.74873 z m 68.883151,102.92157 c 4.73153,-0.10724 10.61429,0.74335 17.68155,2.53417 9.4229,2.38795 19.70104,6.03411 30.75552,11.00057 17.74515,7.97282 31.99031,15.52983 42.85039,22.63468 10.8598,7.10515 20.04867,15.8446 27.53022,26.26314 5.25385,7.24653 9.54633,16.05482 12.8436,26.49352 3.29692,10.43883 5.11851,19.86225 5.47149,28.16377 l 3.28289,77.81031 c 0.35257,8.30151 1.12482,15.09753 2.24619,20.21571 1.12093,5.11807 3.38258,11.97679 6.79616,20.67647 l -55.57879,-24.93847 c -2.42329,-5.54036 -4.00057,-9.64058 -4.78036,-12.32525 -0.78006,-2.68497 -1.63913,-6.75576 -2.53416,-12.15246 -7.39539,5.03762 -14.84151,7.62199 -22.34671,7.83287 -10.26572,0.16495 -22.30299,-2.81228 -36.16941,-9.04236 -18.4241,-8.27766 -32.65475,-19.43063 -42.62001,-33.46246 -9.96535,-14.03191 -15.2318,-28.22606 -15.83852,-42.50483 -0.56913,-13.39322 2.40926,-22.85367 8.92716,-28.39414 6.51787,-5.54034 18.92139,-6.24609 37.26372,-2.131 21.9894,4.88518 36.22826,7.78205 42.7352,8.69679 6.50675,0.91489 13.39025,1.39192 20.61887,1.38227 -0.35287,-8.3015 -2.09409,-14.79574 -5.24111,-19.46698 -3.14727,-4.67112 -8.50543,-8.69657 -16.0689,-12.09487 -9.69692,-4.35658 -16.9001,-5.85596 -21.59798,-4.49238 -3.66427,1.06818 -6.52135,4.86954 -8.524,11.46133 l -56.84588,-32.25298 c 1.65353,-10.33155 4.3142,-17.79453 8.06325,-22.4619 3.74905,-4.66704 9.34109,-7.68084 16.70243,-9.04235 1.3211,-0.24784 2.80002,-0.36741 4.37719,-0.40317 z m 41.00736,118.93287 c -3.72921,0.0927 -6.36578,0.67569 -7.89046,1.72784 -3.14179,2.17144 -4.57481,5.60299 -4.37719,10.25184 0.22568,5.31303 2.0219,10.36956 5.4139,15.20498 3.39181,4.83551 8.21079,8.68707 14.51384,11.51892 6.5938,2.96254 12.68233,3.86853 18.19989,2.76454 5.51735,-1.10423 9.30888,-3.75782 11.46133,-7.94805 2.1522,-4.19033 3.06431,-10.47874 2.70695,-18.89104 l -0.46076,-10.77019 c -8.00436,-0.33897 -16.33781,-1.28822 -25.05365,-2.70695 -5.9345,-0.87477 -10.78463,-1.24461 -14.51385,-1.15189 z" id="path4040" opacity=".9" color="#000000" stroke-width="16.52" fill="#ffffff"/>
- <path d="M 513.3125 115.9375 C 511.20609 116.0615 509.12687 116.62954 507.25 117.59375 L 311.3125 218.78125 C 306.4314 221.31096 303.14522 226.65881 303.09375 232.15625 L 299.84375 529.25 C 299.77435 534.8007 303.00695 540.26503 307.90625 542.875 C 312.80556 545.48497 319.15082 545.12297 323.71875 541.96875 L 503.46875 418.1875 C 507.22329 415.60673 509.70863 411.26329 510.03125 406.71875 L 529.40625 132.21875 C 529.71345 127.91179 528.09798 123.50835 525.0625 120.4375 C 522.02702 117.36665 517.62273 115.68021 513.3125 115.9375 z M 461.5625 269.53125 C 462.25094 269.52983 462.915 269.54579 463.5625 269.59375 C 473.92225 270.36154 480.77761 276.20573 484.03125 287.21875 L 437.34375 319.40625 C 436.34014 315.08976 434.0598 312.71018 430.46875 312.28125 C 426.87744 311.85265 421.86377 313.51522 415.4375 317.1875 C 407.32415 321.82408 400.52348 328.27279 395.03125 336.625 C 389.53887 344.97748 386.30011 354.72607 385.34375 365.84375 C 384.49134 375.75152 386.33691 381.85958 390.875 384.15625 C 395.41293 386.45311 401.56952 385.40699 409.28125 381 C 415.7075 377.32766 421.23019 372.6653 425.875 367.0625 C 430.51961 361.45985 434.21548 354.82445 436.9375 347.15625 L 483.09375 325.5 C 479.73578 336.12048 474.84597 346.48689 468.40625 356.53125 C 461.96625 366.57577 454.06108 376.05257 444.625 384.96875 C 435.18869 393.88494 423.43257 402.34162 409.375 410.375 C 395.79924 418.13306 384.61333 423.37433 375.78125 426.15625 C 366.94909 428.93826 359.48545 429.55123 353.4375 427.9375 C 347.38945 426.32392 342.82704 422.97961 339.75 417.90625 C 336.67293 412.83298 335.63473 404.34292 336.65625 392.46875 C 337.72328 380.06531 340.85484 368.47086 346.0625 357.65625 C 349.87648 349.72378 354.85217 341.7182 360.96875 333.65625 C 367.08529 325.59445 373.27355 318.6626 379.5 312.875 C 389.37796 303.70646 401.77739 294.85106 416.71875 286.3125 C 436.29897 275.12323 451.23586 269.55251 461.5625 269.53125 z " id="path4042" opacity=".6" color="#000000" stroke-width="30.447" fill="#ffffff"/>
- <path d="M 272.6875 47.03125 C 270.79129 47.07792 268.90452 47.482987 267.15625 48.21875 L 65.03125 134.0625 C 59.373254 136.44928 55.514248 142.55121 55.75 148.6875 C 55.985752 154.82379 60.300556 160.58562 66.125 162.53125 L 313.46875 245.6875 C 317.35931 246.99091 321.77677 246.63243 325.40625 244.71875 L 519.15625 142.71875 C 524.50425 139.90126 527.82203 133.66764 527.1875 127.65625 C 526.55296 121.64487 522.00589 116.23257 516.1875 114.59375 L 277.21875 47.59375 C 275.74798 47.180323 274.21472 46.989986 272.6875 47.03125 z M 315.15625 111.25 C 316.30703 111.25571 317.47734 111.28437 318.65625 111.3125 C 337.51877 111.76271 357.44413 115.62593 378.4375 122.9375 C 392.43299 127.81202 403.01991 132.89652 410.1875 138.1875 C 417.35489 143.47859 420.49283 148.43682 419.59375 153.0625 C 418.69437 157.68824 414.49029 161.72165 406.96875 165.125 C 400.53017 168.03834 392.77409 170.05297 383.71875 171.1875 C 376.7916 172.00325 366.96664 172.09121 354.25 171.46875 L 373.21875 178.0625 L 338.8125 193.625 L 161.9375 132.03125 L 199.03125 115.25 L 260.34375 136.59375 C 258.86662 133.14006 259.16056 129.91284 261.25 126.90625 C 263.33953 123.8997 267.21881 121.12195 272.875 118.5625 C 283.81904 113.61065 297.8945 111.16428 315.15625 111.25 z M 313.21875 134.03125 C 306.8919 133.98402 301.88295 134.79371 298.25 136.4375 C 293.25566 138.69738 291.64996 141.37903 293.4375 144.53125 C 295.2252 147.68357 301.16452 151.02956 311.21875 154.53125 C 322.23824 158.36919 331.76691 160.42938 339.8125 160.75 C 347.85812 161.07074 354.24633 160.18222 359 158.03125 C 363.39262 156.0437 364.63768 153.5114 362.75 150.46875 C 360.86228 147.42622 354.18956 143.9123 342.6875 139.90625 C 332.55278 136.37654 323.66401 134.45737 316 134.125 C 315.042 134.08347 314.12259 134.038 313.21875 134.03125 z " id="path4044" opacity=".75" color="#000000" stroke-width="30.447" fill="#ffffff"/>
+ <path id="path4143" d="M 267.7,48.2 65,134 c -6.484346,3.30467 -11.877074,10.91674 -11.6,17.4 L 71,425 c 0.3,5.5 3.5,10.3 8.5,12.8 L 305,541 c 5.3,4.6 13,5 18.7,1 L 504,418 c 3.6,-2.7 5.8,-6.8 6,-11.3 L 529,132 c -0.3688,-8.45181 -5.43286,-15.06109 -12.8,-17.4 L 277,47.6 c -2.99801,-1.126334 -6.72717,-0.439814 -9.3,0.6 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 267.7,48.2 65,134 c -6.484346,3.30467 -11.877074,10.91674 -11.6,17.4 L 71,425 c 0.3,5.5 3.5,10.3 8.5,12.8 L 305,541 c 5.3,4.6 13,5 18.7,1 L 504,418 c 3.6,-2.7 5.8,-6.8 6,-11.3 L 529,132 c -0.3688,-8.45181 -5.43286,-15.06109 -12.8,-17.4 L 277,47.6 c -2.99801,-1.126334 -6.72717,-0.439814 -9.3,0.6 z" id="path4772" fill="#39ac39"/>
+ <path d="M 471,134 317,215 114,146 274,78 Z" id="path4770" opacity="0.2" fill="#ffffff"/>
+ <path d="M 480,397 331,500 333,242 497,157 Z" id="path4768" opacity="0.4" fill="#ffffff"/>
+ <path d="M 303,243 299,505 100,414 85,172 Z" id="path4763" opacity="0.1" fill="#ffffff"/>
+ <path d="m 297,112 c -14,3 -40,6 -37,25 l -61,-22 -37,17 177,62 32,-15 c 3,-3 -10,-4 -14,-7 -2,-2 22,1 30,-1 17,0 47,-18 23,-33 -28,-17 -62,-25 -95,-27 -6.07812,-0.46316 -12.45647,0.95107 -18,1 z m 64,44 c -19,10 -42,2 -60.5,-5 -18.5,-7 1.5,-17 14.5,-18 15,2 47,6 46,23 z" id="path4749" fill="#ffffff"/>
+ <path d="m 108,271 54,31 c 5,0 11,-11 23,-10 16,4 32,17 31,35 -19,0 -37,-4 -55,-8 -17,-4 -41,-11 -51,8 -10,31 9,66 34,84 20,13 44,26 69,19 15,-13 11,9 18,19 l 47,21 c 15,10 2,-10 1,-19 -3,-34 -3,-68 -5,-102 -4,-33 -23,-63 -52,-79 -27,-14 -54,-30 -85,-31 -18,0 -28,15 -29,32 z m 88,89 c 12,1 23,-1 22,16 -4,20 -17,31 -33,21 -13,-5 -27,-24 -17,-32 9.03852,-7.74001 18.7737,-5.08293 28,-5 z" id="path4754" fill="#ffffff"/>
+ <path id="path4167" d="m 437,320 c -11.9,-18.4 -37,7.5 -44,20.4 -6,12.5 -16.7,41 3.5,45 C 416,382 431,365 437,347 l 46,-21 c -15.6,49 -60,83 -107,101 -14,6.2 -35.8,2.2 -38.6,-15.4 -5.7,-42 20.9,-81 52,-106 21,-15 44,-31.5 71,-34.4 11.2,-0.9 21,6.2 23.6,17 z" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/education/school.svg b/vtm-themes/resources/assets/symbols/education/school.svg
old mode 100755
new mode 100644
index f671c546..55ba5996
--- a/vtm-themes/resources/assets/symbols/education/school.svg
+++ b/vtm-themes/resources/assets/symbols/education/school.svg
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3634" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3631" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2611">
-   <path id="path1325" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2608">
-   <path id="path1322" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#39AC39" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path id="path3526" d="M 109.53419,508.69651 L 154.37168,400.14257 L 221.63981,361.34754 L 223.27508,214.21996 L 241.78563,173.98248 L 289.0426,62.097177 M 471.71115,508.69651 L 437.81131,426.6232 L 329.70819,251.33902 L 333.85002,160.40114 L 292.20274,62.097177" sodipodi:nodetypes="ccccccccccc" opacity=".75" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="30.787"/>
- <path d="M 73.249534,149.81914 L 73.249534,423.82196 L 510.99983,423.82196 L 510.99983,149.81914 L 73.249534,149.81914 z M 143.22544,175.69932 C 155.48659,175.69942 165.32433,176.41043 172.76156,177.78385 C 180.19859,179.15747 186.40374,182.02353 191.36194,186.37851 C 194.84589,189.39366 197.59367,193.64677 199.60383,199.17429 C 201.61375,204.70197 202.61825,209.99166 202.61838,215.01668 L 202.61838,262.12694 C 202.61825,267.15205 202.94382,271.11311 203.58046,273.96064 C 204.21686,276.80821 205.60535,280.44218 207.74951,284.86431 L 169.36218,284.86431 C 167.82105,282.11721 166.81655,280.01918 166.34763,278.57867 C 165.87853,277.13804 165.4055,274.86202 164.93658,271.7799 C 159.57642,276.93901 154.22685,280.63292 148.93383,282.84392 C 141.69764,285.79195 133.30825,287.26953 123.72712,287.26953 C 110.99685,287.26953 101.33578,284.3144 94.736179,278.41832 C 88.136549,272.52217 84.826659,265.25415 84.826667,256.61097 C 84.826657,248.50385 87.221095,241.82567 91.978192,236.59953 C 96.735261,231.37349 105.51008,227.50436 118.30735,224.95826 C 133.65058,221.87626 143.57595,219.71979 148.13209,218.4802 C 152.6881,217.24074 157.53539,215.61572 162.62756,213.60561 C 162.62748,208.58061 161.59376,205.06483 159.51681,203.05471 C 157.43967,201.04476 153.77502,200.04025 148.549,200.04016 C 141.84883,200.04024 136.82629,201.10317 133.47627,203.24713 C 130.86318,204.92224 128.73448,208.08465 127.12649,212.70767 L 88.033629,208.57068 C 89.507642,201.73664 91.634918,196.35934 94.415483,192.43967 C 97.196016,188.5202 101.21547,185.12267 106.44159,182.24153 C 110.19362,180.1646 115.33299,178.5702 121.89915,177.43109 C 128.46522,176.29217 135.58725,175.69943 143.22544,175.69932 z M 424.18737,175.69932 C 441.6076,175.69943 454.87206,178.83264 464.01784,185.06365 C 473.16339,191.29486 479.60649,200.39383 483.29168,212.38697 L 444.77607,217.51811 C 443.56996,212.96209 441.38426,209.53538 438.2018,207.22376 C 435.01915,204.91231 430.73397,203.76033 425.37395,203.76024 C 418.60677,203.76032 413.14181,206.18253 408.9543,211.04004 C 404.76667,215.8977 402.66861,223.25482 402.66866,233.10394 C 402.6686,241.88114 404.73603,248.52728 408.89017,253.08331 C 413.04419,257.63943 418.36451,259.94624 424.7967,259.94621 C 430.1567,259.94624 434.64636,258.55631 438.298,255.80923 C 441.94948,253.0622 444.69871,248.83688 446.50782,243.14174 L 485.37621,247.56734 C 483.23204,255.67452 479.71627,262.70749 474.8253,268.63708 C 469.9341,274.56667 463.70117,279.17598 456.09664,282.45909 C 448.49191,285.74209 438.83084,287.36574 427.10571,287.36574 C 415.78245,287.36574 406.35789,286.30139 398.8203,284.19084 C 391.28263,282.08031 384.78112,278.68426 379.35405,273.96064 C 373.92691,269.23708 369.67237,263.68164 366.59033,257.31651 C 363.50826,250.95142 361.9723,242.50074 361.97232,231.9815 C 361.97232,220.99336 363.83241,211.86519 367.58449,204.56198 C 370.33151,199.20198 374.08382,194.38532 378.84093,190.13066 C 383.598,185.87615 388.50369,182.71519 393.52881,180.63805 C 401.50191,177.35509 411.72509,175.69943 424.18737,175.69932 z M 162.62756,234.19431 C 156.99938,236.20439 151.11837,237.97688 145.02134,239.51786 C 136.71313,241.72896 131.45408,243.91607 129.24309,246.06007 C 126.96498,248.27115 125.84366,250.78241 125.84371,253.59643 C 125.84367,256.81252 126.96642,259.44205 129.21102,261.48555 C 131.4555,263.52911 134.73332,264.56426 139.08846,264.56424 C 143.64448,264.56426 147.90045,263.44006 151.8201,261.229 C 155.73958,259.01799 158.51659,256.33004 160.1582,253.14746 C 161.79965,249.96493 162.62748,245.82865 162.62756,240.73651 L 162.62756,234.19431 z M 240.42845,255.13577 L 281.73413,255.13577 L 281.73413,306.1906 C 285.82115,301.90263 290.45969,298.68179 295.65234,296.53765 C 300.84488,294.3937 306.57553,293.3308 312.87373,293.33068 C 325.87187,293.3308 336.62649,297.99854 345.13576,307.34511 C 353.64479,316.69185 357.89934,330.10523 357.89947,347.59248 C 357.89934,359.25073 355.94874,369.53376 352.0628,378.41138 C 348.1766,387.28906 342.79929,393.90588 335.93178,398.29455 C 329.06404,402.68312 321.4412,404.90089 313.06614,404.90089 C 305.89693,404.90089 299.33843,403.33287 293.3754,400.2508 C 288.88626,397.83885 284.01261,393.31853 278.71958,386.68535 L 278.71958,402.4636 L 240.42845,402.4636 L 240.42845,255.13577 z M 300.30244,323.89303 C 294.74129,323.8931 290.22243,325.92991 286.70491,330.0504 C 283.18732,334.17104 281.41338,340.43603 281.41343,348.81113 C 281.41338,357.99034 283.15809,364.6379 286.60871,368.75843 C 290.05922,372.87903 294.39995,374.9479 299.69311,374.94787 C 304.58412,374.9479 308.6912,372.90824 312.00784,368.85464 C 315.32432,364.8011 317.01062,357.97544 317.01071,348.39422 C 317.01063,339.95211 315.38559,333.77905 312.13612,329.82592 C 308.88648,325.87292 304.92545,323.89311 300.30244,323.89303 z" id="rect3530" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
- <rect y="149.82" x="73.26" height="273.99" width="437.75" id="rect3544" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.525"/>
+ <path d="M 284.92932,46.525818 C 274,47 277.04368,53.955904 267.7207,73.837891 258.14927,95.491303 248.6831,117.59262 239.3125,140 L 73,140 c -13.9,1.3 -9.600781,16.99922 -10.300781,26.69922 l 0,258 c 1.3,13.9 17.001172,9.60078 26.701172,10.30078 l 33.503909,0 c -9.35603,24.05463 -18.65769,47.79942 -27.9043,71 -4,15 18,26 27,13 11.43556,-27.48546 22.78885,-55.58967 34.0957,-84 l 268.52149,0 c 11.53623,28.63732 23.2612,56.45785 35.38281,83 9.2,12.9 31.6,2.00078 27,-13.19922 C 477.2881,481.96215 467.70803,458.61482 458.19922,435 l 53.20117,0 c 13.9,-1.3 9.59883,-16.99922 10.29883,-26.69922 l 0,-258 C 519.99922,136.00078 504,141 495,140 l -152.89453,0 C 329.91675,110.2758 317.5796,81.154335 305,53 302.1875,48.03125 295.85864,46.051636 284.92932,46.525818 Z M 291,98 c 6.25468,13.82083 12.3721,27.84172 18.38477,42 l -36.17188,0 C 279.12468,125.82297 285.04917,111.78088 291,98 Z" id="path4144" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4137" d="M267 76C206 214 150 368 95 506 91 521 113 532 122 519 179 382 234 230 291 98 353 235 402 391 460 518c9.2 12.9 31.6 2 27-13.2C425 359 368 194 305 53 302 47.7 295 45.8 289 46 274 47 272 59 267 76" fill="#ffffff" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 95,506 c -4,15 18,26 27,13 57,-137 112,-289 169,-421 62,137 111,293 169,420 9.2,12.9 31.6,2 27,-13.2 C 425,359 368,194 305,53 302,47.7 295,45.8 289,46 274,47 277.04348,53.956522 267.7205,73.838509 206.7205,211.83851 150,368 95,506 Z" id="path3526" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 62.7,166.7 0,258 c 1.3,13.9 17,9.6 26.7,10.3 l 422,0 c 13.9,-1.3 9.6,-17 10.3,-26.7 l 0,-258 C 520,136 504,141 495,140 l -422,0 c -13.9,1.3 -9.6,17 -10.3,26.7 z" id="rect3544" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M 241 256 L 241 402 L 279 402 C 279 397 278 389 280 387 C 288 399 303 406 319 403 C 355 399 378 324 334 300 C 318 291 294 294 281 306 L 281 256 L 241 256 z M 299.5 324 C 318 324 319 349 316 363 C 309 380 284 378 282 360 C 279 347 281 324 299.5 324 z " id="path4147" fill="#ffffff"/>
+ <path d="M 156.68359 176.89453 C 151.71191 176.85938 146.0625 177 139.5 177 C 122 177 102 180 93 196 C 87 205 88 208 99 209 C 108 211 118 211 127 212 C 131 198 151 197 161 204 C 169 214 156 218 149 219 C 132 223 114 225 98 233 C 79 244 83 276 103 283 C 123 291 148 286 164 272 C 167 278 164 286 178 285 C 188 285 197 285 207 284 C 198 263 204 240 202 217 C 202 201 194 187 177 180 C 171.375 177.5 164.96973 176.95312 156.68359 176.89453 z M 162 234 C 167 246 158 264 144 264 C 122 270 118 242 139 238 C 146 236 155 236 162 234 z " id="path4142" fill="#ffffff"/>
+ <path d="m 368,206.5 c -9.6,22.5 -6.3,54 15,68 19.5,14 45,13.6 67.9,8.6 16.6,-4.1 27.9,-18 33.5,-33.6 C 464,246 451,244 447,244 c -4,14 -24,21 -35,12 -14,-11 -11,-35 -1,-47 13,-13 34,-5 38,8 25,-3.5 45,7.9 27,-17.6 C 465,182 448,176 424,177 c -25,-0.5 -46.6,8.3 -56,29.5 z" id="path4166" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/education/university.svg b/vtm-themes/resources/assets/symbols/education/university.svg
old mode 100755
new mode 100644
index 977404e3..1a7531e2
--- a/vtm-themes/resources/assets/symbols/education/university.svg
+++ b/vtm-themes/resources/assets/symbols/education/university.svg
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3634" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3631" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2611">
-   <path id="path1325" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker2608">
-   <path id="path1322" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 272.88678,135.49087 L 24.554768,260.20708 L 334.04076,264.35727 L 559.5004,146.80474 L 272.88678,135.49087 z" id="path2662" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 127.2667,365.3754 L 154.09984,286.09352 L 341.09332,291.42596 L 465.59678,223.64726 L 515.40623,281.48345 C 515.40623,281.48345 452.5225,288.41485 425.1209,305.43773 C 397.7193,322.4606 362.17606,363.44383 362.17606,363.44383 C 362.17606,363.44383 284.79228,336.638 249.00949,336.03614 C 180.69074,334.88703 131.50867,364.45854 127.2667,365.3754 z" id="path2664" sodipodi:nodetypes="cccccscsc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 134.25,280.09375 L 104.21875,280.53125 C 100.02835,287.5158 97.009988,296.28576 93.78125,306.71875 C 89.128683,321.75255 85.191392,339.76671 82.875,357.71875 C 74.146268,425.36641 74.125,456.65625 74.125,456.65625 L 94.125,456.65625 C 94.125,456.65625 94.08782,427.17095 102.71875,360.28125 C 104.88395,343.50095 108.62408,326.36097 112.875,312.625 C 117.12592,298.88903 123.05253,288.10333 124.5625,286.625 C 128.09983,283.16179 131.17852,281.42336 133.1875,280.53125 C 133.63538,280.33236 133.96818,280.20769 134.25,280.09375 z" id="path2666" fill="#ffffff" fill-rule="evenodd" stroke-width="20"/>
- <path d="M 106.46373,433.24868 C 106.46373,446.35545 91.82635,480.99284 78.719573,480.99284 C 65.612797,480.99284 58.975414,446.35545 58.975414,433.24868 C 58.975414,420.1419 69.612797,409.50452 82.719573,409.50452 C 95.82635,409.50452 106.46373,420.1419 106.46373,433.24868 z" id="path3462" sodipodi:nodetypes="csssc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="15.475"/>
- <path id="path3466" d="M 81.949709,438.15162 L 69.214311,492.79019 L 81.949709,438.15162 z" sodipodi:nodetypes="ccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 106.41283,437.87281 L 88.618917,496.4658 L 106.41283,437.87281 z" id="path3468" sodipodi:nodetypes="ccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path sodipodi:nodetypes="ccc" id="path3471" d="M 56.079496,432.50244 L 51.793515,485.72506 L 56.079496,432.50244 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path sodipodi:nodetypes="ccc" id="path3482" d="M 65.682673,436.61091 L 61.396692,489.83353 L 65.682673,436.61091 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path sodipodi:nodetypes="ccc" d="M 91.949709,440.15162 L 79.214311,494.79019 L 91.949709,440.15162 z" id="path3484" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path id="path4155" d="m 42.6,243.7 288,3.5 209,-109 c 4.2,-2.2 2.8,-8.5 -2,-8.7 l -266,-9.8 -231,115.15 c -4.3,2.35 -2.8,8.85 2,8.85 z m 120,14 c -2,-0.1 -3.9,1.2 -4.5,3.1 l -24.8,73 c -1.2,3.4 1.8,6.7 5.4,6 73.48294,-36.2841 149.88762,-27.80931 217.4,-2.4 43.28593,-48.43133 83.19649,-67.21816 140.8,-74.1 3.7,-0.4 5.4,-4.8 3,-7.6 L 451,202 c -0.9,-1.1 -116.7,60.5 -116.7,60.5 z M 111,248 c -21,37.9 -25,87 -28.8,124 -24.572451,7.23369 -16.973863,47.73377 -19,72.6 -0.372542,7.00789 7.375016,6.7936 9.1,1.5 -1.560988,6.78747 2.952867,8.53492 7.2,6.3 1.93466,5.29774 6.718935,5.66442 9.3,-0.2 -0.617692,5.75194 5.811108,7.11473 8.6,3.1 0.02276,5.08361 6.31592,6.88635 9,0.8 8.70178,-23.74187 29.26634,-56.23234 12.9,-77.2 1.8,-29.8 3.2,-55 13.9,-90 3.1,-8.4 5,-18.7 14.4,-24 L 144,247.2 Z" mix-blend-mode="normal" isolation="auto" white-space="normal" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 42.6,243.7 288,3.5 209,-109 c 4.2,-2.2 2.8,-8.5 -2,-8.7 l -266,-9.8 -231,115.15 c -4.3,2.35 -2.8,8.85 2,8.85 z m 120,14 c -2,-0.1 -3.9,1.2 -4.5,3.1 l -24.8,73 c -1.2,3.4 1.8,6.7 5.4,6 73.48294,-36.2841 149.88762,-27.80931 217.4,-2.4 43.28593,-48.43133 83.19649,-67.21816 140.8,-74.1 3.7,-0.4 5.4,-4.8 3,-7.6 L 451,202 c -0.9,-1.1 -116.7,60.5 -116.7,60.5 z M 111,248 c -21,37.9 -25,87 -28.8,124 -24.572451,7.23369 -16.973863,47.73377 -19,72.6 -0.372542,7.00789 7.375016,6.7936 9.1,1.5 -1.560988,6.78747 2.952867,8.53492 7.2,6.3 1.93466,5.29774 6.718935,5.66442 9.3,-0.2 -0.617692,5.75194 5.811108,7.11473 8.6,3.1 0.02276,5.08361 6.31592,6.88635 9,0.8 8.70178,-23.74187 29.26634,-56.23234 12.9,-77.2 1.8,-29.8 3.2,-55 13.9,-90 3.1,-8.4 5,-18.7 14.4,-24 L 144,247.2 Z" id="path2662" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/bar.svg b/vtm-themes/resources/assets/symbols/food/bar.svg
old mode 100755
new mode 100644
index 17b1e051..6de1c99b
--- a/vtm-themes/resources/assets/symbols/food/bar.svg
+++ b/vtm-themes/resources/assets/symbols/food/bar.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" id="path1329" inkscape:connector-curvature="0" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 468.232,97.93 -0.251,0 c 0.287,-0.248 0.445,-0.498 0.445,-0.75 0,-5.937 -81.067,-10.75 -181.07,-10.75 -100.002,0 -181.07,4.813 -181.07,10.75 0,0.252 0.158,0.502 0.446,0.75 l -0.446,0 160.474,148.535 0,168.073 -103.962,74.32 0.255,0 c -0.5,0.27 -0.765,0.544 -0.765,0.821 0,4.102 55.996,7.425 125.07,7.425 69.075,0 125.07,-3.323 125.07,-7.425 0,-0.277 -0.266,-0.552 -0.765,-0.821 l 0.06,0 -103.962,-74.32 0,-168.072 L 468.232,97.93 z m -175.71,119.639 c -2.895,2.679 -7.631,2.679 -10.526,0 l -77.535,-71.768 c -2.895,-2.679 -2.036,-4.872 1.909,-4.872 l 161.779,0 c 3.944,0 4.804,2.192 1.909,4.872 l -77.536,71.768 z" id="path2209" inkscape:connector-curvature="0" fill="#ffffff"/>
+ <path id="path4133" d="m 468.1,97.2 c 0,-5.9 -81,-10.8 -181,-10.8 -100,0 -181,4.8 -181,10.8 51.64415,50.6351 106.67027,100.13669 160,149.8 l 0,168 c -34.34272,24.51831 -69.25673,49.67779 -104.5,74.8 0,4.1 56,7.4 125,7.4 69,0 125,-3.3 125,-7.4 C 375.74331,463.63472 338.14159,437.22747 306.9,415 l 0,-168 C 370.6306,189.65724 408.28133,154.1855 468.1,97.2 Z M 281.5,218 l -77,-71.8 c -2.9,-2.7 -2,-4.9 1.9,-4.9 l 162,0 c 3.9,0 4.8,2.2 1.9,4.9 L 292.65,218 c -3.55,2.7 -8.25,2.7 -11.15,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 468.1,97.2 c 0,-5.9 -81,-10.8 -181,-10.8 -100,0 -181,4.8 -181,10.8 51.64415,50.6351 106.67027,100.13669 160,149.8 l 0,168 c -34.34272,24.51831 -69.25673,49.67779 -104.5,74.8 0,4.1 56,7.4 125,7.4 69,0 125,-3.3 125,-7.4 C 375.74331,463.63472 338.14159,437.22747 306.9,415 l 0,-168 C 370.6306,189.65724 408.28133,154.1855 468.1,97.2 Z M 281.5,218 l -77,-71.8 c -2.9,-2.7 -2,-4.9 1.9,-4.9 l 162,0 c 3.9,0 4.8,2.2 1.9,4.9 L 292.65,218 c -3.55,2.7 -8.25,2.7 -11.15,0 z" id="path2209" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/biergarten.svg b/vtm-themes/resources/assets/symbols/food/biergarten.svg
old mode 100755
new mode 100644
index 2c343bbe..36b3947a
--- a/vtm-themes/resources/assets/symbols/food/biergarten.svg
+++ b/vtm-themes/resources/assets/symbols/food/biergarten.svg
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 116.54107,83.44698 119.71194,-21.335331 132.2871,13.796881 8.04386,363.39512 18.58841,29.06501 c 0,0 -60.31626,57.03706 -152.88947,58.17487 C 149.7097,527.68134 96.478545,469.75328 96.478545,469.75328 L 119.96006,433.80197 116.54107,83.44698 z" id="path2381" sodipodi:nodetypes="ccccczccc" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
- <path d="m 236.0545,60.223867 c -40.46871,0.891164 -80.28965,3.700653 -119.25773,17.024737 l 4.51683,354.207986 -0.31085,0.003 c -14.38283,9.26374 -22.611953,25.14847 -22.502276,36.74159 0.308947,32.65614 67.030646,58.51127 148.992656,57.73585 81.96211,-0.77541 148.1049,-27.88751 147.79595,-60.54364 -0.0969,-10.24616 -6.75576,-24.79773 -18.34426,-33.0909 l -2.89526,-2.07107 2.15553,-355.436922 C 328.6489,61.788933 281.91903,59.213884 236.0545,60.223867 z" id="path3839" sodipodi:nodetypes="ccccssscccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="35"/>
- <path d="m 380.69607,125.54711 93.65276,-3.97915 c 15.19172,2.89537 23.02298,11.79419 23.60885,26.60258 l -23.30581,194.30227 c -0.64884,14.16236 -9.75565,20.02526 -22.23803,22.57588 l -69.37862,7.74857" id="path3841" sodipodi:nodetypes="cccccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.869"/>
- <path d="m 120.54369,427.06113 c 28.30307,37.63947 80.60541,47.8991 127.81719,46.37248 45.92112,-1.48489 100.95684,-11.12188 126.58999,-44.12023" id="path3931" sodipodi:nodetypes="csc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.06"/>
- <path sodipodi:nodetypes="csc" id="path3933" d="m 116.33786,427.88444 c 28.30307,37.63946 84.81124,47.8991 132.02302,46.37248 45.92112,-1.48489 102.95684,-13.12188 128.58999,-46.12023" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30"/>
- <path sodipodi:nodetypes="cccccc" id="path3935" d="m 380.69607,134.37041 87.03527,-3.97914 c 15.19172,2.89537 23.02298,11.79419 23.60886,26.60258 L 470.24022,335.6495 c -0.64884,14.16236 -9.75566,20.02526 -22.23804,22.57588 l -64.96696,7.9544" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30"/>
- <path d="m 245.74265,64.718609 c -85.4416,0 -132.63699,21.786771 -132.63699,26.859331 0,0.21533 0.10677,0.41537 0.35283,0.62725 l -0.35283,0 -5.55379,108.31282 18.58344,0 -2.7062,-76.48516 c 81.23408,56.30948 134.6429,-7.65863 241.05961,-2.15618 l 0.067,78.64134 19.18158,0 -7.72041,-114.9303 -0.23522,0 c 0.24521,-0.21188 0.39203,-0.41193 0.39203,-0.62725 0,-5.07256 -44.98869,-20.241851 -130.43116,-20.241851 l 6e-5,0 z" id="path2209" sodipodi:nodetypes="csccccccccccscc" opacity=".75" fill="#ffffff"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4141" d="m 258,42.5 c -7,-0.5 -15,0 -22,0.2 -44,1.3 -89,3.2 -130,20.3 -11,11 -5,27 -6,41 l 4,316 c -12.5,14.8 -26,32.6 -22.6,53 7.1,35 44.7,51 76,60 55.9,14 116,13.4 172,0.7 32.9,-8.6 72,-22.8 83,-58 1.3,-28 -7.8,-31.9 -18.9,-53 0.3,-35.4 -1.8,-41 13.6,-39.9 19.9,-3.1 40.6,-2.7 59.8,-8.5 16.5,-6.5 21.4,-24 22,-40 L 510,144 c -1,-23 -25,-39 -47,-33 -23,0 -46,1 -69,2 -1,-15 2,-32 -2,-46 C 359.32799,46.800924 296.18643,42.747697 258,42.5 Z M 466,146 c 17.91141,3.78666 6.52116,33.08254 5.9,46 -5.6,48.8 -11.6,98 -17,146 -19.39932,7.55772 -41.39362,8.57356 -62.9,12 l 1,-201 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 258,42.5 c -7,-0.5 -15,0 -22,0.2 -44,1.3 -89,3.2 -130,20.3 -11,11 -5,27 -6,41 l 4,316 c -12.5,14.8 -26,32.6 -22.6,53 7.1,35 44.7,51 76,60 55.9,14 116,13.4 172,0.7 32.9,-8.6 72,-22.8 83,-58 1.3,-28 -7.8,-31.9 -18.9,-53 0.3,-35.4 -1.8,-41 13.6,-39.9 19.9,-3.1 40.6,-2.7 59.8,-8.5 16.5,-6.5 21.4,-24 22,-40 L 510,144 c -1,-23 -25,-39 -47,-33 -23,0 -46,1 -69,2 -1,-15 2,-32 -2,-46 C 359.32799,46.800924 296.18643,42.747697 258,42.5 Z M 466,146 c 17.91141,3.78666 6.52116,33.08254 5.9,46 -5.6,48.8 -11.6,98 -17,146 -19.39932,7.55772 -41.39362,8.57356 -62.9,12 l 1,-201 z" id="path4146" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M 349.90039 121.44922 C 258.00039 121.39922 206 171.00078 136 131.30078 L 139 430 C 162 450 193 457 222 459 C 268 460 318 456 357 428 L 358.80078 122 C 355.80078 121.9 352.80039 121.89922 349.90039 121.44922 z M 373 454 C 350 472 322 480 293 485 C 236 493 170 494 122 455 C 104 479 144 491 161 497 C 212 512 268 511 320 499 C 341 493 369 488 378 466 C 378 462 376 458 373 454 z " id="path4156" opacity="0.9" fill="#ffffff" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 135,90 0.5,41.8 c 73,41 126,-13.3 223,-10.2 L 359,89 C 341,85 323,82 305,80 283.6,78.9 262.1,78 241,78.1 205,78 169,81 135,90 Z" id="path2209" opacity="0.5" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/cafe.svg b/vtm-themes/resources/assets/symbols/food/cafe.svg
old mode 100755
new mode 100644
index 97956b35..b42e37ac
--- a/vtm-themes/resources/assets/symbols/food/cafe.svg
+++ b/vtm-themes/resources/assets/symbols/food/cafe.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 85.437235,125.05685 C 85.437236,125.05685 41.418849,463.35286 234.35797,462.61634 C 239.06615,462.87529 243.54307,462.94955 247.80099,462.87822 C 252.05891,462.94955 256.53583,462.87529 261.24401,462.61634 C 454.18314,463.35286 410.16476,125.05685 410.16475,125.05685 L 247.80099,125.72609 L 85.437235,125.05685 z" id="path3407" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="18.622"/>
- <path d="M 387.14691,197.01015 C 387.14691,197.01015 432.10304,162.99107 467.64668,162.99107 C 503.19055,162.99107 519.49033,218.37096 518.73421,255.55454 C 517.97787,292.73815 490.75292,383.71961 358.40927,385.30186 C 226.06585,386.88412 387.90303,197.01015 387.14691,197.01015 z" id="path3409" sodipodi:nodetypes="csssc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="45.627"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4136" d="m 76,124 c 0,0 -11,85 2,172 7,43 20,86 44,120 25,33 61,56 112,56 l 28,0 c 51.51511,-5.744 85.58808,-23.28584 117,-65 13,-1 15.89175,-1.19638 36,-5 28.75421,-7.40611 86.74641,-36.73875 112,-88 18.7349,-54.09102 18.31184,-115.43724 -17,-155 -10,-10 -25,-19 -42,-19 l -1,0 0,0 c -17,1 -31,5 -45,11 -1,-17 -3,-27 -3,-27 0,-5 -4,-8 -9,-8 l -324,0 c -5,0 -9,3 -10,8 z m 412,85 0,0 c 7.4375,29.47253 9.30868,62.16521 -2,85 l 0,1 0,0 c -14,31 -46,54 -80,62 -7.02179,6.00578 9.19723,-48.68941 11,-61 5,-34 7,-67 7,-95 15,-8 30,-14 44,-15 10.6253,1.74638 16.23838,14.33425 20,23 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 76,124 c 0,0 -11,85 2,172 7,43 20,86 44,120 25,33 61,56 112,56 l 28,0 c 51.51511,-5.744 85.58808,-23.28584 117,-65 13,-1 15.89175,-1.19638 36,-5 28.75421,-7.40611 86.74641,-36.73875 112,-88 18.7349,-54.09102 18.31184,-115.43724 -17,-155 -10,-10 -25,-19 -42,-19 l -1,0 0,0 c -17,1 -31,5 -45,11 -1,-17 -3,-27 -3,-27 0,-5 -4,-8 -9,-8 l -324,0 c -5,0 -9,3 -10,8 z m 412,85 0,0 c 7.4375,29.47253 9.30868,62.16521 -2,85 l 0,1 0,0 c -14,31 -46,54 -80,62 -7.02179,6.00578 9.19723,-48.68941 11,-61 5,-34 7,-67 7,-95 15,-8 30,-14 44,-15 10.6253,1.74638 16.23838,14.33425 20,23 z" id="path3407" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/drinkingtap.svg b/vtm-themes/resources/assets/symbols/food/drinkingtap.svg
old mode 100755
new mode 100644
index 57fe6a7d..3322373a
--- a/vtm-themes/resources/assets/symbols/food/drinkingtap.svg
+++ b/vtm-themes/resources/assets/symbols/food/drinkingtap.svg
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g3353" transform="translate(20,12)">
-  <path sodipodi:nodetypes="csscc" id="path3340" d="M 391.67731,24.490931 C 380.01379,28.852545 364.03205,35.340717 358.04297,35.340717 C 352.05389,35.340717 347.19318,30.480013 347.19318,24.490931 C 347.19318,18.501848 352.05389,13.641144 358.04297,13.641144 C 363.75134,13.860335 380.34891,20.605806 391.67731,24.490931 z" transform="translate(15.189701,15.189701)" opacity=".985" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="15"/>
-  <path d="M 396.38288,39.680632 C 408.0464,44.042246 424.02814,50.530418 430.01722,50.530418 C 436.0063,50.530418 440.86701,45.669714 440.86701,39.680632 C 440.86701,33.691549 436.0063,28.830845 430.01722,28.830845 C 424.30885,29.050036 407.71128,35.795507 396.38288,39.680632 z" id="path3345" sodipodi:nodetypes="csscc" opacity=".985" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="15"/>
-  <path id="path3347" d="M 401.4421,39.138141 L 401.4421,105.32184 L 402.25584,131.09008" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="30"/>
-  <path d="M 424.22666,125.39394 A 22.784552,45.569103 0 1 1 378.65756,125.39394 A 22.784552,45.569103 0 1 1 424.22666,125.39394 z" sodipodi:ry="45.569103" sodipodi:rx="22.784552" sodipodi:cy="125.39394" sodipodi:cx="401.44211" id="path3349" sodipodi:type="arc" opacity=".985" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30"/>
-  <path sodipodi:nodetypes="cccc" id="path3351" d="M 522.95971,130.81884 L 345.02276,129.81355 L 330.91849,129.73386 C 261.47986,128.64888 265.81977,193.7476 265.81977,193.7476" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="50"/>
- </g>
- <path d="M 401.20335,264.66519 L 401.04559,264.66519 C 401.22597,264.50932 401.32527,264.3522 401.32527,264.19382 C 401.32527,260.46245 350.37519,257.43751 287.52395,257.43751 C 224.67334,257.43751 173.72263,260.46245 173.72263,264.19382 C 173.72263,264.3522 173.82193,264.50932 174.00293,264.66519 L 173.72263,264.66519 L 209.24005,535.50065 L 209.40032,535.50065 C 209.08607,535.67034 208.91952,535.84255 208.91952,536.01664 C 208.91952,538.59472 244.11264,540.68321 287.52521,540.68321 C 330.9384,540.68321 366.13089,538.59472 366.13089,536.01664 C 366.13089,535.84255 365.96371,535.66971 365.6501,535.50065 L 401.20335,264.66519 z M 342.84592,515.69968 C 341.02644,517.38341 233.11052,516.59439 231.29103,514.91066 L 197.55212,281.06395 C 255.13772,281.25585 296.60788,284.11814 374.88771,279.48591 L 342.84592,515.69968 z" id="path2209" sodipodi:nodetypes="ccsssccccsssccccccc" fill="#ffffff"/>
- <path d="M 188.1914,276.64338 L 383.07881,278.22142 L 351.5181,527.7707 L 218.17408,529.34874 L 188.1914,276.64338 z" id="path2381" sodipodi:nodetypes="ccccc" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4141" d="M 542,291 C 542,430.72804 428.72804,544 289,544 149.27196,544 36,430.72804 36,291 36,151.27196 149.27196,38 289,38 428.72804,38 542,151.27196 542,291 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 542,291 C 542,430.72804 428.72804,544 289,544 149.27196,544 36,430.72804 36,291 36,151.27196 149.27196,38 289,38 428.72804,38 542,151.27196 542,291 Z" id="path3267" fill="#734a08"/>
+ <path d="m 218.1,249 c -52,0 -95,2.5 -95,4.25 0,0.1 29.45,229 29.45,229 -0.15,1.25 29.25,3.05 65.85,3.05 36,0 66,-1.7 65.8,-3 0,-0.1 29.025,-229.05 29.025,-229.05 C 313.1,251.5 270.6,249 218.1,249 Z M 172,463.3 143,269 c 48,0.2 83,2.6 148,-1.3 L 264.65,464.35 C 263.5,465.4 174,464.8 172,463.3 Z" id="path2209" fill="#ffffff"/>
+ <path d="m 298,266.3 -26.3,208 -111,1.3 -25.35,-210.8 z" id="path2381" opacity="0.1" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 289.6,77.3 c 0,9 7.4,16.4 16.4,16.4 3.1,0 5.9,-0.6 8.8,-1.5 l 0,8.6 c -5.3,3.7 -9.2,9.2 -11.9,14.5 -2,3.9 -3.5,8.2 -4.7,12.7 -9.06665,-0.0641 -18.13363,-0.1015 -27.2,-0.2 -36.6,-0.6 -62,20.4 -71,40.5 -9.4,20 -7.7,39 -7.7,39 l 49,-3.3 c 0,0 -0.1,-8.1 3.2,-15 3.3,-6.9 5,-12.6 26.3,-12.3 10.24128,0.0976 19.66481,0.14188 30.3,0.2 0.7,1.8 1.4,3.5 2.3,5.1 4.8,9.6 13.4,19.3 26.6,19.3 13.2,0 21.8,-9.7 26.6,-19.3 0.8,-1.6 1.5,-3.2 2.1,-4.8 l 73,0.4 0.3,-49 -70,-0.4 c -1.2,-4.6 -2.7,-9 -4.8,-13 -2.7,-5.4 -6.6,-10.8 -11.9,-14.5 l 0,-8.7 c 3,1 5.9,1.6 9.1,1.6 9,0 17.47395,-7.464306 16.4,-16.4 -1.1996,-9.981145 -8.85098,-16.168182 -16.7,-16.4 -5.60241,0.497449 -10.53176,2.429826 -14.8,3.9 -2.59144,-1.924699 -5.74359,-2.944432 -8.97132,-2.902261 -3.03626,0.04933 -5.98301,1.036268 -8.43651,2.825583 C 316.5241,63.749065 311.53654,60.25233 306.49609,60.811662 297,60.9 289.6,68.3 289.6,77.3 Z" id="path3340" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/fastfood.svg b/vtm-themes/resources/assets/symbols/food/fastfood.svg
old mode 100755
new mode 100644
index 5fc1c3bd..270e7a76
--- a/vtm-themes/resources/assets/symbols/food/fastfood.svg
+++ b/vtm-themes/resources/assets/symbols/food/fastfood.svg
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path transform="matrix(14.685839,0,0,14.685839,577.76584,1150.0639)" d="M -4.9023438,-73.108887 L -7.0227051,-65.628418 L -17.822266,-65.628418 L -15.222168,-44.98877 L -6.3830566,-44.98877 L -3.7426758,-65.628418 L -5.7421875,-65.628418 L -3.6621094,-72.748779 L -4.9023438,-73.108887 z M -19.102783,-53.588623 C -18.889587,-55.455476 -20.302753,-56.468658 -23.342285,-56.628174 L -30.662842,-56.628174 C -33.702398,-56.468658 -35.128992,-55.455476 -34.942627,-53.588623 L -19.102783,-53.588623 z M -34.942627,-47.988037 C -35.128992,-46.121989 -33.702398,-45.122234 -30.662842,-44.98877 L -23.342285,-44.98877 C -20.302753,-45.122234 -18.889587,-46.121989 -19.102783,-47.988037 L -34.942627,-47.988037 z M -19.782715,-52.148193 L -34.302979,-52.148193 C -34.675704,-52.148187 -34.995528,-52.014927 -35.262451,-51.748413 C -35.529382,-51.481888 -35.662845,-51.175288 -35.662842,-50.828613 C -35.662845,-50.428218 -35.529382,-50.101477 -35.262451,-49.848389 C -34.995528,-49.595293 -34.675704,-49.468747 -34.302979,-49.46875 L -19.782715,-49.46875 C -19.409199,-49.468747 -19.089172,-49.595293 -18.822632,-49.848389 C -18.556132,-50.101477 -18.422872,-50.428218 -18.422852,-50.828613 C -18.422872,-51.175288 -18.556132,-51.481888 -18.822632,-51.748413 C -19.089172,-52.014927 -19.409199,-52.148187 -19.782715,-52.148193 L -19.782715,-52.148193 z" id="flowRoot3192" fill="#ffffff"/>
+ <path id="path4142" d="m 475,186 -159,0 38,303 130,0 38.8,-303 -29.4,0 30.5,-105 -18.05,-5.15 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4144" d="m 235,318.4 -107,0 C 83.4,320.7 62,335.6 65.2,363 l 232.4,0 c 2.5,-27.4 -18.2,-42 -62.6,-44.6 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4146" d="m 128,489 108,0 c 44.6,-2 65,-16.6 62,-44 l -232.9,0 c -2.6,27.4 18.3,42 62.9,44 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4148" d="m 75,384 c -5.5,0 -10.2,2 -14,5.9 -3.9,3.9 -5.9,8.4 -5.9,13.5 0,5.9 2,10.7 5.9,14.4 3.9,3.7 8.6,5.6 14,5.6 l 213,0 c 5.5,0 10.2,-1.9 14,-5.6 3.9,-3.7 5.9,-8.5 5.9,-14.4 0,-5.1 -2,-9.6 -5.9,-13.5 -3.9,-3.9 -8.6,-5.9 -14,-5.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 475,186 -159,0 38,303 130,0 38.8,-303 -29.4,0 30.5,-105 -18.05,-5.15 z" id="path4140" fill="#734a08"/>
+ <path d="m 235,318.4 -107,0 C 83.4,320.7 62,335.6 65.2,363 l 232.4,0 c 2.5,-27.4 -18.2,-42 -62.6,-44.6 z" id="path4138" fill="#734a08"/>
+ <path d="m 128,489 108,0 c 44.6,-2 65,-16.6 62,-44 l -232.9,0 c -2.6,27.4 18.3,42 62.9,44 z" id="path4136" fill="#734a08"/>
+ <path d="m 75,384 c -5.5,0 -10.2,2 -14,5.9 -3.9,3.9 -5.9,8.4 -5.9,13.5 0,5.9 2,10.7 5.9,14.4 3.9,3.7 8.6,5.6 14,5.6 l 213,0 c 5.5,0 10.2,-1.9 14,-5.6 3.9,-3.7 5.9,-8.5 5.9,-14.4 0,-5.1 -2,-9.6 -5.9,-13.5 -3.9,-3.9 -8.6,-5.9 -14,-5.9 z" id="flowRoot3192" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/pub.svg b/vtm-themes/resources/assets/symbols/food/pub.svg
old mode 100755
new mode 100644
index 982d02b9..05677fdf
--- a/vtm-themes/resources/assets/symbols/food/pub.svg
+++ b/vtm-themes/resources/assets/symbols/food/pub.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 468.232,77.93 L 467.981,77.93 C 468.268,77.682 468.426,77.432 468.426,77.18 C 468.426,71.243 387.359,66.43 287.356,66.43 C 187.354,66.43 106.286,71.243 106.286,77.18 C 106.286,77.432 106.444,77.682 106.732,77.93 L 106.286,77.93 L 162.798,508.858 L 163.053,508.858 C 162.553,509.128 162.288,509.402 162.288,509.679 C 162.288,513.781 218.284,517.104 287.358,517.104 C 356.433,517.104 412.428,513.781 412.428,509.679 C 412.428,509.402 412.162,509.127 411.663,508.858 L 468.232,77.93 z M 375.37914,477.35255 C 372.48414,480.03155 200.77845,478.77614 197.88345,476.09714 L 144.20126,135.84429 C 239.2787,201.74966 301.8095,126.89331 426.36103,133.33347 L 375.37914,477.35255 z" id="path2209" sodipodi:nodetypes="ccsssccccsssccccccc" fill="#ffffff"/>
- <path d="M 129.30736,119.26407 L 439.39394,121.77489 L 389.17749,493.37662 L 177.01299,495.88745 L 129.30736,119.26407 z" id="path2381" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4142" d="m 459.79151,89.267407 -0.23561,0 c 0.26941,-0.2328 0.41773,-0.46748 0.41773,-0.70404 0,-5.573165 -76.09903,-10.091214 -169.97363,-10.091214 -93.87365,0 -169.97362,4.518049 -169.97362,10.091214 16.98486,141.144143 34.27468,275.383353 52.57007,405.994503 0,3.85062 52.56443,6.96998 117.40542,6.96998 64.84193,0 117.40543,-3.11936 117.40543,-6.96998 15.16182,-134.06839 34.70027,-270.57874 52.38421,-405.290463 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 459.79151,89.267407 -0.23561,0 c 0.26941,-0.2328 0.41773,-0.46748 0.41773,-0.70404 0,-5.573165 -76.09903,-10.091214 -169.97363,-10.091214 -93.87365,0 -169.97362,4.518049 -169.97362,10.091214 16.98486,141.144143 34.27468,275.383353 52.57007,405.994503 0,3.85062 52.56443,6.96998 117.40542,6.96998 64.84193,0 117.40543,-3.11936 117.40543,-6.96998 15.16182,-134.06839 34.70027,-270.57874 52.38421,-405.290463 z" id="path4140" fill="#734a08"/>
+ <path d="m 374.57659,450.95662 c -2.71759,2.51482 -163.90077,1.33635 -166.61836,-1.17848 L 157.5658,130.37674 c 89.25089,61.86655 147.94966,-8.40244 264.8684,-2.35695 z" id="path2209" opacity="0.8" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/food/restaurant.svg b/vtm-themes/resources/assets/symbols/food/restaurant.svg
old mode 100755
new mode 100644
index be06a73f..7b3a8bca
--- a/vtm-themes/resources/assets/symbols/food/restaurant.svg
+++ b/vtm-themes/resources/assets/symbols/food/restaurant.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" id="path1329" inkscape:connector-curvature="0" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 203.725,338.602 c 37.643,-17.466 64.864,-67.996 64.864,-127.642 0,-74.115 -61.834,-155.247 -93.849,-155.247 -32.014,0 -93.85,81.132 -93.85,155.247 0,59.646 27.223,110.176 64.865,127.642 l -7.792,176.545 73.553,0 -7.791,-176.545 z" id="path2110" inkscape:connector-curvature="0" fill="#ffffff"/>
- <path d="m 430.231,368.602 c 37.642,-17.466 51.389,-39.928 51.389,-99.574 L 471.839,66.214 c 0,-3.875 -3.142,-7.017 -7.018,-7.017 l -4.607,0 c -3.873,0 -7.016,3.141 -7.016,7.017 l 3.26,202.814 -20.259,0 -5.132,-204.789 c 0,-3.875 -3.142,-7.017 -7.018,-7.017 l -5.995,0 c -3.874,0 -7.016,3.142 -7.016,7.017 l 2.775,204.789 -25.137,0 2.775,-204.789 c 0,-3.875 -3.142,-7.017 -7.017,-7.017 l -5.996,0 c -3.875,0 -7.016,3.142 -7.016,7.017 l -5.132,204.789 -19.835,0 3.26,-202.789 c 0,-3.875 -3.142,-7.017 -7.017,-7.017 l -4.606,0 c -3.875,0 -7.018,3.142 -7.018,7.017 L 320.9,269.028 c 0,59.646 13.715,82.108 51.356,99.574 l -7.791,146.545 73.554,0 -7.788,-146.545 z" id="path2112" inkscape:connector-curvature="0" fill="#ffffff"/>
+ <path d="M 481,269 472,66 c 0,-3.9 -3.1,-7 -7,-7 l -4.6,0 c -3.9,0 -7,3.1 -7,7 l 3.3,203 -20.3,0 -5.1,-205 c 0,-3.9 -3.1,-7 -7,-7 l -6,0 c -3.9,0 -7,3.1 -7,7 l 2.8,205 -25,0 2.8,-205 c 0,-3.9 -3.1,-7 -7,-7 l -6,0 c -3.9,0 -7,3.1 -7,7 l -5.1,205 -19.8,0 3.3,-203 c 0,-3.9 -3.1,-7 -7,-7 l -4.6,0 c -3.9,0 -7,3.1 -7,7 L 321,269 c 0,60 13.7,82 51,100 l -7.8,147 74,0 -8,-146.5 C 467.6,351.5 481,329.1 481,269 Z M 268.9,211 c 0,-74 -61.8,-155 -94,-155 -32,0 -94,81 -94,155 0,60 27,110 64.9,128 l -7.8,177 74,0 -7.9,-176.5 c 37.5,-18 64.8,-68.5 64.8,-128.5 z" id="path4138" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path2112" d="M 481,269 472,66 c 0,-3.9 -3.1,-7 -7,-7 l -4.6,0 c -3.9,0 -7,3.1 -7,7 l 3.3,203 -20.3,0 -5.1,-205 c 0,-3.9 -3.1,-7 -7,-7 l -6,0 c -3.9,0 -7,3.1 -7,7 l 2.8,205 -25,0 2.8,-205 c 0,-3.9 -3.1,-7 -7,-7 l -6,0 c -3.9,0 -7,3.1 -7,7 l -5.1,205 -19.8,0 3.3,-203 c 0,-3.9 -3.1,-7 -7,-7 l -4.6,0 c -3.9,0 -7,3.1 -7,7 L 321,269 c 0,60 13.7,82 51,100 l -7.8,147 74,0 -8,-146.5 C 467.6,351.5 481,329.1 481,269 Z M 268.9,211 c 0,-74 -61.8,-155 -94,-155 -32,0 -94,81 -94,155 0,60 27,110 64.9,128 l -7.8,177 74,0 -7.9,-176.5 c 37.5,-18 64.8,-68.5 64.8,-128.5 z" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/gondola.svg b/vtm-themes/resources/assets/symbols/gondola.svg
old mode 100755
new mode 100644
index e4361f9d..2a40d634
--- a/vtm-themes/resources/assets/symbols/gondola.svg
+++ b/vtm-themes/resources/assets/symbols/gondola.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="134.29" height="239.29" version="1.0">
- <metadata id="metadata7"/>
- <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(-324.82144,-355.57647)">
-  <path id="path3161" d="m 391.42857,358.07647 0,145.71428" inkscape:connector-curvature="0" fill="none" stroke="#000000" stroke-width="5"/>
-  <rect id="rect3195" width="134.29" height="160" x="324.82" y="434.86" stroke-width="15" rx="43.33"/>
-  <rect id="rect3199" width="114.29" height="91.43" x="334.82" y="446.29" fill="#ffffff" stroke-width="15" rx="32.857"/>
- </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
+ <metadata id="metadata3003"/>
+ <path d="M 276,3.5996094 276,124.61719 237,125 c -52,0 -93,40 -93,90 l 0,155 c 0,50 41,90 93,89 l 102,0 c 52,0 93,-40 93,-90 l 0,-155 c 0,-50 -41,-90 -93,-90 l -39,0.38281 0,-120.7832006 z" id="rect3195"/>
+ <path d="m 339,148 c 38,0 69,30.8 69,69 l 0,54 c 0,38 -30.8,69 -69,69 l -102,0 c -38,0 -69,-30.8 -69,-69 l 0,-54 c 0,-38 30.8,-69 69,-69 z" id="rect3199" opacity="0.7" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/health/doctors2.svg b/vtm-themes/resources/assets/symbols/health/doctors2.svg
old mode 100755
new mode 100644
index 052cfc82..1f9bcf16
--- a/vtm-themes/resources/assets/symbols/health/doctors2.svg
+++ b/vtm-themes/resources/assets/symbols/health/doctors2.svg
@@ -1,80 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#DA0092" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m -732.625,360.28125 c -3.15679,0.0498 -5.96241,1.58503 -8.34375,5.375 9.92802,97.45851 14.02511,234.3311 15.75,387.15625 l -6.1875,-7.65625 c -11.5498,-7.26223 -44.05826,-6.14705 -34.875,15.8125 7.60119,18.17637 28.79619,73.09169 42.03125,132 0.34476,88.63854 0.29544,180.00725 0.40625,270.21875 -1.90669,-1.6483 -17.84053,-2.2788 -14.15625,6.5313 2.59156,6.1971 9.03813,22.8648 14.25,42.1874 0.1447,67.2248 0.41897,133.4029 1.125,196.8438 0,0 65.77787,-30.8072 49,-46.9375 -4.47247,-4.2999 -3.29845,-145.101 0.71875,-318.1563 6.82883,-36.2012 20.67953,-72.14009 25.3125,-83.2187 5.03871,-12.04886 -17.26786,-10.9609 -19.125,-8.65625 l -4,4.96875 c 1.5252,-56.6314 3.28085,-114.67006 5.1875,-171.125 5.78164,-16.19006 10.80185,-28.82523 13.75,-35.875 4.45304,-10.64837 -2.81737,-15.65681 -11.875,-17.53125 6.61255,-182.73455 14.55117,-335.76846 20.65625,-342.0625 4.51271,-20.09519 -22.64946,-9.48434 -43.9375,-8.28125 -15.80912,0.89345 -33.30318,-21.78931 -45.6875,-21.59375 z" id="path2885" sodipodi:nodetypes="ccccsccsccscscccsccsc" opacity=".716" fill="#6800ff" stroke="#000000"/>
- <path id="path3807" d="m -704.25,435.0625 c -54.95052,-0.0687 -99.68039,31.03352 -101.03125,101.0625 1.23723,94.2574 170.3066,118.99012 171.46875,213.3125 1.16215,94.32239 -162.20132,152.83791 -163.3125,245.96875 -1.11118,93.13085 159.41746,117.11685 161.28125,175.53125 1.86379,58.4144 -114.78196,113.0786 -187.8125,153.0937 7.74238,14.0876 225.7718,-67.3607 230.65625,-150.0312 4.88444,-82.6705 -149.36999,-121.1772 -152.0625,-183.71875 -2.69251,-62.54155 165.66636,-126.66989 164.3125,-253.09375 -1.35386,-126.42386 -157.39343,-135.66566 -163.28125,-202.09375 -2.29607,-17.64831 8.6114,-34.12367 25.5,-33.6875 16.8886,0.43617 20.94605,11.58271 37.59375,27.34375 8.70077,8.23736 23.84742,12.64826 32.84375,15.03125 8.99633,2.38299 12.97123,1.23561 20.15625,-0.875 4.79208,-1.40768 -5.3163,-18.96908 -1.34375,-22.09375 3.39472,-2.67017 21.03982,9.33449 23,5.34375 2.24636,-4.57338 3.17435,-10.0965 2.0625,-16.59375 2.71835,-29.24031 -45.08073,-74.4313 -100.03125,-74.5 z m 49.78125,31.15625 c 6.81017,0.10238 12.48229,6.54591 11.28125,13.4375 -0.80708,9.21346 -13.70166,13.40323 -19.8125,6.53125 -7.07698,-6.40673 -2.34923,-19.46521 7.15625,-19.90625 0.46243,-0.0513 0.92099,-0.0693 1.375,-0.0625 z" opacity=".644" fill="#6800ff" stroke="#000000" stroke-width="10.2"/>
- <g id="g3968" transform="matrix(0.78859506,0,0,0.69871963,-395.86191,-81.602608)">
-  <path d="m 851.53939,136.02034 c -7.2794,0.7683 -10.241,9.42997 -7.8438,15.5625 0.649,8.42856 1.2521,16.86793 1.8125,25.3125 9.2386,-1.66742 18.5775,-2.62175 27.875,-2.8125 13.1446,-0.32648 26.5743,0.0939 39.8437,1.6875 0.0939,-1.14643 0.1855,-2.29126 0.2813,-3.4375 0.5744,-6.60122 5.5164,-15.90252 -1.5,-20.8125 -10.9233,-6.91295 -24.0583,4.54804 -35.1875,-0.78125 -8.6126,-4.53785 -14.6296,-14.84694 -25.2812,-14.71875 z m 14.1874,136.40625 c -5.2173,0.13046 -10.4053,0.91388 -15.4062,2.34375 0.4434,13.11965 0.8052,26.23059 1.125,39.34375 7.0777,4.1154 14.6739,7.5153 22.0312,10.7187 10.2474,4.3589 20.7672,8.3836 31.3126,12.4063 0.5106,-14.8585 1.0526,-29.7091 1.6562,-44.5625 -6.4412,-6.79634 -12.9773,-13.46027 -21.4062,-17.75 -6.1838,-1.82287 -12.7567,-2.66393 -19.3126,-2.5 z m -23.9374,151.8438 c -6.7184,0.1614 -13.3014,3.0662 -15.75,9.5312 -2.4296,10.4945 5.1443,19.8377 7.0312,29.8125 4.1554,13.2777 8.2467,26.6333 11.8438,40.0937 18.4977,-6.6035 37.3536,-12.3287 55.2187,-20.3124 0.3032,-7.5589 0.6303,-15.1084 1.0625,-22.6563 1.2729,-5.5242 3.5894,-10.9183 5.5938,-16.375 -3.8385,-1.5928 -7.7213,-3.0528 -11.4376,-4.5625 -13.843,-5.1668 -28.0928,-9.885 -42.2187,-14.9375 0.006,0.6348 0.0257,1.2715 0.0313,1.9063 -3.264,-1.7119 -7.3441,-2.5969 -11.375,-2.5 z m 55.75,155.8124 c -14.6061,5.5037 -29.2011,10.9927 -43.3438,17.5626 0.022,9.1885 0.0424,18.3734 0.0625,27.5624 14.0792,7.6653 28.9132,13.9054 43.875,19.9063 3.8011,-18.0074 9.7386,-35.5459 14.75,-53.1875 -0.049,-7.4384 -9.2099,-10.5162 -15.4375,-8.9062 0.0308,-0.9793 0.0642,-1.9582 0.0938,-2.9376 z m -43.3126,144.25 c -0.0237,6.2325 -0.0571,12.4574 -0.0937,18.6876 -6.1947,-0.2789 -11.9955,6.3962 -8.5,12.2812 4.8981,14.0989 9.8051,28.5053 9.0313,43.5312 13.2997,-4.5583 26.462,-9.4574 39.125,-15.5 0.2202,-14.4943 0.4872,-28.9768 0.6562,-43.4687 -6.8026,-2.8947 -13.7839,-5.4643 -20.6875,-8 -6.446,-2.5374 -12.978,-5.0297 -19.5313,-7.5313 z m 39.5,138.5938 c -12.8216,4.1797 -25.8438,7.7842 -39,10.8438 0.1288,20.3445 0.2848,40.6871 0.4688,61.0312 15.1416,-9.3449 33.1646,-17.3789 41.4375,-34.125 2.1524,-6.1532 -3.4687,-11.4544 -2.25,-17.6875 -0.2808,-6.6903 -0.5014,-13.3704 -0.6563,-20.0625 z" id="path3964" fill="#ffffff" stroke="#ffffff" stroke-width=".705"/>
-  <path d="M 298.21875 53.875 C 245.30728 53.825688 195.0259 81.279455 194.09375 124.09375 C 197.484 209.92112 349.0874 200.55153 352 237.8125 C 355.81972 286.67837 199.51039 272.06577 202.09375 349.96875 C 204.05033 409.97989 349.58609 415.57646 349.6875 447.09375 C 349.80051 483.62386 244.99782 493.94691 187.40625 521.90625 C 193.51187 531.74953 392.39879 508.87487 393.03125 445.40625 C 393.60779 387.54437 245.65566 380.03901 245.9375 344.5625 C 246.2057 310.80072 400.59885 308.16089 399.53125 236.625 C 398.46365 165.08911 247.01809 169.78959 242.375 123.375 C 242.17407 99.633569 276.20249 92.405189 301.59375 95.5625 C 314.78718 97.203052 326.18421 110.0812 339.3125 121.09375 C 346.17383 126.84936 358.12431 129.92874 365.21875 131.59375 C 372.31319 133.2588 375.42762 132.44354 381.09375 130.96875 C 384.8727 129.98521 376.89856 117.71452 380.03125 115.53125 C 382.70829 113.66555 396.6417 122.06966 398.1875 119.28125 C 399.959 116.08574 400.68934 112.22726 399.8125 107.6875 C 401.95622 87.256721 364.23994 55.673002 320.90625 55.625 C 313.37674 54.460151 305.77753 53.882045 298.21875 53.875 z M 359.40625 71.9375 C 368.17508 71.9375 375.28125 79.043675 375.28125 87.8125 C 375.28125 96.581325 368.17508 103.6875 359.40625 103.6875 C 350.63743 103.6875 343.53125 96.581325 343.53125 87.8125 C 343.53125 79.043675 350.63743 71.9375 359.40625 71.9375 z " transform="matrix(1.2680779,0,0,1.4311892,501.98376,116.78877)" id="path3966" fill="#ffffff" stroke="#ffffff" stroke-width="7.571"/>
- </g>
+ <path id="path4141" d="m 277.06573,43.197596 c 0.42752,5.187565 0.85504,10.37513 1.19705,15.562695 6.24173,-1.055098 12.48346,-1.582647 18.81069,-1.758497 8.89232,-0.17585 17.95566,0.08793 26.84798,1.055098 -0.1477,-7.219836 3.27194,-11.94563 -0.85503,-14.859296 -7.35327,-4.220392 -16.24559,2.813594 -23.76987,-0.439624 -5.81421,-2.813595 -10.08937,-9.232108 -16.92962,-9.144183 -4.87368,0.439624 -6.92575,5.803039 -5.3012,9.583807 z m -38.64741,39.829948 c -17.10063,11.166453 -28.90006,27.608396 -29.07107,47.479406 l 0,0.0879 0,0.0879 c 0.76953,19.87101 10.08937,34.29069 23.08585,45.72091 13.08198,10.81476 29.9261,17.93667 46.68471,23.73971 16.67311,5.80304 33.26072,10.19928 45.31666,15.12307 7.05117,3.27139 19.02404,7.58977 19.66572,16.00232 0.24627,10.76213 -9.35384,16.86368 -17.10062,20.66233 -11.62843,5.71512 -27.87403,10.28721 -44.29063,15.65062 -16.24559,5.36342 -33.08971,11.60608 -45.82968,21.10196 -12.73997,9.49588 -21.37578,22.86046 -20.86277,41.0609 0.42752,14.50759 9.40535,25.4982 21.8033,34.29068 12.31246,8.61663 28.21604,15.12307 43.6066,20.75026 15.73258,5.71511 31.37966,10.55098 42.75157,15.65062 5.67742,3.1486 17.37018,7.11873 17.52815,14.59552 0,6.41851 -4.44617,12.0457 -13.16749,17.49704 -8.72132,5.45134 -21.29028,10.37513 -35.4838,14.94722 -32.17812,11.64583 -63.23097,18.14797 -91.31735,31.82879 l 1.88107,3.1653 c 2.74704,3.61078 8.11482,3.28372 11.71393,3.51699 27.48116,-0.1624 57.51883,-5.49365 81.48449,-11.43023 21.8033,-5.53926 43.5211,-13.01287 59.8522,-22.86045 16.5876,-9.84759 28.21603,-22.42084 28.55804,-37.80768 0.17101,-14.06797 -8.55031,-25.1465 -20.86276,-33.41144 -12.22695,-8.61663 -28.21604,-15.21099 -43.6066,-21.10196 -15.81808,-5.97888 -31.55066,-11.3423 -42.75157,-16.96949 -6.36091,-3.63362 -17.79659,-8.69976 -17.69915,-16.79364 1.70563,-8.5915 12.20775,-12.62108 18.72519,-15.47477 12.14144,-5.27549 28.64355,-10.28721 45.14565,-16.44194 16.58761,-6.15474 33.26072,-13.18873 46.00069,-23.21216 12.73997,-9.9355 21.63229,-22.86045 21.37579,-39.56617 -0.25651,-16.70572 -9.31985,-29.54275 -22.14532,-38.68693 -12.82547,-9.49588 -29.49858,-16.17817 -46.00069,-21.9812 -16.5876,-5.97889 -33.08971,-11.25438 -45.31666,-17.40912 -8.84128,-4.66587 -19.55008,-11.34184 -20.69176,-21.18989 0.29756,-9.34578 7.7268,-14.81613 14.96305,-17.76081 9.31984,-3.60492 21.6323,-4.48417 31.63616,-3.16529 9.40535,1.23094 19.0672,11.78192 30.61013,21.71743 6.84025,5.89096 17.35713,8.44078 23.51336,9.9355 6.49824,1.58265 10.26037,0.7034 15.13405,-0.61547 2.67061,-1.14969 3.44196,-3.31414 3.24912,-5.89096 -0.45652,-2.66377 -1.32759,-4.94617 -1.88107,-7.38569 3.1057,1.01047 6.04947,2.34062 9.06334,3.16529 2.30966,0.54982 5.11214,-0.0348 6.15622,-1.93434 7.45062,-17.69626 -7.36121,-36.857809 -18.55418,-45.545064 -12.82547,-9.583756 -30.78113,-16.617742 -50.44685,-16.705667 -6.49824,-1.055098 -13.08198,-1.582647 -27.66026,-1.62661 -14.57829,-0.04396 -36.8091,6.022851 -54.76476,17.189305 z m 125.68961,15.826469 c 0,5.890967 -4.61717,10.550977 -10.26038,10.550977 -5.72871,0 -10.26037,-4.74794 -10.26037,-10.550977 0,-5.890964 4.61716,-10.55098 10.26037,-10.55098 5.72871,0 10.26038,4.747941 10.26038,10.55098 z m -82.85254,19.871007 c 0.34201,8.08909 0.51302,16.09025 0.76953,24.17933 4.78817,2.54982 9.91836,4.66002 14.87754,6.59437 6.92576,2.72566 14.02252,5.18756 21.11928,7.64946 0.34201,-9.14419 0.68402,-18.28837 1.11154,-27.2567 -4.36066,-4.22039 -8.72132,-8.26494 -14.45003,-10.90268 -3.67664,-0.96717 -7.52428,-1.49472 -12.0987,-1.53869 -4.57441,-0.044 -8.08004,0.39567 -11.32916,1.27491 z m -16.50211,97.68449 c -1.62456,6.41851 3.50563,12.22155 4.70268,18.28837 2.8216,8.177 5.5577,16.35401 7.95179,24.61895 12.48346,-4.04454 25.22342,-7.56154 37.19386,-12.48533 0.17101,-4.66001 0.42752,-9.32003 0.68403,-13.89212 0.85503,-3.42907 2.39408,-6.68229 3.76213,-10.02343 -2.56509,-0.96717 -5.21569,-1.84642 -7.69528,-2.8136 -9.31984,-3.16529 -18.81069,-6.06681 -28.21603,-9.14418 l 0,1.14302 c -2.22308,-1.05509 -4.95918,-1.58264 -7.73804,-1.58264 -4.57441,0.0879 -9.02058,1.84642 -10.64514,5.89096 z m 19.23821,100.76186 c 0,5.62719 0,11.25437 0.0855,16.96949 9.40535,4.74794 19.49472,8.52871 29.58409,12.22155 2.56509,-11.07853 6.58374,-21.80536 9.91836,-32.53219 0,-4.57209 -6.24173,-6.50643 -10.43138,-5.45134 0,-0.61547 0.0855,-1.23094 0,-1.93434 -9.91837,3.34114 -19.75123,6.68228 -29.15657,10.72683 z m 0.0855,89.5954 c -4.18965,-0.17585 -8.1228,3.95662 -5.72871,7.56153 3.33462,8.70456 6.58374,17.49704 6.07072,26.72915 8.97783,-2.81359 17.87016,-5.80304 26.42047,-9.49588 0.17101,-8.79248 0.34202,-17.84874 0.42752,-26.72915 -4.61717,-1.7585 -9.31984,-3.34114 -13.93701,-4.92379 -4.36066,-1.58265 -8.72132,-3.07737 -13.16749,-4.61605 0,3.91265 -0.0855,7.69342 -0.0855,11.47419 z m 0.25651,80.45122 c 0.0855,12.48532 0.17101,24.97065 0.34201,37.45597 10.17488,-5.71511 22.23082,-10.55097 27.95953,-20.9261 1.45355,-3.78077 -2.30859,-7.03399 -1.53906,-10.90268 -0.171,-4.13247 -0.34201,-8.17701 -0.42751,-12.30948 -8.55032,2.54982 -17.44264,4.74794 -26.33497,6.68229 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" stroke-linecap="round" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 277.06573,43.197596 c 0.42752,5.187565 0.85504,10.37513 1.19705,15.562695 6.24173,-1.055098 12.48346,-1.582647 18.81069,-1.758497 8.89232,-0.17585 17.95566,0.08793 26.84798,1.055098 -0.1477,-7.219836 3.27194,-11.94563 -0.85503,-14.859296 -7.35327,-4.220392 -16.24559,2.813594 -23.76987,-0.439624 -5.81421,-2.813595 -10.08937,-9.232108 -16.92962,-9.144183 -4.87368,0.439624 -6.92575,5.803039 -5.3012,9.583807 z m -38.64741,39.829948 c -17.10063,11.166453 -28.90006,27.608396 -29.07107,47.479406 l 0,0.0879 0,0.0879 c 0.76953,19.87101 10.08937,34.29069 23.08585,45.72091 13.08198,10.81476 29.9261,17.93667 46.68471,23.73971 16.67311,5.80304 33.26072,10.19928 45.31666,15.12307 7.05117,3.27139 19.02404,7.58977 19.66572,16.00232 0.24627,10.76213 -9.35384,16.86368 -17.10062,20.66233 -11.62843,5.71512 -27.87403,10.28721 -44.29063,15.65062 -16.24559,5.36342 -33.08971,11.60608 -45.82968,21.10196 -12.73997,9.49588 -21.37578,22.86046 -20.86277,41.0609 0.42752,14.50759 9.40535,25.4982 21.8033,34.29068 12.31246,8.61663 28.21604,15.12307 43.6066,20.75026 15.73258,5.71511 31.37966,10.55098 42.75157,15.65062 5.67742,3.1486 17.37018,7.11873 17.52815,14.59552 0,6.41851 -4.44617,12.0457 -13.16749,17.49704 -8.72132,5.45134 -21.29028,10.37513 -35.4838,14.94722 -32.17812,11.64583 -63.23097,18.14797 -91.31735,31.82879 l 1.88107,3.1653 c 2.74704,3.61078 8.11482,3.28372 11.71393,3.51699 27.48116,-0.1624 57.51883,-5.49365 81.48449,-11.43023 21.8033,-5.53926 43.5211,-13.01287 59.8522,-22.86045 16.5876,-9.84759 28.21603,-22.42084 28.55804,-37.80768 0.17101,-14.06797 -8.55031,-25.1465 -20.86276,-33.41144 -12.22695,-8.61663 -28.21604,-15.21099 -43.6066,-21.10196 -15.81808,-5.97888 -31.55066,-11.3423 -42.75157,-16.96949 -6.36091,-3.63362 -17.79659,-8.69976 -17.69915,-16.79364 1.70563,-8.5915 12.20775,-12.62108 18.72519,-15.47477 12.14144,-5.27549 28.64355,-10.28721 45.14565,-16.44194 16.58761,-6.15474 33.26072,-13.18873 46.00069,-23.21216 12.73997,-9.9355 21.63229,-22.86045 21.37579,-39.56617 -0.25651,-16.70572 -9.31985,-29.54275 -22.14532,-38.68693 -12.82547,-9.49588 -29.49858,-16.17817 -46.00069,-21.9812 -16.5876,-5.97889 -33.08971,-11.25438 -45.31666,-17.40912 -8.84128,-4.66587 -19.55008,-11.34184 -20.69176,-21.18989 0.29756,-9.34578 7.7268,-14.81613 14.96305,-17.76081 9.31984,-3.60492 21.6323,-4.48417 31.63616,-3.16529 9.40535,1.23094 19.0672,11.78192 30.61013,21.71743 6.84025,5.89096 17.35713,8.44078 23.51336,9.9355 6.49824,1.58265 10.26037,0.7034 15.13405,-0.61547 2.67061,-1.14969 3.44196,-3.31414 3.24912,-5.89096 -0.45652,-2.66377 -1.32759,-4.94617 -1.88107,-7.38569 3.1057,1.01047 6.04947,2.34062 9.06334,3.16529 2.30966,0.54982 5.11214,-0.0348 6.15622,-1.93434 7.45062,-17.69626 -7.36121,-36.857809 -18.55418,-45.545064 -12.82547,-9.583756 -30.78113,-16.617742 -50.44685,-16.705667 -6.49824,-1.055098 -13.08198,-1.582647 -27.66026,-1.62661 -14.57829,-0.04396 -36.8091,6.022851 -54.76476,17.189305 z m 125.68961,15.826469 c 0,5.890967 -4.61717,10.550977 -10.26038,10.550977 -5.72871,0 -10.26037,-4.74794 -10.26037,-10.550977 0,-5.890964 4.61716,-10.55098 10.26037,-10.55098 5.72871,0 10.26038,4.747941 10.26038,10.55098 z m -82.85254,19.871007 c 0.34201,8.08909 0.51302,16.09025 0.76953,24.17933 4.78817,2.54982 9.91836,4.66002 14.87754,6.59437 6.92576,2.72566 14.02252,5.18756 21.11928,7.64946 0.34201,-9.14419 0.68402,-18.28837 1.11154,-27.2567 -4.36066,-4.22039 -8.72132,-8.26494 -14.45003,-10.90268 -3.67664,-0.96717 -7.52428,-1.49472 -12.0987,-1.53869 -4.57441,-0.044 -8.08004,0.39567 -11.32916,1.27491 z m -16.50211,97.68449 c -1.62456,6.41851 3.50563,12.22155 4.70268,18.28837 2.8216,8.177 5.5577,16.35401 7.95179,24.61895 12.48346,-4.04454 25.22342,-7.56154 37.19386,-12.48533 0.17101,-4.66001 0.42752,-9.32003 0.68403,-13.89212 0.85503,-3.42907 2.39408,-6.68229 3.76213,-10.02343 -2.56509,-0.96717 -5.21569,-1.84642 -7.69528,-2.8136 -9.31984,-3.16529 -18.81069,-6.06681 -28.21603,-9.14418 l 0,1.14302 c -2.22308,-1.05509 -4.95918,-1.58264 -7.73804,-1.58264 -4.57441,0.0879 -9.02058,1.84642 -10.64514,5.89096 z m 19.23821,100.76186 c 0,5.62719 0,11.25437 0.0855,16.96949 9.40535,4.74794 19.49472,8.52871 29.58409,12.22155 2.56509,-11.07853 6.58374,-21.80536 9.91836,-32.53219 0,-4.57209 -6.24173,-6.50643 -10.43138,-5.45134 0,-0.61547 0.0855,-1.23094 0,-1.93434 -9.91837,3.34114 -19.75123,6.68228 -29.15657,10.72683 z m 0.0855,89.5954 c -4.18965,-0.17585 -8.1228,3.95662 -5.72871,7.56153 3.33462,8.70456 6.58374,17.49704 6.07072,26.72915 8.97783,-2.81359 17.87016,-5.80304 26.42047,-9.49588 0.17101,-8.79248 0.34202,-17.84874 0.42752,-26.72915 -4.61717,-1.7585 -9.31984,-3.34114 -13.93701,-4.92379 -4.36066,-1.58265 -8.72132,-3.07737 -13.16749,-4.61605 0,3.91265 -0.0855,7.69342 -0.0855,11.47419 z m 0.25651,80.45122 c 0.0855,12.48532 0.17101,24.97065 0.34201,37.45597 10.17488,-5.71511 22.23082,-10.55097 27.95953,-20.9261 1.45355,-3.78077 -2.30859,-7.03399 -1.53906,-10.90268 -0.171,-4.13247 -0.34201,-8.17701 -0.42751,-12.30948 -8.55032,2.54982 -17.44264,4.74794 -26.33497,6.68229 z" id="path3964" fill="#da0092"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/health/hospital.svg b/vtm-themes/resources/assets/symbols/health/hospital.svg
old mode 100755
new mode 100644
index 1de1a23a..91d66540
--- a/vtm-themes/resources/assets/symbols/health/hospital.svg
+++ b/vtm-themes/resources/assets/symbols/health/hospital.svg
@@ -1,77 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#DA0092" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path sodipodi:type="arc" id="path2207" sodipodi:cx="217.14285" sodipodi:cy="305.71429" sodipodi:rx="288.57144" sodipodi:ry="288.57144" d="m 505.71429,305.71429 a 288.57144,288.57144 0 1 1 -577.142879,0 288.57144,288.57144 0 1 1 577.142879,0 z" transform="matrix(0.86047263,0,0,0.86047263,100.67386,22.912007)" fill="none" stroke="#ffffff" stroke-width="25.14"/>
- <rect transform="scale(-1,-1)" id="rect3180" width="362.27" height="81.84" x="-468.66" y="-326.89" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="20"/>
- <rect y="246.6" x="-467.11" height="81.84" width="362.27" id="rect3182" transform="matrix(0,-1,1,0,0,0)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="20"/>
+ <path d="m 238.39124,109.8562 0,126.58754 -126.58754,0 c -5.35562,0 -9.7375,4.38187 -9.7375,9.7375 l 0,79.84752 c 0,5.35563 4.38188,9.73751 9.7375,9.73751 l 126.58754,0 0,126.58753 c 0,5.35563 4.38187,9.7375 9.7375,9.7375 l 79.84752,0 c 5.35563,0 9.73751,-4.38187 9.73751,-9.7375 l 0,-126.58753 126.58753,0 c 5.35563,0 9.7375,-4.38188 9.7375,-9.73751 l 0,-79.84752 c 0,-5.35563 -4.38187,-9.7375 -9.7375,-9.7375 l -126.58753,0 0,-126.58754 c 0,-5.35562 -4.38188,-9.7375 -9.73751,-9.7375 l -79.84752,0 c -5.35563,0 -9.7375,4.38188 -9.7375,9.7375 z M 35.851182,286.00763 c 0,139.24628 112.955028,252.20132 252.201318,252.20132 139.24629,0 252.20132,-112.95504 252.20132,-252.20132 0,-139.24629 -112.95503,-252.201324 -252.20132,-252.201324 -139.24629,0 -252.201318,112.955034 -252.201318,252.201324 z m 483.953888,0.58425 c 0,127.56128 -103.21753,231.75256 -230.77882,231.75256 -127.56128,0 -230.778812,-103.21753 -230.778812,-230.77881 0,-127.56129 103.217532,-230.778817 230.778812,-231.752568 126.58754,-0.97375 230.77882,102.243778 230.77882,230.778818 z" id="path4147" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="rect3180" d="m 238.39124,109.8562 0,126.58754 -126.58754,0 c -5.35562,0 -9.7375,4.38187 -9.7375,9.7375 l 0,79.84752 c 0,5.35563 4.38188,9.73751 9.7375,9.73751 l 126.58754,0 0,126.58753 c 0,5.35563 4.38187,9.7375 9.7375,9.7375 l 79.84752,0 c 5.35563,0 9.73751,-4.38187 9.73751,-9.7375 l 0,-126.58753 126.58753,0 c 5.35563,0 9.7375,-4.38188 9.7375,-9.73751 l 0,-79.84752 c 0,-5.35563 -4.38187,-9.7375 -9.7375,-9.7375 l -126.58753,0 0,-126.58754 c 0,-5.35562 -4.38188,-9.7375 -9.73751,-9.7375 l -79.84752,0 c -5.35563,0 -9.7375,4.38188 -9.7375,9.7375 z M 35.851182,286.00763 c 0,139.24628 112.955028,252.20132 252.201318,252.20132 139.24629,0 252.20132,-112.95504 252.20132,-252.20132 0,-139.24629 -112.95503,-252.201324 -252.20132,-252.201324 -139.24629,0 -252.201318,112.955034 -252.201318,252.201324 z m 483.953888,0.58425 c 0,127.56128 -103.21753,231.75256 -230.77882,231.75256 -127.56128,0 -230.778812,-103.21753 -230.778812,-230.77881 0,-127.56129 103.217532,-230.778817 230.778812,-231.752568 126.58754,-0.97375 230.77882,102.243778 230.77882,230.778818 z" fill="#da0092" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/health/pharmacy.svg b/vtm-themes/resources/assets/symbols/health/pharmacy.svg
old mode 100755
new mode 100644
index b7166661..a5520551
--- a/vtm-themes/resources/assets/symbols/health/pharmacy.svg
+++ b/vtm-themes/resources/assets/symbols/health/pharmacy.svg
@@ -1,77 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#DA0092" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect2160" width="285.71" height="122.86" x="154.19" y="223.46" fill="#ffffff" stroke-width="10"/>
- <rect id="rect3184" width="371.96" height="371.96" x="111.07" y="98.91" fill="none" stroke="#ffffff" stroke-width="21.17"/>
- <rect y="-358.48" x="142.03" height="122.86" width="285.71" id="rect3186" transform="matrix(0,1,-1,0,0,0)" fill="#ffffff" stroke-width="10"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4141" d="m 231,218 -82,0 c 0,44.33333 0,88.66667 0,133 l 82,0 0,82 132,0 0,-82 82,0 0,-133 -82,0 0,-81 c -44,0 -88,0 -132,0 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4143" d="m 101,481.6 393,0 0,-393 -393,-0.3 c 0,131.1 0,262.2 0,393.3 z m 372,-372 0,351 -351,0 0,-351 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 231,218 -82,0 c 0,44.33333 0,88.66667 0,133 l 82,0 0,82 132,0 0,-82 82,0 0,-133 -82,0 0,-81 c -44,0 -88,0 -132,0 z" id="rect2160" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#da0092" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 101,481.6 393,0 0,-393 -393,-0.3 c 0,131.1 0,262.2 0,393.3 z m 372,-372 0,351 -351,0 0,-351 z" id="rect3184" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#da0092" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/money/atm2.svg b/vtm-themes/resources/assets/symbols/money/atm2.svg
old mode 100755
new mode 100644
index dbe6d36c..8aeba1de
--- a/vtm-themes/resources/assets/symbols/money/atm2.svg
+++ b/vtm-themes/resources/assets/symbols/money/atm2.svg
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 159.27583,112.17164 C 157.44425,122.79359 59.489534,541.93811 59.489534,541.93811 L 520.92471,538.03892 L 420.90596,110.43556 L 159.27583,112.17164 z" id="path3243" sodipodi:nodetypes="ccccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="22.853"/>
- <path sodipodi:nodetypes="ccccc" id="path3163" d="M 159.27583,112.17164 C 157.44425,122.79359 59.489534,541.93811 59.489534,541.93811 L 520.92471,538.03892 L 420.90596,110.43556 L 159.27583,112.17164 z" opacity=".1" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.853"/>
- <g id="g5004" transform="matrix(1.2993468,0,0,1.1426251,-301.5384,133.33861)">
-  <path id="text2413" d="M 428.26872,167.17928 C 428.479,167.2846 429.26793,167.49498 430.63551,167.81042 C 452.19943,172.01817 468.39875,179.69707 479.23351,190.84714 C 490.06797,201.99743 495.48528,216.61889 495.48544,234.71157 C 495.48528,253.22514 489.54202,269.26668 477.65565,282.83622 C 465.76899,296.40579 449.3067,303.76912 428.26872,304.92622 L 428.26872,333.64322 L 411.38565,333.64322 L 411.38565,305.24179 C 389.92673,302.82241 373.46443,295.85354 361.99871,284.33518 C 350.53293,272.81685 344.06372,256.69643 342.59107,235.97386 L 370.9925,230.92471 C 373.20146,246.49296 377.67205,258.48466 384.40429,266.89986 C 391.13642,275.31512 400.1302,280.10129 411.38565,281.25836 L 411.38565,190.84714 C 390.03192,186.21887 374.04298,178.48738 363.41879,167.65264 C 352.79452,156.81816 347.48241,142.88043 347.48243,125.83942 C 347.48241,108.90394 352.74193,94.361371 363.261,82.211664 C 373.78001,70.062393 389.82154,63.040935 411.38565,61.147269 L 411.38565,47.577696 L 428.26872,47.577696 L 428.26872,61.147269 C 446.15099,62.935745 460.2465,68.616025 470.5553,78.188128 C 480.86381,87.760674 487.33302,101.17245 489.96294,118.42349 L 460.45701,122.6837 C 458.77383,111.95446 455.24996,103.46034 449.88537,97.201308 C 444.52054,90.942683 437.315,86.919151 428.26872,85.1307 L 428.26872,167.17928 z M 411.38565,163.70799 L 411.38565,84.815128 C 399.91981,86.813961 391.13642,91.41604 385.03543,98.621379 C 378.93433,105.82712 375.88381,114.16346 375.88386,123.63042 C 375.88381,134.4652 379.03952,143.01192 385.351,149.2706 C 391.66237,155.52958 400.34058,160.34204 411.38565,163.70799 L 411.38565,163.70799 z M 428.26872,281.25836 C 439.31361,279.57533 448.41258,274.76287 455.56565,266.82097 C 462.71847,258.87913 466.29494,248.85974 466.29508,236.76278 C 466.29494,226.13862 463.58629,217.5919 458.16912,211.1226 C 452.75168,204.65348 442.78489,199.15729 428.26872,194.634 L 428.26872,281.25836 z" transform="scale(1.0867055,0.9202125)" fill="#ffffff"/>
- </g>
- <path d="M 290.15306,178.9597 L 290.15306,481.80532" id="path4370" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="34.28"/>
- <path d="M 63.8125,49.75 L 63.8125,154.1875 L 147.96875,154.1875 C 154.64654,129.95596 158.94609,94.09998 159.28125,92.15625 L 420.90625,90.4375 L 433.1875,154.1875 L 516.1875,154.1875 L 516.1875,49.75 L 63.8125,49.75 z" id="rect7186" sodipodi:nodetypes="ccccccccc" opacity=".5" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="36.06"/>
+ <path d="m 112,91 c -12,-0.4 -19.9,11.90039 -18,22.90039 0.2,27 -0.499609,54 0.400391,81 1.9,11.3 13.999999,15.80039 23.999999,14.40039 15.21604,-0.14561 30.4324,0.0708 45.64844,-0.0273 -22.16972,96.03415 -44.88195,191.42959 -66.54883,287.62695 -0.5,9.6 10.00039,13.29922 17.90039,11.69922 120,-1.1 239,-1.89961 359,-3.09961 10,-0.9 12.00039,-12.5 8.40039,-20 -21.55868,-92.039 -42.9306,-184.07819 -64.58984,-276.11719 17.77394,-0.0948 35.61939,0.46308 53.28906,-0.38281 11.3,-1.9 15.80039,-14 14.40039,-24 -0.2,-26.4 0.49961,-53 -0.40039,-79 -1.3125,-10.5 -10.66309,-14.875 -19.67969,-15.134766 C 342.61016,91.130872 217.54591,91.00438 112,91 Z" id="path4140" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m112 91c-12-.4-19.9 11.9-18 22.9.2 27-.5 54 .4 81 1.9 11.3 14 15.8 24 14.4 20.9-.2 41.8.3 62.7-.3 17.5-3.5 16.3-24.5 19.8-38-1.2-10.2 4.6-11.9 13.2-10.7 54.7-.4 109-.7 164-1.1 2.6 12.8 4.6 25.8 7.7 38.6 4.3 12.6 18.4 11.9 29 11.6 18.9-.2 37.9.5 56.7-.4 11.3-1.9 15.8-14 14.4-24-.2-26.4.5-53-.4-79C484 94 472 90 462 91c-117 0-233 0-350 0" id="rect7186" fill="#734a08" opacity="0.5"/>
+ <path d="m393 146c-69 .6-201-.6-208 1.5-7.9 2.1-7.9 8.8-13.5 29.4-24.5 107-49.9 213-74 320-.5 9.6 10 13.3 17.9 11.7 120-1.1 239-1.9 359-3.1 10-.9 12-12.5 8.4-20-26-111-51.7-222-78-333-1.8-4-6.1-6.7-10.5-6.7m-9 22.9l74 314-335 2.8c24.6-105 49-210 73-316l188-1.3" id="path3163" fill="#734a08"/>
+ <path id="path3163-3-2" d="m187 159c-1.4 8.4-79 339-79 339l364-3.1-79-337-206 1.4" fill="#ffffff"/>
+ <path id="path3163-3" d="m187 159c-1.4 8.4-79 339-79 339l364-3.1-79-337-206 1.4" fill="#734a08" opacity="0.1"/>
+ <path d="m290 194c-9.9-.1-18 9.4-16.9 19-19.7 3-37.7 16.2-44.6 35-8.8 22.9-3.9 52.6 17.2 67 8.2 6.1 17.7 10 27.4 13l0 83C255 405 248 385 246 368l-26 4.6c5.8 37.9 21.9 51 53 63 .5 9.5-2.4 21 6.3 27.8 10 9 27.9 1.2 28-12.3.1-5.4 0-10.9 0-16.3 24.3-2.8 44.9-21.9 50.9-45.5 6.2-22.9.7-50.9-20-64.9-9.2-6.6-19.9-10.7-30.9-13.4l0-75c12.6 5.4 19 18.8 20.9 31.7l27-3.9c-2.4-20.5-15-40.6-35-47.6-13.5-5.4-13.9-3.6-14-5.1-.6-15.4-9.4-17.7-16.3-17.5m-16.9 42l0 65.9c-12.6-5.2-22.9-17-22.5-31-1.1-14.9 8.4-29.6 22.5-34.8m34 101c12.8 4.4 24.8 14.5 25.9 28.7 3.1 17.6-9.4 39-26 46l.3-10.4z" id="path4370" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/money/bank2.svg b/vtm-themes/resources/assets/symbols/money/bank2.svg
old mode 100755
new mode 100644
index a3c0ac75..35d76550
--- a/vtm-themes/resources/assets/symbols/money/bank2.svg
+++ b/vtm-themes/resources/assets/symbols/money/bank2.svg
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 286.94406,44.001595 L 34.884618,235.90902 L 85.296174,235.90902 L 85.296174,543.77001 L 236.53218,543.77001 L 340.81297,543.77001 L 488.59196,543.77001 L 488.59196,235.90902 L 539.00386,235.90902 L 286.94406,44.001595 L 286.94406,44.001595 L 286.94406,44.001595 z" id="path645" sodipodi:nodetypes="cccccccccccc" opacity=".2" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="1.241"/>
- <g id="g5004" transform="matrix(1.4559912,0,0,1.4559912,-376.41212,64.28652)" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.434">
-  <path id="text2413" d="M 424.47661,167.17928 C 424.68689,167.2846 425.47582,167.49498 426.8434,167.81042 C 448.40732,172.01817 468.39875,179.69707 479.23351,190.84714 C 490.06797,201.99743 495.48528,216.61889 495.48544,234.71157 C 495.48528,253.22514 489.54202,269.26668 477.65565,282.83622 C 465.76899,296.40579 445.51459,303.76912 424.47661,304.92622 L 415.62836,318.71586 L 411.38565,318.71586 L 411.38565,305.24179 C 389.92673,302.82241 373.46443,295.85354 361.99871,284.33518 C 350.53293,272.81685 344.06372,256.69643 342.59107,235.97386 L 370.9925,230.92471 C 373.20146,246.49296 377.67205,258.48466 384.40429,266.89986 C 391.13642,275.31512 400.1302,280.10129 411.38565,281.25836 L 411.38565,190.84714 C 390.03192,186.21887 374.04298,178.48738 363.41879,167.65264 C 352.79452,156.81816 347.48241,142.88043 347.48243,125.83942 C 347.48241,108.90394 352.74193,94.361371 363.261,82.211664 C 373.78001,70.062393 389.82154,63.040935 411.38565,61.147269 L 411.38565,47.577696 L 424.47661,47.577696 L 424.47661,61.147269 C 442.35888,62.935745 460.2465,68.616025 470.5553,78.188128 C 480.86381,87.760674 487.33302,101.17245 489.96294,118.42349 L 460.45701,122.6837 C 458.77383,111.95446 455.24996,103.46034 449.88537,97.201308 C 444.52054,90.942683 433.52289,86.919151 424.47661,85.1307 L 424.47661,167.17928 z M 411.38565,163.70799 L 411.38565,84.815128 C 399.91981,86.813961 391.13642,91.41604 385.03543,98.621379 C 378.93433,105.82712 375.88381,114.16346 375.88386,123.63042 C 375.88381,134.4652 379.03952,143.01192 385.351,149.2706 C 391.66237,155.52958 400.34058,160.34204 411.38565,163.70799 L 411.38565,163.70799 z M 424.47661,281.25836 C 435.5215,279.57533 448.41258,274.76287 455.56565,266.82097 C 462.71847,258.87913 466.29494,248.85974 466.29508,236.76278 C 466.29494,226.13862 463.58629,217.5919 458.16912,211.1226 C 452.75168,204.65348 438.99278,199.15729 424.47661,194.634 L 424.47661,281.25836 z" transform="scale(1.0867055,0.9202125)" sodipodi:nodetypes="ccccsccccsccsccssscccccccsccccssscccssscc" stroke-width="3.434" fill="#ffffff"/>
- </g>
- <path d="M 287.42618,131.3132 L 287.42618,493.62063" id="path4370" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="46.16"/>
- <path sodipodi:nodetypes="cccccccccccc" id="path3198" d="M 286.94406,34.001595 L 34.884618,225.90902 L 85.296174,225.90902 L 85.296174,543.77001 L 236.53218,543.77001 L 340.81297,543.77001 L 488.59196,543.77001 L 488.59196,225.90902 L 539.00386,225.90902 L 286.94406,34.001595 L 286.94406,34.001595 L 286.94406,34.001595 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="20"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4149" d="m55.8 236c-7 7.8-.8 16.3 11.6 16.5l30.9 0c.1 94-.3 189 .2 283 3.3 12.2 18.3 6.9 27.4 8 116-.1 231 .3 347-.2 12.2-3.3 6.9-18.3 8-27.4l0-263c13.2-.8 25-.2 39.8-1.2 8.7-4.6 4.6-14.5-3-20C451 180 311 66 294 57.8 291 55 286 56.9 283 58 265 71 124 183 55.8 236" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m55.8 236c-7 7.8-.8 16.3 11.6 16.5l30.9 0c.1 94-.3 189 .2 283 3.3 12.2 18.3 6.9 27.4 8 116-.1 231 .3 347-.2 12.2-3.3 6.9-18.3 8-27.4l0-263c13.2-.8 25-.2 39.8-1.2 8.7-4.6 4.6-14.5-3-20C451 180 311 66 294 57.8 291 55 286 56.9 283 58 265 71 124 183 55.8 236" id="path3198" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path id="path4162" d="m290 80l197 152c-8.8.6-24-3.5-25.8 9.3-.1 94 0 188 0 282l-342 0c-.1-94 .3-189-.2-283-2.9-11.6-17-7.2-25.6-8z" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M292 135C278 135 264 148 266 170 156 192 160 304 267 329L267 434C241 428 228 400 225 376 212 376 191 379 181 382 170 422 239 472 268 471 268 520 311 507 313 472 431 455 431 319 314 299L314 205C339 202 349 237 350 248 364 246 379 245 393 242 384 204 351 171 313 169 315 146 303 135 292 135M268 204L268 288C221 272 227 215 268 204M314 341C401 358 350 449 311 437L314 341" id="path4146" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/oneway.svg b/vtm-themes/resources/assets/symbols/oneway.svg
old mode 100755
new mode 100644
index 5f84dd9d..b920d471
--- a/vtm-themes/resources/assets/symbols/oneway.svg
+++ b/vtm-themes/resources/assets/symbols/oneway.svg
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg height="60" version="1.0" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">
- <metadata/>
- <defs id="defs3">
-  <linearGradient id="linearGradient575">
-   <stop id="stop576"/>
-   <stop id="stop577" offset="1" stop-color="#fff"/>
-  </linearGradient>
-  <linearGradient id="linearGradient578" xlink:href="#linearGradient575"/>
- </defs>
- <path d="M 55.186040,31.208662 L 4.0814158,31.208662" id="path831" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="none" fill-rule="evenodd" stroke="#666666" stroke-linejoin="round" fill-opacity=".75" stroke-linecap="round" stroke-width="5"/>
- <path d="M 43.687955,21.951630 L 56.607159,31.232880 L 43.996605,41.545380 L 43.687955,21.951630 z " id="path869" sodipodi:nodetypes="cccc" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#666666" fill-rule="evenodd" stroke="#666666" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.712"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" height="22" width="22">
+ <metadata id="metadata3025"/>
+ <path stroke-miterlimit="10" inkscape:connector-curvature="0" d="m 4.8081,9.8895 7.3149,0.066 C 11.202,9.1774 10.289,8.3996 9.3792,7.6219 l 3.3408,0 c 1.415,1.1264 2.832,2.2522 4.248,3.3781 -1.416,1.125 -2.833,2.251 -4.25,3.377 l -3.3406,0 C 10.287,13.599 11.2,12.822 12.11,12.044 l -7.292,0 z" id="path8070" sodipodi:nodetypes="cccccccccc" opacity="0.809" fill="#ffffff" stroke="#ffffff" stroke-linecap="square" stroke-width="1.75"/>
+ <path id="path8097" d="M 4.7991,9.8793 C 3.9666,9.854 12.087,9.9512 12.087,9.9512 11.177,9.1731 10.266,8.3951 9.3549,7.6172 l 3.3411,0 4.249,3.3778 c -1.416,1.125 -2.833,2.25 -4.249,3.375 l -3.3411,0 c 0.9111,-0.776 1.8221,-1.554 2.7321,-2.331 l -7.2879,0.02 0,-2.1828 z" stroke-miterlimit="10" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc" opacity="0.749" stroke-opacity="0.914" fill="#2c2c2c" stroke-linecap="square" stroke-width="0.714"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/peak.svg b/vtm-themes/resources/assets/symbols/peak.svg
index f7f36b39..bcae1683 100755
--- a/vtm-themes/resources/assets/symbols/peak.svg
+++ b/vtm-themes/resources/assets/symbols/peak.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="580" viewBox="0 0 6444.4444 6444.4444" height="580">
  <metadata id="metadata9"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4138" d="m 2126.6284,4166.6666 1228.927,-2010.9689 1228.927,2010.9689 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="1024" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" stroke="#ffffff" shape-rendering="auto"/>
  <path d="m 2126.6284,4166.6666 1228.927,-2010.9689 1228.927,2010.9689 z" id="path3-9" inkscape:connector-curvature="0" fill="#aaaaaa" stroke="#000000" stroke-width="266.67"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/buddhist.svg b/vtm-themes/resources/assets/symbols/place_of_worship/buddhist.svg
old mode 100755
new mode 100644
index 21f11798..2f5bb832
--- a/vtm-themes/resources/assets/symbols/place_of_worship/buddhist.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/buddhist.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <path sodipodi:nodetypes="cccccsscccsscscssssssscccsccsscscccccscccccccccscccccccsccssssccccccsccssssccccssccccccccc" id="path1873" d="M 280.45232,351.0856 C 277.43419,348.06748 275.84773,343.41129 275.84773,337.57138 L 275.84773,328.66173 L 262.49006,326.03378 C 210.65689,315.83622 164.81361,262.10766 153.68952,206.43494 C 150.29668,206.17303 148.4207,206.04102 144.83531,206.04102 C 133.62187,206.04102 126.19856,198.55847 126.19856,187.25554 C 126.19856,176.9815 132.51373,170.9715 144.03881,170.2774 L 152.67495,169.75729 L 156.75091,153.94029 C 163.55106,127.55203 173.64828,110.19179 194.09024,89.74248 C 215.04145,68.783745 232.57775,58.258482 257.89376,51.986409 C 265.58571,50.080707 266.17636,51.550653 274.83479,49.61912 C 275.9787,37.59131 274.93659,24.177035 293.32587,24.807587 C 307.86077,25.314645 309.24834,34.189669 309.30829,48.915792 C 314.29299,49.404247 315.91109,49.551548 324.53991,51.325857 C 376.42237,61.994255 423.01288,108.80083 432.10404,161.14627 C 433.54291,169.43096 434.31524,170.28327 439.79753,169.63646 C 447.03415,168.78268 458.88851,174.41686 460.90347,179.66777 C 465.89432,192.67376 458.5776,203.84919 443.76989,205.83729 C 434.07561,207.13887 433.61582,207.56019 432.0836,216.5463 C 429.68392,230.61981 420.26767,252.17141 409.75408,267.65333 C 391.2241,294.93995 362.33756,315.24426 328.80051,324.5555 L 311.5333,329.34959 L 310.78772,338.49087 C 310.37764,343.51858 308.40402,349.44521 306.40187,351.66117 C 301.27825,357.33196 286.36795,357.00123 280.45232,351.0856 z M 275.84773,262.44725 C 275.84773,246.61897 275.04784,233.66856 274.07017,233.66856 C 273.09252,233.66856 263.53913,242.46775 252.84043,253.22232 C 242.07301,264.04596 235.99284,270.69222 233.73277,273.95455 C 236.51863,275.99429 241.40894,281.49231 253.64702,286.52338 C 263.9013,290.7389 272.35289,291.94646 276.22088,292.52977 C 275.58128,287.71997 275.84773,280.5058 275.84773,262.44725 z M 344.98854,281.11621 L 355.00988,274.93805 L 334.47074,254.30331 C 323.17421,242.9542 313.13298,233.66856 312.15687,233.66856 C 311.18077,233.66856 310.38215,246.74847 310.38215,262.73503 L 310.38215,291.80151 L 322.67468,289.54793 C 326.79003,288.72619 336.83126,284.93192 344.98854,281.11621 z M 229.78493,226.1861 L 251.11797,206.04102 L 220.63418,206.04102 L 190.15037,206.04102 L 191.71119,214.36094 C 193.49657,223.87782 204.71227,247.84015 206.95733,246.93424 C 207.77932,246.60255 218.05174,237.26589 229.78493,226.1861 z M 390.57154,231.57402 C 394.17463,223.65988 395.74077,217.12035 396.52721,213.63813 L 397.95707,206.04102 L 367.45581,206.04102 L 336.95455,206.04102 L 357.5792,226.76167 C 368.92276,238.15803 379.05691,247.48233 380.09953,247.48233 C 381.14215,247.48233 386.96847,239.48816 390.57154,231.57402 z M 301.74569,208.81137 C 305.70527,206.7638 312.20453,199.93948 314.12191,195.35057 C 317.17795,188.03643 315.30759,180.29542 309.56753,174.00175 C 300.41372,163.96508 288.52246,163.90495 278.36549,173.47529 C 268.45404,182.81427 270.88066,195.78289 276.50825,202.36851 C 282.96265,209.92168 293.40678,213.12359 301.74569,208.81137 z M 248.22019,169.1563 C 248.22019,168.49676 239.03905,158.81856 227.81766,147.64916 L 207.41514,127.34117 L 202.50423,135.28717 C 196.98717,144.21395 193.4476,153.85771 190.40965,170.41333 C 191.92862,170.62714 194.41671,170.35545 219.4415,170.35545 C 235.26978,170.35545 248.22019,169.81584 248.22019,169.1563 z M 396.07391,164.15525 C 395.7017,161.12675 393.91968,151.85361 390.1968,143.55202 C 386.43526,135.16423 380.72932,127.76299 379.73128,127.76299 C 378.06665,127.76299 338.00983,167.50426 338.00932,169.1563 C 338.00911,169.81584 351.21853,170.13991 367.36358,169.87646 C 396.44209,169.40198 396.71215,169.34817 396.07391,164.15525 z M 275.84773,113.90536 L 275.84773,83.931672 L 269.51641,85.361535 C 257.97835,85.866428 233.8459,99.206293 234.40642,101.69567 C 234.7583,103.2584 273.67415,143.87906 275.22415,143.87906 C 275.56712,143.87906 275.84773,130.3909 275.84773,113.90536 z M 338.93109,91.669754 C 330.33285,87.633647 320.45469,86.285999 317.28903,85.890188 L 311.5333,85.170537 L 310.89377,115.10037 L 310.25421,145.0302 L 332.28266,123.1584 L 354.31109,101.2866 L 338.93109,91.669754 z" fill="#ffffff"/>
+ <path id="path4159" d="M 287.90234 36.982422 C 271.94739 37.181375 272.67266 49.272656 271.80078 60.800781 C 213.80078 64.800781 169.10078 118.00078 154.80078 175.80078 C 141.40078 175.20078 132.8 176.59961 129.5 192.59961 C 129.8 204.29961 141.10078 213.8 155.80078 211 C 166.80078 265 210.20078 316.2 259.80078 326 C 274.80078 329 273.09961 324.7 272.59961 337 C 272.59961 342.6 274.1 347.1 277 350 L 277.40039 350.40039 C 283.20039 356.10039 297.29922 356.4 302.19922 351 C 304.09922 348.9 306.00039 343.20039 306.40039 338.40039 C 307.60039 323.90039 302.59961 332.6 323.59961 325 C 366.69961 312 411.59961 271 422.59961 221 C 424.09961 212.4 424.50078 211.99922 433.80078 210.69922 C 448.00078 208.69922 454.99922 198.19922 450.19922 185.69922 C 448.49922 180.69922 437.09922 175.29961 430.19922 176.09961 C 424.89922 176.79961 424.20078 175.9 422.80078 168 C 413.80078 123 364.80078 64.1 304.80078 60 C 304.70078 46 303.4 37.5 289.5 37 C 288.95 36.98125 288.41702 36.976004 287.90234 36.982422 z M 273 94.25 C 273 94.25 272.90039 126.2 272.40039 151.5 C 271.00039 151.5 233.70039 112.5 233.40039 111 C 234.00039 105.7 264.2 95.4 273 94.25 z M 307 95.849609 C 320 96.999609 336.00078 100.99922 347.80078 110.69922 L 305.80078 152.69922 L 307 95.849609 z M 207.59961 135.59961 C 222.59961 150.59961 231.69961 161.09961 246.59961 175.59961 L 246.30078 175.40039 C 225.30078 175.80039 209.50078 176.59961 191.30078 176.59961 C 193.60078 164.99961 198.59961 148.89961 207.59961 135.59961 z M 371.94922 136 C 377.89922 138.6 387.29961 166.59961 388.09961 176.59961 C 372.89961 176.49961 343.69961 176.99922 332.09961 175.69922 C 332.09961 173.99922 370.39922 136 371.94922 136 z M 290.76172 172.90039 C 295.89922 172.97539 300.90078 175.39922 305.30078 180.19922 C 310.80078 186.19922 312.59922 193.69922 309.69922 200.69922 C 305.49922 209.49922 301.59922 211.59961 297.69922 213.59961 C 289.79922 217.69961 279.79961 214.60039 273.59961 207.40039 C 268.19961 201.10039 265.90039 188.69922 275.40039 179.69922 C 280.35039 175.09922 285.62422 172.82539 290.76172 172.90039 z M 190.80078 210.90039 L 248.80078 210.90039 C 234.80078 223.90039 221.10078 237.10039 206.80078 249.90039 C 203.10078 249.90039 191.80078 219.70039 190.80078 210.90039 z M 331.80078 210.90039 L 389.80078 210.90039 C 387.50078 223.80039 382.80078 239.69922 372.80078 250.69922 C 357.80078 236.79922 345.60078 224.40039 331.80078 210.90039 z M 270.84961 237.19922 C 271.79961 237.39922 272.30039 288.80039 272.90039 293.40039 C 254.90039 290.60039 245.50078 285.89961 232.30078 275.59961 C 247.40078 259.89961 257.09961 249.79922 270.84961 237.19922 z M 306.80078 237.40039 C 319.80078 250.50039 328.50078 259.99922 347.80078 276.94922 C 334.00078 285.49922 321.99961 290.39922 305.09961 293.19922 C 305.09961 271.79922 305.80078 258.40039 306.80078 237.40039 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path color-interpolation="sRGB" color-rendering="auto" color="#000000" solid-color="#000000" image-rendering="auto" solid-opacity="1" white-space="normal" isolation="auto" color-interpolation-filters="linearRGB" mix-blend-mode="normal" shape-rendering="auto" id="path4141" d="m207 362c-5.3 0-9.6 4.3-9.6 9.6l0 161c0 5.3 4.3 9.6 9.6 9.6l161 0c5.3 0 9.6-4.3 9.6-9.6l0-161c0-5.3-4.3-9.6-9.6-9.6z" opacity="0.8" filter-gaussianBlur-deviation="0" stroke-width="64" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff"/>
+ <path d="M 287.90234 36.982422 C 271.94739 37.181375 272.67266 49.272656 271.80078 60.800781 C 213.80078 64.800781 169.10078 118.00078 154.80078 175.80078 C 141.40078 175.20078 132.8 176.59961 129.5 192.59961 C 129.8 204.29961 141.10078 213.8 155.80078 211 C 166.80078 265 210.20078 316.2 259.80078 326 C 274.80078 329 273.09961 324.7 272.59961 337 C 272.59961 342.6 274.1 347.1 277 350 L 277.40039 350.40039 C 283.20039 356.10039 297.29922 356.4 302.19922 351 C 304.09922 348.9 306.00039 343.20039 306.40039 338.40039 C 307.60039 323.90039 302.59961 332.6 323.59961 325 C 366.69961 312 411.59961 271 422.59961 221 C 424.09961 212.4 424.50078 211.99922 433.80078 210.69922 C 448.00078 208.69922 454.99922 198.19922 450.19922 185.69922 C 448.49922 180.69922 437.09922 175.29961 430.19922 176.09961 C 424.89922 176.79961 424.20078 175.9 422.80078 168 C 413.80078 123 364.80078 64.1 304.80078 60 C 304.70078 46 303.4 37.5 289.5 37 C 288.95 36.98125 288.41702 36.976004 287.90234 36.982422 z M 273 94.25 C 273 94.25 272.90039 126.2 272.40039 151.5 C 271.00039 151.5 233.70039 112.5 233.40039 111 C 234.00039 105.7 264.2 95.4 273 94.25 z M 307 95.849609 C 320 96.999609 336.00078 100.99922 347.80078 110.69922 L 305.80078 152.69922 L 307 95.849609 z M 207.59961 135.59961 C 222.59961 150.59961 231.69961 161.09961 246.59961 175.59961 L 246.30078 175.40039 C 225.30078 175.80039 209.50078 176.59961 191.30078 176.59961 C 193.60078 164.99961 198.59961 148.89961 207.59961 135.59961 z M 371.94922 136 C 377.89922 138.6 387.29961 166.59961 388.09961 176.59961 C 372.89961 176.49961 343.69961 176.99922 332.09961 175.69922 C 332.09961 173.99922 370.39922 136 371.94922 136 z M 290.76172 172.90039 C 295.89922 172.97539 300.90078 175.39922 305.30078 180.19922 C 310.80078 186.19922 312.59922 193.69922 309.69922 200.69922 C 305.49922 209.49922 301.59922 211.59961 297.69922 213.59961 C 289.79922 217.69961 279.79961 214.60039 273.59961 207.40039 C 268.19961 201.10039 265.90039 188.69922 275.40039 179.69922 C 280.35039 175.09922 285.62422 172.82539 290.76172 172.90039 z M 190.80078 210.90039 L 248.80078 210.90039 C 234.80078 223.90039 221.10078 237.10039 206.80078 249.90039 C 203.10078 249.90039 191.80078 219.70039 190.80078 210.90039 z M 331.80078 210.90039 L 389.80078 210.90039 C 387.50078 223.80039 382.80078 239.69922 372.80078 250.69922 C 357.80078 236.79922 345.60078 224.40039 331.80078 210.90039 z M 270.84961 237.19922 C 271.79961 237.39922 272.30039 288.80039 272.90039 293.40039 C 254.90039 290.60039 245.50078 285.89961 232.30078 275.59961 C 247.40078 259.89961 257.09961 249.79922 270.84961 237.19922 z M 306.80078 237.40039 C 319.80078 250.50039 328.50078 259.99922 347.80078 276.94922 C 334.00078 285.49922 321.99961 290.39922 305.09961 293.19922 C 305.09961 271.79922 305.80078 258.40039 306.80078 237.40039 z " id="path4156"/>
+ <path d="m207 362c-5.3 0-9.6 4.3-9.6 9.6l0 161c0 5.3 4.3 9.6 9.6 9.6l161 0c5.3 0 9.6-4.3 9.6-9.6l0-161c0-5.3-4.3-9.6-9.6-9.6z" id="rect4154" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <path d="m217 381l142 0 0 142-142 0z" id="rect3587-8" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/christian.svg b/vtm-themes/resources/assets/symbols/place_of_worship/christian.svg
old mode 100755
new mode 100644
index 8c4794cd..a7308642
--- a/vtm-themes/resources/assets/symbols/place_of_worship/christian.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/christian.svg
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path sodipodi:nodetypes="ccccccccccccccc" id="path1873" d="M 252.87907,338.30209 L 251.58366,187.28894 L 174.48428,186.77133 L 174.48428,147.45456 L 174.48428,110.13779 L 251.1406,108.74859 L 252.52983,24.092246 L 330.93978,22.722169 L 330.93978,108.87899 L 408.9853,108.87899 L 408.9853,147.45456 L 408.9853,186.03012 L 330.93978,186.03012 L 330.93978,340.05081 C 306.13967,337.1988 277.0394,344.69682 252.87907,338.30209 z" fill="#ffffff"/>
- <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <path d="M 330.59051,338.30209 L 331.88592,187.28894 L 408.9853,186.77133 L 408.9853,147.45456 L 408.9853,110.13779 L 332.32898,108.74859 L 330.93975,24.092246 L 252.5298,22.722169 L 252.5298,108.87899 L 174.48428,108.87899 L 174.48428,147.45456 L 174.48428,186.03012 L 252.5298,186.03012 L 252.5298,340.05081 C 277.32991,337.1988 306.43018,344.69682 330.59051,338.30209 z" id="path4237" sodipodi:nodetypes="ccccccccccccccc" fill="#ffffff"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4149" d="m 208,369 c -5.4,0 -9.7,4.4 -9.7,9.8 l 0,164 c 0,5.4 4.4,9.8 9.7,9.8 l 164,0 c 5.4,0 9.7,-4.4 9.7,-9.8 l 0,-164 c 0,-5.4 -4.4,-9.8 -9.7,-9.8 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" stroke-linecap="round" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 250.7,198 -75,-0.5 0,-38 0,-36.4 75,-1.4 1.3,-83 76,-1.3 0,84 75.9,0 0,37.6 0,37.6 -75.9,0 0,150 c -24,-2.8 -52,4.5 -75.95,-1.65 z" id="path4151" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" stroke-linecap="round" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 208,369 c -5.4,0 -9.7,4.4 -9.7,9.8 l 0,164 c 0,5.4 4.4,9.8 9.7,9.8 l 164,0 c 5.4,0 9.7,-4.4 9.7,-9.8 l 0,-164 c 0,-5.4 -4.4,-9.8 -9.7,-9.8 z" id="rect4154" mix-blend-mode="normal" isolation="auto" white-space="normal" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 218,389 144,0 0,145 -144,0 z" id="rect3587" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path id="path1873" d="m 250.7,198 -75,-0.5 0,-38 0,-36.4 75,-1.4 1.3,-83 76,-1.3 0,84 75.9,0 0,37.6 0,37.6 -75.9,0 0,150 c -24,-2.8 -52,4.5 -75.95,-1.65 z"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/hindu.svg b/vtm-themes/resources/assets/symbols/place_of_worship/hindu.svg
old mode 100755
new mode 100644
index 2c9af0e8..c4a2a998
--- a/vtm-themes/resources/assets/symbols/place_of_worship/hindu.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/hindu.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <path sodipodi:nodetypes="csssssscccsssssssssssssssssssssscccsccsscccssccsssssssssccscccsccc" id="path1873" d="M 233.54049,347.62872 C 213.75971,342.46687 196.65989,332.13347 180.58034,315.62495 C 154.96822,289.32955 140.97921,261.18805 132.69544,219.29547 C 127.97071,195.40161 127.96268,194.82006 132.3137,191.6385 C 141.22682,185.12106 144.74973,187.46976 147.73968,201.92289 C 163.32192,277.24567 212.13578,326.21161 259.62247,314.15426 C 273.78502,310.55824 287.29626,296.96205 291.36071,282.21644 C 296.60146,263.20329 287.36895,230.34773 271.32042,210.89935 L 265.61709,203.9878 L 255.97615,213.92213 C 245.78068,224.42787 233.21595,233.08707 228.14604,233.10173 C 225.0976,233.11056 211.17953,204.95934 211.17953,198.78466 C 211.17953,196.97637 217.79955,192.4703 225.89069,188.77121 C 248.59692,178.39041 258.25522,166.69799 258.25522,149.59045 C 258.25522,138.45705 256.29252,134.57469 248.67174,130.63384 C 238.85908,125.55951 222.52035,126.42735 202.71829,133.07469 C 193.07707,136.31115 184.6372,138.95916 183.96301,138.95916 C 182.22773,138.95916 168.81141,108.59734 168.81141,104.67031 C 168.81141,97.933468 183.36218,93.32916 207.64886,92.380938 C 229.92373,91.511261 231.87902,91.825962 244.08949,98.246192 C 259.43529,106.31499 270.84413,120.28571 275.84826,137.13646 C 279.92965,150.87997 280.51704,168.77094 277.17544,177.56002 C 273.61654,186.92062 278.14282,186.99335 290.2264,177.76974 C 303.42934,167.69173 312.36023,163.74225 326.86536,161.56707 C 337.32426,159.99867 337.84033,159.54234 340.69796,149.33584 C 347.51869,124.97462 365.58474,110.59457 389.80101,110.2512 C 407.87841,109.99487 418.04158,113.71169 428.47247,124.39389 C 442.24256,138.49574 447.17416,155.51904 448.37539,193.0962 C 449.86642,239.73936 443.6022,264.9502 425.35879,285.72833 C 409.63346,303.63849 384.89655,310.25808 365.59648,301.72074 C 349.30862,294.51585 345.01212,283.33618 343.14263,243.29515 C 341.9417,217.57316 340.94094,211.45534 337.27083,207.39994 C 331.59195,201.12484 328.10423,201.2696 312.74898,208.41785 L 300.15989,214.2784 L 305.21177,221.92914 C 338.0315,271.63231 331.2354,325.75439 289.87721,344.04908 C 276.85241,349.81056 248.74542,351.59649 233.54049,347.62872 z M 403.65009,263.70594 C 420.619,253.35996 431.85542,224.27909 429.3899,197.08899 C 427.77836,179.31651 417.43214,158.36747 406.78402,151.31652 C 392.36822,141.7707 372.56646,144.91301 359.58642,158.8062 L 353.82045,164.97782 L 358.34454,172.56409 C 362.109,178.87656 362.99412,185.68354 363.61587,213.10337 C 364.48889,251.60321 364.84749,253.87543 371.35657,262.1504 C 377.5611,270.03817 392.11453,270.73919 403.65009,263.70594 z M 286.51333,104.43384 C 280.69468,102.3981 271.52115,97.696372 266.12772,93.985583 C 255.35849,86.576176 234.71738,64.131051 234.71738,59.830052 C 234.71738,58.338482 237.4288,55.341526 240.74274,53.170136 C 246.64092,49.305504 246.96939,49.403987 256.30229,57.835714 C 268.66992,69.009129 280.06803,73.66515 295.13521,73.698644 C 308.63506,73.728655 324.89286,65.904416 333.15448,55.401453 C 335.701,52.164081 338.57709,49.515344 339.54579,49.515344 C 341.41947,49.515344 366.46173,70.11995 369.51958,74.177569 C 372.46744,78.089229 348.05053,98.475051 334.21934,103.64999 C 319.26122,109.24653 301.12096,109.54459 286.51333,104.43384 z M 287.34106,51.792348 C 281.0532,45.171317 275.61335,38.946216 275.25249,37.95878 C 274.89161,36.971344 280.01963,31.090578 286.6481,24.890427 L 298.69986,13.617424 L 311.23557,25.997436 C 318.13023,32.80644 323.20372,39.559471 322.50999,41.004154 C 321.81628,42.448859 316.19177,48.175805 310.01111,53.730737 L 298.77353,63.830567 L 287.34106,51.792348 z" fill="#ffffff"/>
+ <path id="path4139" d="m 151,256 c -5.5,-16.5 -9.3,-33.6 -10.6,-51 11.5,-17.5 20.9,8.6 20.4,19.3 10.2,37 31,75 68,90 22.4,9.1 52,0.3 61,-23.7 8.8,-24.9 -2.9,-51.9 -17,-72 -11.6,-11.2 -19.8,16.3 -32.7,18.5 -12.8,7.6 -21.4,-17.5 -22,-28 6.2,-11.7 23,-12.2 31.5,-22.5 11.3,-9.4 17.7,-32 3.6,-41.7 -16.5,-8.8 -35.9,-2.7 -51.7,4.6 -16.9,5.5 -28,-25 -19,-36.4 16.4,-5.5 34.8,-6.3 52,-4.7 33.9,7.6 53,47 44,80 0.9,15.5 18.4,-8.4 26,-8.8 14.5,-6.8 35,-5.2 36.7,-26 11,-32 60,-38.5 81,-13.2 18.4,22.5 16.2,53.6 16.8,80.9 -0.1,30 -8.5,64.8 -36.5,81 -16.9,9.7 -43,9.5 -54,-8.7 -10,-21 -6.6,-45 -8.8,-67 -4.8,-20.6 -27.5,-11.9 -38,-2.6 13,20 24.4,43 23.4,68 0.1,24.4 -15.4,48.9 -39.6,55 -15,4.4 -31.5,4.4 -47.1,1.2 C 195,336.1 165,297 151,256 Z m 266.7,-66.5 c -4.9,-16.7 -19.6,-33.4 -38.7,-30 -13.6,2.7 -35.6,14.9 -21.8,29.7 6.2,23.3 0.5,48 5.9,72 4.1,15.3 23,17.2 34.65,8.85 C 421.7,251.5 427.2,216.5 417.7,189.5 Z M 240.4,80.3 c 2.3,-19.3 23,-4.5 29.6,3.9 20,12.5 49.6,7 63,-12.5 13.3,-4.6 27.9,14.5 31,22.9 -17,23 -48.8,35 -76,25.35 C 268,112.9 252.4,97.3 240.4,80.3 Z m 52.4,-38.9 c 9.5,-13.7 21,9.7 28,17.4 -1.9,8.2 -15.7,19.8 -22.5,22 -3.2,-3.3 -6.3,-6.7 -9.5,-9.95 -14.8,-7.95 -8.5,-22.95 4,-29.45 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4141" d="m 211,360 c -5.4,0 -9.7,4.4 -9.7,9.8 l 0,164 c 0,5.4 4.4,9.8 9.7,9.8 l 164,0 c 5.4,0 9.7,-4.4 9.7,-9.8 l 0,-164 c 0,-5.4 -4.4,-9.8 -9.7,-9.8 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 151,256 c -5.5,-16.5 -9.3,-33.6 -10.6,-51 11.5,-17.5 20.9,8.6 20.4,19.3 10.2,37 31,75 68,90 22.4,9.1 52,0.3 61,-23.7 8.8,-24.9 -2.9,-51.9 -17,-72 -11.6,-11.2 -19.8,16.3 -32.7,18.5 -12.8,7.6 -21.4,-17.5 -22,-28 6.2,-11.7 23,-12.2 31.5,-22.5 11.3,-9.4 17.7,-32 3.6,-41.7 -16.5,-8.8 -35.9,-2.7 -51.7,4.6 -16.9,5.5 -28,-25 -19,-36.4 16.4,-5.5 34.8,-6.3 52,-4.7 33.9,7.6 53,47 44,80 0.9,15.5 18.4,-8.4 26,-8.8 14.5,-6.8 35,-5.2 36.7,-26 11,-32 60,-38.5 81,-13.2 18.4,22.5 16.2,53.6 16.8,80.9 -0.1,30 -8.5,64.8 -36.5,81 -16.9,9.7 -43,9.5 -54,-8.7 -10,-21 -6.6,-45 -8.8,-67 -4.8,-20.6 -27.5,-11.9 -38,-2.6 13,20 24.4,43 23.4,68 0.1,24.4 -15.4,48.9 -39.6,55 -15,4.4 -31.5,4.4 -47.1,1.2 C 195,336.1 165,297 151,256 Z m 266.7,-66.5 c -4.9,-16.7 -19.6,-33.4 -38.7,-30 -13.6,2.7 -35.6,14.9 -21.8,29.7 6.2,23.3 0.5,48 5.9,72 4.1,15.3 23,17.2 34.65,8.85 C 421.7,251.5 427.2,216.5 417.7,189.5 Z M 240.4,80.3 c 2.3,-19.3 23,-4.5 29.6,3.9 20,12.5 49.6,7 63,-12.5 13.3,-4.6 27.9,14.5 31,22.9 -17,23 -48.8,35 -76,25.35 C 268,112.9 252.4,97.3 240.4,80.3 Z m 52.4,-38.9 c 9.5,-13.7 21,9.7 28,17.4 -1.9,8.2 -15.7,19.8 -22.5,22 -3.2,-3.3 -6.3,-6.7 -9.5,-9.95 -14.8,-7.95 -8.5,-22.95 4,-29.45 z" id="path1873"/>
+ <path d="m 211,360 c -5.4,0 -9.7,4.4 -9.7,9.8 l 0,164 c 0,5.4 4.4,9.8 9.7,9.8 l 164,0 c 5.4,0 9.7,-4.4 9.7,-9.8 l 0,-164 c 0,-5.4 -4.4,-9.8 -9.7,-9.8 z" id="rect4154" mix-blend-mode="normal" isolation="auto" white-space="normal" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 220,379 144,0 0,145 -144,0 z" id="rect3587-1" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/islamic.svg b/vtm-themes/resources/assets/symbols/place_of_worship/islamic.svg
old mode 100755
new mode 100644
index bfc5a018..1d3ab7b0
--- a/vtm-themes/resources/assets/symbols/place_of_worship/islamic.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/islamic.svg
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <path sodipodi:nodetypes="csssssssssssssssccsssscccscccssssssssc" id="path1873" d="M 266.27191,338.46746 C 260.59781,337.33925 249.57157,334.17247 241.76917,331.43013 C 201.78148,317.3756 163.16711,277.79592 148.75805,236.09385 C 143.73116,221.54535 140.48848,205.70356 140.67929,184.37152 C 140.86558,163.02439 143.73116,149.32924 148.75805,134.78074 C 162.49521,95.023282 197.24218,57.65041 235.55736,41.421818 C 249.47682,35.52616 280.3977,29.792141 298.27076,29.792141 C 324.90997,29.792141 375.34975,46.634001 385.56168,58.938612 C 390.78237,65.229172 385.92607,65.442393 360.19952,60.052157 C 339.61098,55.738445 332.78127,55.340611 316.86214,57.527798 C 271.02557,63.825407 229.79036,98.368958 213.31063,144.27494 C 205.53652,165.9305 205.50676,204.87477 213.24788,226.39196 C 229.27444,270.9394 269.87117,305.7759 314.70812,313.45615 C 328.62302,315.83966 335.00407,315.45669 357.83937,310.86755 C 372.57953,307.90528 385.59713,306.40329 386.76734,307.5298 C 389.49226,310.15296 377.23466,318.87595 359.26055,327.1048 C 332.72077,339.25509 294.01832,343.98431 266.27191,338.46746 z M 351.41797,235.96429 C 350.63745,234.70138 352.87283,225.21819 356.38549,214.89056 C 359.89816,204.5629 362.77217,195.79541 362.77217,195.40725 C 362.77217,195.01912 355.24717,189.33182 346.04996,182.76882 C 336.85274,176.20581 329.32775,169.82683 329.32775,168.5933 C 329.32775,167.35979 338.8787,166.0143 350.55208,165.60331 L 371.77643,164.85612 L 378.46418,145.69028 C 382.14248,135.14904 386.3693,126.11863 387.8572,125.62268 C 389.34506,125.12673 393.66624,134.04077 397.45975,145.43168 L 404.35705,166.14244 L 426.22769,166.14244 C 438.29125,166.14244 447.71377,167.19303 447.24074,168.48537 C 446.76909,169.77399 439.14763,176.1389 430.30415,182.62961 C 421.46068,189.12035 414.22511,195.40977 414.22511,196.60613 C 414.22511,197.80252 416.54049,205.51112 419.3704,213.73642 C 424.32555,228.13884 425.91344,238.17656 423.2366,238.17656 C 422.53308,238.17656 414.88075,232.96695 406.23137,226.59965 C 397.58201,220.23234 389.42548,215.02274 388.10577,215.02274 C 386.78605,215.02274 379.67785,219.4393 372.30974,224.83734 C 354.49622,237.88789 353.07472,238.64497 351.41797,235.96429 z" fill="#ffffff"/>
- <path d="M 387.4375,123.65625 C 381.9531,127.60512 380.89728,135.34418 378,141.125 C 375.36376,148.34765 372.91789,155.65438 370.34375,162.90625 C 356.47025,164.08839 341.77081,162.26619 328.4375,166.59375 C 325.07115,170.56663 331.93173,173.67364 334.1875,176.25 C 342.68511,183.22024 351.94092,189.14692 360.53125,196.03125 C 356.87709,209.35922 350.13773,222.26102 349.375,236.15625 C 351.66797,242.32246 358.67537,237.27017 361.88369,234.83559 C 370.64752,229.04986 378.84257,221.46546 388.28125,217.15625 C 400.34968,223.6092 410.60543,233.44285 422.65625,240.09375 C 428.04045,240.24825 426.48082,232.65466 425.84375,229.21875 C 423.85538,218.16155 418.32773,207.39487 416.53125,196.625 C 426.43346,186.43615 439.58583,180.04072 449.03125,169.40625 C 449.63724,164.0692 441.80016,165.35879 438.40625,164.53125 C 427.54631,163.83454 416.65515,164.28453 405.78125,164.15625 C 400.63022,150.87404 398.27873,135.95555 389.84375,124.34375 C 389.18469,123.8144 388.31764,123.40578 387.4375,123.65625 z" id="path4510" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="14.4"/>
+ <path id="path4145" d="M 292.80273 36.71875 C 282.36665 36.616724 271.93672 37.725 261.69922 40 C 223.49922 45 190.69922 70 168.69922 100 C 137.29922 142 132.1 201 153 248 C 173 292 213.99961 327.09961 262.34961 336.09961 C 289.59961 340.99961 317.09961 337.90078 342.59961 329.30078 C 355.39961 323.50078 373.00039 318.90078 379.40039 306.30078 C 361.40039 305.40078 343.70039 312.90039 325.40039 313.40039 C 273.10039 312.40039 226.00039 272.40039 210.40039 223.40039 C 203.70039 194.40039 203.90039 162.40039 216.90039 135.40039 C 237.90039 89.400391 289.90039 55.800391 340.90039 63.400391 C 352.80039 63.400391 371.49922 74.000781 379.69922 66.800781 C 368.19922 53.100781 349.09922 48.899219 332.69922 43.199219 C 319.64922 38.980469 306.22056 36.849927 292.80273 36.71875 z M 380.40039 127.90039 C 371.20039 132.00039 366.99922 153.59922 362.69922 165.69922 L 363 166 C 349.6 167.2 335.30039 165.39961 322.40039 169.59961 C 319.10039 173.39961 325.8 176.5 328 179 C 336.2 185.8 345.2 191.5 353.5 198 C 350 210.9 343.49922 223.40039 342.69922 236.90039 C 344.89922 242.90039 351.69922 237.99961 354.69922 235.59961 C 363.19922 229.99961 371.10078 222.60039 380.30078 218.40039 C 392.00078 224.70039 401.90078 234.19922 413.30078 240.69922 C 418.50078 240.89922 417.00039 233.49961 416.40039 230.09961 C 414.50039 219.29961 409.10039 209.10039 407.40039 198.40039 C 417.00039 188.50039 429.80039 182.4 438.90039 172 C 439.50039 166.8 431.89961 168.10078 428.59961 167.30078 C 418.09961 166.60078 407.6 167.10039 397 166.90039 C 392 154.00039 388.60039 131.40039 380.40039 127.90039 z M 205 360 C 199.6 360 195.30078 364.40078 195.30078 369.80078 L 195.30078 533.80078 C 195.30078 539.20078 199.7 543.59961 205 543.59961 L 369 543.59961 C 374.4 543.59961 378.69922 539.20078 378.69922 533.80078 L 378.69922 369.80078 C 378.69922 364.40078 374.3 360 369 360 L 205 360 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 292.80273 36.71875 C 282.36665 36.616724 271.93672 37.725 261.69922 40 C 223.49922 45 190.69922 70 168.69922 100 C 137.29922 142 132.1 201 153 248 C 173 292 213.99961 327.09961 262.34961 336.09961 C 289.59961 340.99961 317.09961 337.90078 342.59961 329.30078 C 355.39961 323.50078 373.00039 318.90078 379.40039 306.30078 C 361.40039 305.40078 343.70039 312.90039 325.40039 313.40039 C 273.10039 312.40039 226.00039 272.40039 210.40039 223.40039 C 203.70039 194.40039 203.90039 162.40039 216.90039 135.40039 C 237.90039 89.400391 289.90039 55.800391 340.90039 63.400391 C 352.80039 63.400391 371.49922 74.000781 379.69922 66.800781 C 368.19922 53.100781 349.09922 48.899219 332.69922 43.199219 C 319.64922 38.980469 306.22056 36.849927 292.80273 36.71875 z M 380.40039 127.90039 C 371.20039 132.00039 366.99922 153.59922 362.69922 165.69922 L 363 166 C 349.6 167.2 335.30039 165.39961 322.40039 169.59961 C 319.10039 173.39961 325.8 176.5 328 179 C 336.2 185.8 345.2 191.5 353.5 198 C 350 210.9 343.49922 223.40039 342.69922 236.90039 C 344.89922 242.90039 351.69922 237.99961 354.69922 235.59961 C 363.19922 229.99961 371.10078 222.60039 380.30078 218.40039 C 392.00078 224.70039 401.90078 234.19922 413.30078 240.69922 C 418.50078 240.89922 417.00039 233.49961 416.40039 230.09961 C 414.50039 219.29961 409.10039 209.10039 407.40039 198.40039 C 417.00039 188.50039 429.80039 182.4 438.90039 172 C 439.50039 166.8 431.89961 168.10078 428.59961 167.30078 C 418.09961 166.60078 407.6 167.10039 397 166.90039 C 392 154.00039 388.60039 131.40039 380.40039 127.90039 z M 205 360 C 199.6 360 195.30078 364.40078 195.30078 369.80078 L 195.30078 533.80078 C 195.30078 539.20078 199.7 543.59961 205 543.59961 L 369 543.59961 C 374.4 543.59961 378.69922 539.20078 378.69922 533.80078 L 378.69922 369.80078 C 378.69922 364.40078 374.3 360 369 360 L 205 360 z " id="path4510"/>
+ <path d="m215 380l144 0 0 145-144 0z" id="rect3587" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/jewish.svg b/vtm-themes/resources/assets/symbols/place_of_worship/jewish.svg
old mode 100755
new mode 100644
index 076bad86..5a205a1b
--- a/vtm-themes/resources/assets/symbols/place_of_worship/jewish.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/jewish.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <path sodipodi:nodetypes="cccssssscccscccscccscccsccssssccscccccccccccccssccccsccccccccccsccccccsccsssc" id="path3648" d="M 267.25388,312.96961 L 243.50018,271.75598 L 196.76546,271.73457 C 167.64023,271.72125 149.43529,270.74975 148.45046,269.15626 C 147.5813,267.74993 157.20372,248.63359 169.83363,226.67547 C 185.49472,199.44739 192.26459,185.35198 191.12264,182.35014 C 190.20169,179.92931 179.95029,161.53267 168.3417,141.46876 C 156.73314,121.40482 147.23522,103.68331 147.23522,102.08764 C 147.23522,99.98685 160.5147,99.18547 195.3677,99.18301 L 243.50018,99.17964 L 267.18791,57.926604 C 280.21616,35.237436 291.67258,16.67357 292.64663,16.67357 C 295.31805,16.67357 301.98823,27.018346 323.6819,64.806047 L 343.41943,99.18639 L 391.60004,99.18639 C 428.53593,99.18639 439.75512,99.91582 439.67129,102.31188 C 439.61112,104.03089 429.1092,123.40535 416.33366,145.36624 L 393.10543,185.2951 L 416.44302,225.72565 C 429.27872,247.96244 439.78065,267.40651 439.78065,268.93469 C 439.78065,270.87632 425.26861,271.71321 391.60004,271.71321 L 343.41943,271.71321 L 323.6819,306.09354 C 302.0947,343.6958 295.30915,354.23722 292.7126,354.20467 C 291.77483,354.19289 280.3184,335.6371 267.25388,312.96961 z M 302.0758,288.28645 C 306.30236,280.89917 309.76047,274.14813 309.76047,273.28411 C 309.76047,272.4201 302.44684,271.71321 293.50795,271.71321 C 284.56905,271.71321 277.25543,272.4201 277.25543,273.28411 C 277.25543,275.31743 292.34571,301.71786 293.50795,301.71786 C 293.99369,301.71786 297.84923,295.67372 302.0758,288.28645 z M 219.21941,229.23627 C 214.69606,221.00129 210.43254,214.2636 209.74493,214.2636 C 209.05732,214.2636 204.79381,221.00129 200.27046,229.23627 L 192.04618,244.20892 L 209.74493,244.20892 L 227.44367,244.20892 L 219.21941,229.23627 z M 336.8524,227.3313 C 342.2478,218.0486 349.8393,204.72596 353.72243,197.72543 L 360.78262,184.99717 L 344.58501,156.46902 L 328.38742,127.94086 L 293.61926,127.94086 L 258.85111,127.94086 L 243.04939,155.15188 C 234.35843,170.11793 227.24765,183.5484 227.24765,184.99733 C 227.24765,187.5882 253.17193,234.97716 257.92974,241.08344 C 259.66134,243.30579 269.99853,244.20892 293.7038,244.20892 L 327.04261,244.20892 L 336.8524,227.3313 z M 386.74541,229.23627 C 382.22206,221.00129 377.95855,214.2636 377.27094,214.2636 C 376.58333,214.2636 372.31981,221.00129 367.79646,229.23627 L 359.57222,244.20892 L 377.27094,244.20892 L 394.96969,244.20892 L 386.74541,229.23627 z M 219.05473,141.65139 L 227.11433,126.69066 L 209.58026,126.69066 L 192.04618,126.69066 L 200.27046,141.66334 C 204.79381,149.8983 209.05732,156.63061 209.74493,156.62403 C 210.43254,156.61746 214.62194,149.87977 219.05473,141.65139 z M 386.58073,141.65139 L 394.64034,126.69066 L 377.10627,126.69066 L 359.57222,126.69066 L 367.79646,141.66334 C 372.31981,149.8983 376.58333,156.63061 377.27094,156.62403 C 377.95855,156.61746 382.14794,149.87977 386.58073,141.65139 z M 309.76047,97.61547 C 309.76047,95.582157 294.67018,69.181728 293.50795,69.181728 C 292.34571,69.181728 277.25543,95.582157 277.25543,97.61547 C 277.25543,98.47948 284.56905,99.18639 293.50795,99.18639 C 302.44684,99.18639 309.76047,98.47948 309.76047,97.61547 z" fill="#ffffff"/>
+ <path id="path4190" d="M 285.17969 35.509766 L 238.17969 114.50977 L 151 116.09961 L 192 195.09961 L 153 276.09961 L 242 278 L 242.5 278.09961 L 288.19922 354.09961 L 337.09961 278.09961 L 428.09961 275.5 L 384.09961 195.5 L 426 115.5 L 333.17969 114.50977 L 285.17969 35.509766 z M 286.30273 86.623047 L 302.50391 115.12305 L 269.50391 115.12305 L 286.30273 86.623047 z M 355.24219 141.22852 L 388.24219 141.22852 L 372.04297 169.72852 L 355.24219 141.22852 z M 193.19922 142.30859 L 222.37891 142.81836 L 210 170.80859 L 193.19922 142.30859 z M 252.7793 142.30859 L 318.67969 142.30859 L 353.19922 195.80078 L 321.09961 252.19922 L 256.09961 251.69922 L 226.69922 195.80078 L 252.7793 142.30859 z M 368.94336 222.25977 L 381.32227 250.25 L 352.14258 250.75977 L 368.94336 222.25977 z M 208.63281 223.69922 L 221.01172 251.69141 L 191.83203 252.19922 L 208.63281 223.69922 z M 272.38477 276.83398 L 305.38477 276.83398 L 289.18555 305.33398 L 272.38477 276.83398 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4192" d="m 208,360 c -5.4,0 -9.7,4.4 -9.7,9.8 l 0,164 c 0,5.4 4.4,9.8 9.7,9.8 l 164,0 c 5.4,0 9.7,-4.4 9.7,-9.8 l 0,-164 c 0,-5.4 -4.4,-9.8 -9.7,-9.8 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 285.17969 35.509766 L 238.17969 114.50977 L 151 116.09961 L 192 195.09961 L 153 276.09961 L 242 278 L 242.5 278.09961 L 288.19922 354.09961 L 337.09961 278.09961 L 428.09961 275.5 L 384.09961 195.5 L 426 115.5 L 333.17969 114.50977 L 285.17969 35.509766 z M 286.30273 86.623047 L 302.50391 115.12305 L 269.50391 115.12305 L 286.30273 86.623047 z M 355.24219 141.22852 L 388.24219 141.22852 L 372.04297 169.72852 L 355.24219 141.22852 z M 193.19922 142.30859 L 222.37891 142.81836 L 210 170.80859 L 193.19922 142.30859 z M 252.7793 142.30859 L 318.67969 142.30859 L 353.19922 195.80078 L 321.09961 252.19922 L 256.09961 251.69922 L 226.69922 195.80078 L 252.7793 142.30859 z M 368.94336 222.25977 L 381.32227 250.25 L 352.14258 250.75977 L 368.94336 222.25977 z M 208.63281 223.69922 L 221.01172 251.69141 L 191.83203 252.19922 L 208.63281 223.69922 z M 272.38477 276.83398 L 305.38477 276.83398 L 289.18555 305.33398 L 272.38477 276.83398 z " id="path4151"/>
+ <path d="m 208,360 c -5.4,0 -9.7,4.4 -9.7,9.8 l 0,164 c 0,5.4 4.4,9.8 9.7,9.8 l 164,0 c 5.4,0 9.7,-4.4 9.7,-9.8 l 0,-164 c 0,-5.4 -4.4,-9.8 -9.7,-9.8 z" id="path3648"/>
+ <path d="m218 380l144 0 0 145-144 0z" id="rect3587-6" mix-blend-mode="normal" isolation="auto" white-space="normal" shape-rendering="auto" image-rendering="auto" color-rendering="auto" fill="#ffffff" solid-opacity="1" solid-color="#000000" color-interpolation-filters="linearRGB" color-interpolation="sRGB" color="#000000" opacity="0.8"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/shinto.svg b/vtm-themes/resources/assets/symbols/place_of_worship/shinto.svg
old mode 100755
new mode 100644
index c334d042..a8df18a2
--- a/vtm-themes/resources/assets/symbols/place_of_worship/shinto.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/shinto.svg
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect3585" width="168.92" height="168.92" x="207.06" y="373" opacity=".25" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <rect y="373" x="207.06" height="168.92" width="168.92" id="rect3587" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.14" rx="0"/>
- <path sodipodi:nodetypes="cssscccsssssssssssssssssssssssssssscccscccssssscccsssccccssccccscccccc" id="path1873" d="M 209.96733,335.29027 C 208.30625,332.18651 207.57342,309.98368 207.82929,270.51277 C 208.1617,219.23366 207.66852,209.3939 204.45437,203.17841 C 199.51298,193.62282 199.54544,193.49666 207.67456,190.66285 C 214.23378,188.37627 214.65898,187.48718 214.65898,176.05766 L 214.65898,163.88727 L 191.95962,163.35121 C 179.47497,163.05638 168.53446,162.08766 167.64737,161.1985 C 165.51954,159.06564 164.55584,136.65311 166.4595,133.57289 C 167.36997,132.09976 174.66941,131.60124 185.32028,132.28475 C 199.9076,133.22092 203.57298,132.69861 208.16246,129.02978 C 217.45488,121.60148 213.99357,117.13478 197.65038,115.46432 C 166.23882,112.25367 166.36997,112.30117 164.72641,103.54033 C 163.90278,99.150045 162.20627,95.557981 160.95636,95.557981 C 159.70645,95.557981 154.49163,92.783747 149.36789,89.393022 C 142.10996,84.589931 139.48566,80.978893 137.4883,73.046642 C 136.07826,67.446862 131.87518,58.655645 128.14813,53.510596 C 124.42108,48.365548 121.99372,43.149468 122.754,41.919302 C 124.85843,38.514281 134.88909,39.245993 142.90069,43.388964 C 151.80587,47.994 170.3657,53.585865 180.35593,54.673781 C 184.49711,55.124765 199.9335,57.288654 214.65898,59.482436 C 236.74345,62.772564 252.64573,63.271763 305.45641,62.332615 C 340.66952,61.706439 374.19473,60.067359 379.95687,58.690264 C 385.71902,57.313147 397.10611,55.132634 405.26152,53.844637 C 413.41692,52.556641 426.66939,48.423751 434.71143,44.66043 C 454.24671,35.518758 460.2053,40.703199 449.79235,57.781987 C 447.2362,61.974477 445.14478,67.865113 445.14478,70.872277 C 445.14478,76.246694 427.02482,95.557981 421.98198,95.557981 C 420.70948,95.557981 418.79477,98.929313 417.72704,103.04984 C 415.58858,111.30239 410.83268,113.56358 394.79877,113.95102 C 380.55092,114.29531 370.64432,116.73055 370.64432,119.88865 C 370.64432,121.42608 373.05289,124.94674 375.99671,127.71231 C 380.9179,132.33553 382.65286,132.57919 397.532,130.7368 C 407.47795,129.50526 414.78614,129.58637 416.49446,130.94726 C 419.29603,133.17908 418.22373,155.43335 415.14772,158.89655 C 414.34517,159.80012 403.42941,160.71283 390.89047,160.92478 L 368.09242,161.31011 L 368.78632,173.25074 C 369.43646,184.43775 369.95789,185.34572 377.04842,187.63762 C 389.27292,191.58898 390.30688,194.07779 383.22193,202.49776 L 376.91213,209.99653 L 378.2554,269.79368 C 379.08783,306.85 378.7374,331.12984 377.33395,333.63766 C 374.54202,338.62654 353.9858,339.36712 350.04666,334.62076 C 348.44332,332.68885 346.93093,308.82186 345.95277,270.0149 C 345.0996,236.16671 343.39931,206.52686 342.17434,204.14855 C 340.69499,201.27635 340.80132,198.97018 342.49097,197.28054 C 343.89006,195.88144 345.03574,187.3507 345.0369,178.32334 L 345.03905,161.90995 L 292.08846,162.66928 C 262.96566,163.0869 238.7758,163.79067 238.33327,164.23323 C 237.89074,164.67576 236.95922,202.57375 236.26327,248.451 C 235.56732,294.32822 234.0516,333.69754 232.89501,335.93838 C 229.75494,342.02216 213.32151,341.55759 209.96733,335.29027 z M 277.51874,125.82379 L 277.51874,116.51123 L 260.17338,116.51123 C 246.45626,116.51123 242.37712,117.31694 240.67244,120.36305 C 239.05403,123.25498 240.04052,125.55739 244.631,129.60204 C 249.4779,133.87266 253.5197,135.00446 264.13193,135.06278 L 277.51874,135.13635 L 277.51874,125.82379 z M 338.02376,128.79859 C 340.59935,126.59332 342.70664,122.92649 342.70664,120.65011 C 342.70664,117.05159 340.42693,116.51123 325.2456,116.51123 L 307.78456,116.51123 L 307.78456,124.65973 L 307.78456,132.80821 L 320.56271,132.80821 C 329.28911,132.80821 334.82573,131.53681 338.02376,128.79859 z" fill="#ffffff"/>
+ <path id="path4140" d="M 450.15625 35.261719 C 448.3725 35.295151 446.11328 35.886719 443.30078 37.199219 C 424.80078 46.399219 404.30078 49.800391 384.30078 53.400391 C 348.30078 58.100391 312.90078 57.2 277.30078 58 C 243.30078 59.5 209.00078 53.900391 175.30078 48.900391 C 158.30078 47.300391 144.30078 34.700391 127.30078 35.400391 C 120.40078 45.400391 140.60039 58.199609 139.90039 71.099609 C 143.20039 87.899609 168.50078 85.500391 167.80078 103.90039 C 180.40078 113.00039 198.40078 107.30078 212.30078 113.80078 C 219.70078 127.30078 195.00078 129.90039 185.30078 127.40039 C 164.30078 120.00039 165.09961 143.00039 169.59961 156.40039 C 182.59961 159.10039 196.10039 158.30039 209.40039 158.90039 C 217.30039 156.80039 217.29961 162.39961 216.59961 168.59961 C 220.89961 181.29961 209.49961 185.2 203.09961 191 C 211.89961 206.2 209.20039 224.2 209.90039 241 C 210.50039 270.3 208.10039 300.39922 212.15039 330.19922 C 217.20039 336.59922 230.19922 337.3 235.19922 331 C 239.79922 274 237.69961 216 240.59961 159 C 273.59961 157.2 306.59961 157.50078 339.59961 156.80078 C 347.39961 154.40078 347.60078 159.60039 346.80078 165.90039 C 348.20078 177.20039 343.80039 188.60039 343.90039 198.90039 C 348.60039 237.90039 346.90078 276.30039 349.80078 314.90039 C 344.00078 333.80039 371.29961 338.4 379.59961 326.5 C 381.69961 290.5 379.5 254.5 379 218.5 C 379.4 212.1 376.59922 204.60078 382.69922 200.30078 C 395.29922 191.10078 384.60078 182.70078 373.30078 180.30078 C 369.20078 173.30078 371.00039 164.49961 369.90039 156.59961 L 387.30078 156.30078 C 397.90078 154.20078 417.79922 161.39961 419.19922 146.59961 C 425.39922 129.19961 413.19922 119.90078 396.69922 126.30078 C 384.89922 134.30078 360.19922 111.80039 382.69922 110.40039 C 396.89922 108.00039 419.29961 113 421.59961 93 C 433.89961 85.2 447.09961 73.899219 449.09961 58.199219 C 455.51211 51.196094 459.78851 35.081186 450.15625 35.261719 z M 275.24219 111.74805 C 279.58943 111.62093 279.61382 116.2423 280.09961 123.59961 C 282.49961 131.59961 276.60078 131.29922 270.30078 130.69922 C 260.50078 132.49922 237.90078 126.99961 245.30078 114.09961 C 254.10078 110.89961 263.79961 112.49961 273.09961 112.09961 C 273.91099 111.88179 274.62115 111.76621 275.24219 111.74805 z M 329.41602 111.80078 C 339.63114 111.64336 352.52148 113.26914 341.34961 124.40039 C 333.59961 129.90039 323.59922 128.10039 314.69922 128.40039 C 307.99922 130.00039 312.29961 120.49961 311.09961 116.59961 C 308.89961 108.89961 318.69961 113.19961 323.09961 112.09961 C 324.84336 111.96836 327.05868 111.83711 329.41602 111.80078 z M 212 360 C 206.6 360 202.30078 364.40078 202.30078 369.80078 L 202.30078 533.80078 C 202.30078 539.20078 206.7 543.59961 212 543.59961 L 376 543.59961 C 381.4 543.59961 385.69922 539.20078 385.69922 533.80078 L 385.69922 369.80078 C 385.69922 364.40078 381.3 360 376 360 L 212 360 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 450.15625 35.261719 C 448.3725 35.295151 446.11328 35.886719 443.30078 37.199219 C 424.80078 46.399219 404.30078 49.800391 384.30078 53.400391 C 348.30078 58.100391 312.90078 57.2 277.30078 58 C 243.30078 59.5 209.00078 53.900391 175.30078 48.900391 C 158.30078 47.300391 144.30078 34.700391 127.30078 35.400391 C 120.40078 45.400391 140.60039 58.199609 139.90039 71.099609 C 143.20039 87.899609 168.50078 85.500391 167.80078 103.90039 C 180.40078 113.00039 198.40078 107.30078 212.30078 113.80078 C 219.70078 127.30078 195.00078 129.90039 185.30078 127.40039 C 164.30078 120.00039 165.09961 143.00039 169.59961 156.40039 C 182.59961 159.10039 196.10039 158.30039 209.40039 158.90039 C 217.30039 156.80039 217.29961 162.39961 216.59961 168.59961 C 220.89961 181.29961 209.49961 185.2 203.09961 191 C 211.89961 206.2 209.20039 224.2 209.90039 241 C 210.50039 270.3 208.10039 300.39922 212.15039 330.19922 C 217.20039 336.59922 230.19922 337.3 235.19922 331 C 239.79922 274 237.69961 216 240.59961 159 C 273.59961 157.2 306.59961 157.50078 339.59961 156.80078 C 347.39961 154.40078 347.60078 159.60039 346.80078 165.90039 C 348.20078 177.20039 343.80039 188.60039 343.90039 198.90039 C 348.60039 237.90039 346.90078 276.30039 349.80078 314.90039 C 344.00078 333.80039 371.29961 338.4 379.59961 326.5 C 381.69961 290.5 379.5 254.5 379 218.5 C 379.4 212.1 376.59922 204.60078 382.69922 200.30078 C 395.29922 191.10078 384.60078 182.70078 373.30078 180.30078 C 369.20078 173.30078 371.00039 164.49961 369.90039 156.59961 L 387.30078 156.30078 C 397.90078 154.20078 417.79922 161.39961 419.19922 146.59961 C 425.39922 129.19961 413.19922 119.90078 396.69922 126.30078 C 384.89922 134.30078 360.19922 111.80039 382.69922 110.40039 C 396.89922 108.00039 419.29961 113 421.59961 93 C 433.89961 85.2 447.09961 73.899219 449.09961 58.199219 C 455.51211 51.196094 459.78851 35.081186 450.15625 35.261719 z M 275.24219 111.74805 C 279.58943 111.62093 279.61382 116.2423 280.09961 123.59961 C 282.49961 131.59961 276.60078 131.29922 270.30078 130.69922 C 260.50078 132.49922 237.90078 126.99961 245.30078 114.09961 C 254.10078 110.89961 263.79961 112.49961 273.09961 112.09961 C 273.91099 111.88179 274.62115 111.76621 275.24219 111.74805 z M 329.41602 111.80078 C 339.63114 111.64336 352.52148 113.26914 341.34961 124.40039 C 333.59961 129.90039 323.59922 128.10039 314.69922 128.40039 C 307.99922 130.00039 312.29961 120.49961 311.09961 116.59961 C 308.89961 108.89961 318.69961 113.19961 323.09961 112.09961 C 324.84336 111.96836 327.05868 111.83711 329.41602 111.80078 z M 212 360 C 206.6 360 202.30078 364.40078 202.30078 369.80078 L 202.30078 533.80078 C 202.30078 539.20078 206.7 543.59961 212 543.59961 L 376 543.59961 C 381.4 543.59961 385.69922 539.20078 385.69922 533.80078 L 385.69922 369.80078 C 385.69922 364.40078 381.3 360 376 360 L 212 360 z " id="rect4154" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 221,379 144,0 0,145 -144,0 z" id="rect3587-7" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/place_of_worship/unknown.svg b/vtm-themes/resources/assets/symbols/place_of_worship/unknown.svg
old mode 100755
new mode 100644
index a50ab3bf..81df3539
--- a/vtm-themes/resources/assets/symbols/place_of_worship/unknown.svg
+++ b/vtm-themes/resources/assets/symbols/place_of_worship/unknown.svg
@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#111111" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 336.04092,228.20338 32.60294,127.78375" id="path4817" sodipodi:nodetypes="cc" fill="#d53b3b" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="128.99"/>
- <path d="M 327.15153,205.27243 201.86022,223.14418 128.4406,135.72436" id="path5329" sodipodi:nodetypes="ccc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="56.673"/>
- <path d="m 419.18715,496.11435 -173.27583,1.87442" id="path5331" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="71.797"/>
- <path d="m 395.95938,373.03073 -149.108,110.5251" id="path5333" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="78.4"/>
- <path id="path5339" d="m 282.62127,81.430196 c -16.39627,0.74391 -22.85159,24.391444 -9.28973,33.410414 12.35231,10.18832 32.79976,-2.15972 29.44467,-17.927534 -1.48092,-9.45077 -10.60853,-16.54984 -20.15494,-15.48288 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="78.4"/>
- <path sodipodi:nodetypes="cc" id="path4057" d="M 381.59627,361.98219 246.85138,483.55583" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="78.4"/>
- <path sodipodi:nodetypes="ccc" id="path4059" d="M 327.15153,215.27243 201.86022,223.14418 128.4406,135.72436" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="56.673"/>
+ <path id="path4140" d="M 291.05469 32.746094 C 270.08872 33.475826 254.79688 57.813281 264 76.800781 C 271.6 97.300781 301.00039 102.79961 315.90039 86.599609 C 331.70039 71.599609 325.29922 42.000391 304.69922 34.900391 C 301.09922 33.500391 297.09961 32.7 293.09961 32.75 C 292.41211 32.723438 291.73101 32.722554 291.05469 32.746094 z M 205.62695 64.748047 C 191.61177 64.811337 182.80234 83.446094 192.19922 94.199219 C 206.59922 112.59922 220.19961 131.19922 235.09961 149.19922 C 243.99961 156.79922 256.09961 152.20039 266.59961 152.40039 L 282.09961 151.30078 C 288.29961 177.30078 293.9 203.30078 300.5 229.30078 C 284.2 245.60078 267.49961 261.29922 251.59961 278.19922 C 243.89961 289.19922 246.99961 304.89922 253.59961 315.19922 C 262.29961 326.39922 276.99922 322.79922 289.19922 323.19922 C 315.79922 322.79922 342.19922 322.69922 369.19922 322.19922 C 385.99922 321.29922 395.69922 299.40078 385.19922 286.30078 C 377.99922 275.30078 364.29922 276.99961 353.19922 277.09961 L 329.19922 277.40039 C 343.79922 265.40039 358.99961 253.80039 373.09961 241.40039 C 381.29961 230.40039 380.59961 214.90039 377.59961 202.40039 C 371.59961 176.80039 365.89961 151.40039 359.59961 125.40039 C 352.29961 99.600391 317.59922 88.5 296.69922 105.5 C 287.69922 112.7 286.70039 114.89922 277.40039 115.19922 L 255.90039 116.69922 C 243.00039 100.99922 231 85 219 69 C 215 67 211 64.900781 207 64.800781 C 206.5375 64.763281 206.07906 64.746005 205.62695 64.748047 z M 216 362 C 210.6 362 206.30078 366.40078 206.30078 371.80078 L 206.30078 535.80078 C 206.30078 541.20078 210.7 545.59961 216 545.59961 L 380 545.59961 C 385.4 545.59961 389.69922 541.20078 389.69922 535.80078 L 389.69922 371.80078 C 389.69922 366.40078 385.3 362 380 362 L 216 362 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 291.05469 32.746094 C 270.08872 33.475826 254.79688 57.813281 264 76.800781 C 271.6 97.300781 301.00039 102.79961 315.90039 86.599609 C 331.70039 71.599609 325.29922 42.000391 304.69922 34.900391 C 301.09922 33.500391 297.09961 32.7 293.09961 32.75 C 292.41211 32.723438 291.73101 32.722554 291.05469 32.746094 z M 205.62695 64.748047 C 191.61177 64.811337 182.80234 83.446094 192.19922 94.199219 C 206.59922 112.59922 220.19961 131.19922 235.09961 149.19922 C 243.99961 156.79922 256.09961 152.20039 266.59961 152.40039 L 282.09961 151.30078 C 288.29961 177.30078 293.9 203.30078 300.5 229.30078 C 284.2 245.60078 267.49961 261.29922 251.59961 278.19922 C 243.89961 289.19922 246.99961 304.89922 253.59961 315.19922 C 262.29961 326.39922 276.99922 322.79922 289.19922 323.19922 C 315.79922 322.79922 342.19922 322.69922 369.19922 322.19922 C 385.99922 321.29922 395.69922 299.40078 385.19922 286.30078 C 377.99922 275.30078 364.29922 276.99961 353.19922 277.09961 L 329.19922 277.40039 C 343.79922 265.40039 358.99961 253.80039 373.09961 241.40039 C 381.29961 230.40039 380.59961 214.90039 377.59961 202.40039 C 371.59961 176.80039 365.89961 151.40039 359.59961 125.40039 C 352.29961 99.600391 317.59922 88.5 296.69922 105.5 C 287.69922 112.7 286.70039 114.89922 277.40039 115.19922 L 255.90039 116.69922 C 243.00039 100.99922 231 85 219 69 C 215 67 211 64.900781 207 64.800781 C 206.5375 64.763281 206.07906 64.746005 205.62695 64.748047 z M 216 362 C 210.6 362 206.30078 366.40078 206.30078 371.80078 L 206.30078 535.80078 C 206.30078 541.20078 210.7 545.59961 216 545.59961 L 380 545.59961 C 385.4 545.59961 389.69922 541.20078 389.69922 535.80078 L 389.69922 371.80078 C 389.69922 366.40078 385.3 362 380 362 L 216 362 z " id="rect4154" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 226,382 144,0 0,144 -144,0 z" id="rect3587" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/poi/cave.svg b/vtm-themes/resources/assets/symbols/poi/cave.svg
old mode 100755
new mode 100644
index 2b38c063..3860e28b
--- a/vtm-themes/resources/assets/symbols/poi/cave.svg
+++ b/vtm-themes/resources/assets/symbols/poi/cave.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#111111" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="m 34.702986,408.13437 c 2.367196,-5.48093 32.404879,-47.87543 66.750284,-94.2099 49.25528,-66.44891 74.61409,-89.47895 120.04961,-109.0248 71.12554,-30.59742 142.32874,-32.35525 168.26002,-4.15402 61.33558,66.70455 124.63054,142.87846 142.85807,171.92632 25.68601,40.93369 12.60173,60.07407 -14.50984,21.22601 C 507.42352,378.58371 477.4635,342.01325 451.53328,312.63007 340.43961,186.74287 340.10029,186.61322 236.90791,230.57389 186.18922,252.18048 166.47754,270.06043 123.61005,333.34337 95.06701,375.47997 62.417798,411.78794 51.05624,414.0276 39.69479,416.26738 32.3358,413.61508 34.702986,408.13437 z" id="path2838" sodipodi:nodetypes="csssssssssc" fill="#ffffff"/>
- <path sodipodi:nodetypes="cssscccc" id="path3593" d="m 34.702986,408.13437 c 2.367196,-5.48093 32.404879,-47.87543 66.750284,-94.2099 49.25528,-66.44891 74.61409,-89.47895 120.04961,-109.0248 71.12554,-30.59742 142.32874,-32.35525 168.26002,-4.15402 61.33558,66.70455 124.63054,142.87846 142.85807,171.92632 34.40213,55.71502 -22.68994,62.23235 -174.08769,65.9581 -80.61454,2.31281 -85.24178,0.87361 -168.92323,1.7133 -39.07364,-1.12238 -156.361399,-19.74053 -154.907064,-32.209 z" opacity=".1" fill="#ffffff"/>
- <path sodipodi:nodetypes="cssssc" id="path3638" d="m 150.97846,415.18101 c 0,-32.36715 90.19166,-134.76949 118.69935,-134.76949 45.60596,0 92.84717,28.28822 127.25562,76.20114 20.30607,28.27572 36.92016,54.52123 36.92016,58.32343 0,3.80207 -63.64691,6.91299 -141.43757,6.91299 -77.79065,0 -141.43756,-3.00059 -141.43756,-6.66807 z" fill="#ffffff"/>
+ <path id="path4138" d="m 88,331 c -15,24 -32.4,45 -48,68 2.5,6.8 6.7,11.5 12,14.9 -0.4,0.1 -0.7,0.2 -1,0.3 10.5,13.7 105,23.6 139,25 86,1.2 87,2.1 168,-0.2 73,-1.9 124,-4.4 154,-12.8 5.3,-1.3 10.4,-3.2 15,-5.8 3.5,-2.1 6.7,-4 9.2,-6.7 l 0,0 0,0 c 11.7,-24.4 -3.7,-52 -22.4,-68 C 469,294 429,238 378,193 361,184 345,180 328,181 228,181 136,246 88,331 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 88,331 c -15,24 -32.4,45 -48,68 2.5,6.8 6.7,11.5 12,14.9 -0.4,0.1 -0.7,0.2 -1,0.3 10.5,13.7 105,23.6 139,25 86,1.2 87,2.1 168,-0.2 73,-1.9 124,-4.4 154,-12.8 5.3,-1.3 10.4,-3.2 15,-5.8 3.5,-2.1 6.7,-4 9.2,-6.7 l 0,0 0,0 c 11.7,-24.4 -3.7,-52 -22.4,-68 C 469,294 429,238 378,193 361,184 345,180 328,181 228,181 136,246 88,331 Z" id="path2838"/>
+ <path d="m 237,231 c -51,21 -70,39 -113,102 -29,43 -62,79 -73,81 10.5,13.7 105,23.6 139,25 86,1.2 87,2.1 168,-0.2 101,-2.7 160,-6.4 178,-25.3 C 532,411 525,404 518,394 507,379 478,342 452,313 382,234 356,205 321,204 c -21,0 -45,11 -84,27 z" id="path3593" opacity="0.9" fill="#ffffff"/>
+ <path id="path3638" d="m 397,356 c 20.3,28 36.9,55 36.9,58 0,3.8 -64,6.9 -141,6.9 -78,0 -141,-3 -141,-6.3 C 151,383 241,280 270,280 c 45.6,0 93,28 127,76 z"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/poi/embassy2.svg b/vtm-themes/resources/assets/symbols/poi/embassy2.svg
old mode 100755
new mode 100644
index 0990bc58..0c4b85fe
--- a/vtm-themes/resources/assets/symbols/poi/embassy2.svg
+++ b/vtm-themes/resources/assets/symbols/poi/embassy2.svg
@@ -1,95 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
-   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
-   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
-   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
-   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
-  </symbol>
-  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
-   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <linearGradient id="linearGradient2936">
-   <stop id="stop2938" stop-color="#8acf6b"/>
-   <stop offset="1" id="stop2940" stop-color="#368912"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2952">
-   <stop id="stop2954" stop-color="#c0d50d"/>
-   <stop offset="1" id="stop2956" stop-color="#eef2cd"/>
-  </linearGradient>
-  <marker inkscape:stockid="RazorWire" id="RazorWire" orient="auto">
-       style="overflow:visible"&gt;
-         <path id="path4286" transform="scale(0.8,0.8)" d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
-  <marker inkscape:stockid="DiamondS" orient="auto" refY="0.0" refX="0.0" id="DiamondS">
-   <path id="path4202" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " transform="scale(0.2)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Arrow2Sstart" orient="auto" refY="0.0" refX="0.0" id="Arrow2Sstart">
-   <path id="path4146" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.3) translate(-2.3,0)" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker inkscape:stockid="StopS" orient="auto" refY="0.0" refX="0.0" id="StopS">
-   <path id="path4229" d="M 0.0,5.65 L 0.0,-5.65" transform="scale(0.2)" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="InfiniteLineStart" id="InfiniteLineStart" orient="auto">
-   <g id="g4298" transform="translate(-13,0)">
-    <circle id="circle4300" r=".8" cx="3"/>
-    <circle id="circle4302" r=".8" cx="6.5"/>
-    <circle id="circle4304" r=".8" cx="10"/>
-   </g>
-  </marker>
-  <marker inkscape:stockid="CurveIn" orient="auto" refY="0.0" refX="0.0" id="CurveIn">
-   <path id="path4238" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" transform="scale(0.6)" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="TriangleOutS" orient="auto" refY="0.0" refX="0.0" id="TriangleOutS">
-   <path id="path4220" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " transform="scale(0.2)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Arrow2Send" orient="auto" refY="0.0" refX="0.0" id="Arrow2Send">
-   <path id="path4149" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.3) rotate(180) translate(-2.3,0)" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker inkscape:stockid="SemiCircleOut" orient="auto" refY="0.0" refX="0.0" id="SemiCircleOut">
-   <path id="path4235" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " transform="scale(0.6) translate(7.125493,0.763446)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Arrow1Send" orient="auto" refY="0.0" refX="0.0" id="Arrow1Send">
-   <path id="path4131" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.2) rotate(180) translate(6,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Arrow1Sstart" orient="auto" refY="0.0" refX="0.0" id="Arrow1Sstart">
-   <path id="path4128" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.2) translate(6,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Tail" orient="auto" refY="0.0" refX="0.0" id="Tail">
-   <g id="g4152" transform="scale(-1.2)">
-    <path id="path4154" d="M -3.8048674,-3.9585227 L 0.54352094,0" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path id="path4156" d="M -1.2866832,-3.9585227 L 3.0617053,0" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path id="path4158" d="M 1.3053582,-3.9585227 L 5.6537466,0" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path id="path4160" d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path id="path4162" d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path id="path4164" d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker inkscape:stockid="Arrow1Lend" orient="auto" refY="0.0" refX="0.0" id="Arrow1Lend">
-   <path id="path4119" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.8) rotate(180) translate(12.5,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="TriangleOutL" orient="auto" refY="0.0" refX="0.0" id="TriangleOutL">
-   <path id="path4214" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " transform="scale(0.8)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Arrow1Mend" orient="auto" refY="0.0" refX="0.0" id="Arrow1Mend">
-   <path id="path4125" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " transform="scale(0.4) rotate(180) translate(10,0)" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker inkscape:stockid="Arrow2Lend" orient="auto" refY="0.0" refX="0.0" id="Arrow2Lend">
-   <path id="path4137" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(1.1) rotate(180) translate(1,0)" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <symbol id="symbol14628" viewBox="244.5 110 489 219.9">
-   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path14630"/>
-   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path14632"/>
-   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path14634"/>
-   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path14636"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 45.40739,51.732619 c 0,0 -16.350222,50.048161 11.143019,86.686211 13.994406,21.23491 49.465031,43.56226 81.749971,53.83063 l 47.95323,52.58841 c -8.96271,-5.88003 -19.79708,-11.67254 -32.42157,-16.19633 -41.40787,-14.83785 -97.049733,2.87969 -96.292972,1.21744 0,0 19.575307,56.0518 62.645422,71.64639 24.63542,10.662 77.12792,7.08512 94.35704,-23.24054 29.42478,34.57551 55.98994,55.92576 80.33889,70.00034 -27.72792,-3.28483 -55.79358,-4.07231 -83.55771,-1.11373 -37.64168,5.84064 -57.78739,32.18574 -97.37167,53.5952 -2.8719,1.93327 -12.93841,11.64264 -16.472125,12.07729 36.804325,21.5252 73.154445,55.12801 108.281415,59.15653 69.07118,7.92139 133.60026,-43.00233 131.69336,-104.53024 14.58598,4.94693 28.36106,8.29604 41.52072,11.8495 24.42151,6.59444 40.50898,13.93993 63.59551,33.478 23.08652,19.53807 41.28913,51.66297 68.31834,108.38335 l 23.29251,-5.41654 c -27.48504,-57.67671 -52.60463,-91.41713 -77.54695,-112.52582 -24.94249,-21.1087 -49.51276,-29.18239 -74.35217,-35.88969 -11.34547,-3.06359 -8.81076,0.16193 -20.58845,-3.4489 57.26934,-33.5127 48.17776,-180.2404 -63.52277,-227.61601 -34.70391,98.09383 -3.50573,169.43318 38.28669,218.46383 -30.17504,-12.98586 -77.42856,-41.65556 -117.33588,-90.24747 60.90387,-61.86154 42.90909,-131.81273 -36.09796,-195.880868 -36.70745,77.340058 -18.1936,123.238578 10.35771,165.615288 l -43.00949,-47.238 c -0.0153,-14.61261 -2.61204,-45.44792 -22.07298,-71.2039 C 101.78157,80.678551 43.863781,52.708899 45.40739,51.732619 z" id="path5095" sodipodi:nodetypes="ccccscccccccscssccsscccccccsc" color="#000000" stroke-width="4.217" stroke-linecap="round" fill="#ffffff" stroke-linejoin="round" stroke="#ffffff"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4137" d="m 74,171 c 19,16.9 42.9,27.8 66,36.8 12.4,13.6 24.7,27 37,40.9 -36,-21.3 -81,-17.4 -120,-6.9 12.6,39 45.9,79 90,80 24.8,0.9 54,-5.4 68,-27 20.8,24 44,46.6 71,64 -26.7,-2.5 -57,-3.1 -81,0.6 -35,8.3 -59.9,36.5 -91,53 -8.7,7.5 -27.9,15.4 -6.1,21.9 37,23.3 73.9,58 121,53 54,-2.5 110,-44.7 112,-102 20.7,0.9 55,11 78,23.9 47.9,26.7 68,80 92,126 8.6,-1.5 18,-2.9 26,-6.4 -15.9,-37.6 -37.7,-74 -66,-104 -27,-27.8 -65,-45 -103,-49 33,-26 35.6,-74 27.7,-112 -11.1,-50.7 -47,-98 -97,-116 -26,63 -20.4,141 19.4,197 6.4,9.5 18.7,22.7 0.7,11 -36,-19.7 -68.8,-46 -95,-78 29.5,-28.4 45,-74 29,-113 -13.2,-34 -39,-63 -68,-85 -24,42.7 -31,99 -6.1,143 7.4,12.4 -8.5,-7.5 -12.7,-11.3 C 158,205 152,195 154,181 151,138 117,108 84,85 72,77 59.8,68 47,63 33.7,99.6 42.2,146 74,171 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 74,171 c 19,16.9 42.9,27.8 66,36.8 12.4,13.6 24.7,27 37,40.9 -36,-21.3 -81,-17.4 -120,-6.9 12.6,39 45.9,79 90,80 24.8,0.9 54,-5.4 68,-27 20.8,24 44,46.6 71,64 -26.7,-2.5 -57,-3.1 -81,0.6 -35,8.3 -59.9,36.5 -91,53 -8.7,7.5 -27.9,15.4 -6.1,21.9 37,23.3 73.9,58 121,53 54,-2.5 110,-44.7 112,-102 20.7,0.9 55,11 78,23.9 47.9,26.7 68,80 92,126 8.6,-1.5 18,-2.9 26,-6.4 -15.9,-37.6 -37.7,-74 -66,-104 -27,-27.8 -65,-45 -103,-49 33,-26 35.6,-74 27.7,-112 -11.1,-50.7 -47,-98 -97,-116 -26,63 -20.4,141 19.4,197 6.4,9.5 18.7,22.7 0.7,11 -36,-19.7 -68.8,-46 -95,-78 29.5,-28.4 45,-74 29,-113 -13.2,-34 -39,-63 -68,-85 -24,42.7 -31,99 -6.1,143 7.4,12.4 -8.5,-7.5 -12.7,-11.3 C 158,205 152,195 154,181 151,138 117,108 84,85 72,77 59.8,68 47,63 33.7,99.6 42.2,146 74,171 Z" id="path4136" isolation="auto" white-space="normal" mix-blend-mode="normal" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/poi/mountain_pass.svg b/vtm-themes/resources/assets/symbols/poi/mountain_pass.svg
old mode 100755
new mode 100644
index 9d6c5d11..5214d0fa
--- a/vtm-themes/resources/assets/symbols/poi/mountain_pass.svg
+++ b/vtm-themes/resources/assets/symbols/poi/mountain_pass.svg
@@ -1,82 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="580" width="580" version="1.0">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#111" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 332.15321,34.355309 1.24602,77.253011 -221.79091,221.79091 -77.253011,0" id="path3068" inkscape:connector-curvature="0" fill="none" stroke="#ffffff" stroke-width="60"/>
- <path d="m 540,242.2021 -77.25301,-1.24602 -221.79091,221.79091 0,77.25301" id="path3068-9" inkscape:connector-curvature="0" fill="none" stroke="#ffffff" stroke-width="60"/>
+ <path id="path8076" d="m 556.36,242.65 c -27.13,-0.43 -54.27,-0.86 -81.4,-1.29 -77.91,77.91 -155.81,155.81 -233.72,233.72 0,27.13 0,54.27 0,81.41 M 337.33,23.633 c 0.44,27.136 0.87,54.267 1.31,81.407 -77.91,77.91 -155.81,155.82 -233.72,233.72 -27.141,0 -54.271,0 -81.408,0" inkscape:connector-curvature="0" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-width="105.38"/>
+ <path id="path3068" d="m 337.33,23.633 c 0.44,27.136 0.87,54.267 1.31,81.407 -77.91,77.91 -155.81,155.82 -233.72,233.72 -27.141,0 -54.271,0 -81.408,0" inkscape:connector-curvature="0" opacity="0.8" fill="none" stroke="#820000" stroke-width="63.23"/>
+ <path id="path3068-9" d="m 556.36,242.65 c -27.13,-0.43 -54.27,-0.86 -81.4,-1.29 -77.91,77.91 -155.81,155.81 -233.72,233.72 0,27.13 0,54.27 0,81.41" inkscape:connector-curvature="0" opacity="0.8" fill="none" stroke="#820000" stroke-width="63.23"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/alcohol.svg b/vtm-themes/resources/assets/symbols/shopping/alcohol.svg
old mode 100755
new mode 100644
index 340b43bf..6e6126ec
--- a/vtm-themes/resources/assets/symbols/shopping/alcohol.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/alcohol.svg
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g7010" transform="matrix(1.0014414,0,0,1.0543874,-15.580879,-16.459021)">
-  <path sodipodi:nodetypes="ccccc" id="rect3771" d="m 146.7393,44.009621 37.8387,0 0,124.859569 -37.8387,0 0,-124.859569 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.298"/>
-  <path sodipodi:nodetypes="czcccc" id="path6978" d="m 110.17519,187.41423 c -1.68505,-9.49469 40.14927,-29.33844 55.65658,-29.35966 15.50731,-0.0212 55.77161,22.48985 58.71582,29.35966 l 0,316.95169 c -28.66921,14.88115 -97.94359,12.00125 -114.3724,0 l 0,-316.95169 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="46.24"/>
- </g>
- <path d="M 401.39916,397.29099 L 401.39916,519.88932" id="path3845" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="24"/>
- <path sodipodi:type="arc" id="path3878" sodipodi:cx="519.16229" sodipodi:cy="502.69528" sodipodi:rx="45.569103" sodipodi:ry="12.748499" d="M 564.7314,502.69528 A 45.569103,12.748499 0 1 1 473.59319,502.69528 A 45.569103,12.748499 0 1 1 564.7314,502.69528 z" transform="matrix(1.4302812,0,0,1.8342213,-341.58987,-395.38818)" fill="#ffffff"/>
- <g id="g4243" transform="matrix(1.1990081,0,0,1.2591238,-72.990402,-108.62601)">
-  <path sodipodi:nodetypes="csssccc" id="path3840-8" d="M 339.85,317.23424 C 339.8178,318.53216 339.7999,319.83312 339.7999,321.14408 C 339.7999,373.07071 365.37652,415.14047 396.92055,415.14047 C 428.46458,415.14047 454.0412,373.07071 454.0412,321.14408 C 454.0412,319.83312 454.0235,318.53216 453.9911,317.23424 C 411.89595,306.93245 365.98943,310.45437 339.84988,317.23424 L 339.84994,317.23424 z" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.129"/>
-  <path sodipodi:nodetypes="csssccc" id="path3840" d="M 339.43634,317.79387 C 339.40404,319.09179 339.38624,320.39276 339.38624,321.7037 C 339.38624,373.63032 364.96287,415.7001 396.50689,415.7001 C 428.05092,415.7001 453.62755,373.63032 453.62755,321.7037 C 453.62755,320.39276 453.60985,319.09179 453.57745,317.79387 C 421.72547,327.70601 387.70424,334.14737 339.43623,317.79387 L 339.4363,317.79387 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="0"/>
- </g>
- <g transform="matrix(25.818296,0,0,25.818296,-7603.868,-1626.0059)" id="flowRoot6831" fill="#ffffff">
-  <path d="m 307.37375,64.57625 c -1.01,0 -1.66,0.770001 -1.66,2.09 0,1.329999 0.64,2.11 1.66,2.11 1.02,0 1.67,-0.790001 1.67,-2.11 0,-1.309999 -0.66,-2.09 -1.67,-2.09 m 4.18,0.12 -4.18,6.71 0.7,0 4.18,-6.71 -0.7,0 m -4.21,0.33 c 0.45,0 0.7,0.550001 0.7,1.64 0,1.099999 -0.25,1.65 -0.7,1.65 -0.45,0 -0.68,-0.550001 -0.68,-1.65 0,-1.089999 0.24,-1.64 0.68,-1.64 m 4.96,2.31 c -1.01,0 -1.67,0.770001 -1.67,2.09 0,1.329999 0.65,2.1 1.67,2.1 1.02,0 1.67,-0.780001 1.67,-2.1 0,-1.299999 -0.66,-2.09 -1.67,-2.09 m -0.02,0.44 c 0.45,0 0.69,0.560001 0.69,1.65 0,1.099999 -0.23,1.65 -0.69,1.65 -0.45,0 -0.69,-0.560001 -0.69,-1.65 0,-1.089999 0.25,-1.65 0.69,-1.65" id="path6840"/>
- </g>
+ <path d="M 153.80078 34.5 C 149.50078 34.4 146.10078 37.799609 146.05078 41.849609 L 146 140.59961 C 125.4 149.59961 93.999219 165.10078 95.199219 189.30078 L 95.199219 512.30078 C 98.199219 543.10078 150.19922 545.10078 172.19922 545.30078 C 197.69922 543.70078 252.19922 543.40078 252.19922 512.30078 L 252.19922 188.30078 C 251.29922 165.90078 214.29922 147.80078 198.19922 141.30078 L 198.19922 42.300781 C 198.19922 38.100781 194.79961 34.699609 190.59961 34.599609 L 153.80078 34.5 z M 419.98242 288.07812 C 393.15161 287.90894 368.4375 291.28789 351 295.90039 C 351.22026 296.10329 351.45478 296.30123 351.6875 296.5 C 351.49008 296.43125 351.29746 296.3702 351.09961 296.30078 C 347.99961 336.30078 371.80039 401.30039 404.90039 413.15039 L 405 501 C 375 502.9 353.09961 512.30078 353.09961 523.30078 C 353.09961 535.80078 381.09961 546 416.09961 546 C 450.89961 546 479.09961 536.00078 479.09961 523.30078 C 479.09961 512.50078 457.69961 503.30078 428.09961 501.30078 L 428.09961 414.30078 C 456.99961 402.80078 486.09961 333.30078 484.09961 296.30078 C 483.381 296.53511 482.65415 296.75523 481.93359 296.98633 C 482.62403 296.65837 483.32962 296.34035 484 296 C 463 290.4875 440.85083 288.20972 419.98242 288.07812 z " id="path4139" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 351,295.9 c 20.3,18.7 94,19.9 133,0.1 -48,-12.6 -102,-8.3 -133,-0.1 z" id="path3840-8" opacity="0.8" fill="#ac39ac"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 146,140.6 c -20.6,9 -52,24.5 -50.8,48.7 l 0,323 c 3,30.8 55,32.8 77,33 25.5,-1.6 80,-1.9 80,-33 l 0,-324 c -0.9,-22.4 -37.9,-40.5 -54,-47 l 0,-99 c 0,-4.2 -3.4,-7.6 -7.6,-7.7 l -36.8,-0.1 c -4.3,-0.1 -7.7,3.3 -7.75,7.35 z" id="rect3771" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 405,501 c -30,1.9 -51.9,11.3 -51.9,22.3 0,12.5 28,22.7 63,22.7 34.8,0 63,-10 63,-22.7 0,-10.8 -21.4,-20 -51,-22 l 0,-87 c 28.9,-11.5 58,-81 56,-118 -36.8,12 -76,20 -133,0 -3.1,40 20.7,105 53.8,116.85 z" id="path3845" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/bakery.svg b/vtm-themes/resources/assets/symbols/shopping/bakery.svg
old mode 100755
new mode 100644
index b8490d1e..6f363fc0
--- a/vtm-themes/resources/assets/symbols/shopping/bakery.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/bakery.svg
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327" transform="translate(-1.0849787,-4.3399146)">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 200.53148,120.55983 C 179.75461,120.81544 158.93331,125.73309 139.69951,135.49446 C 139.48328,135.59414 139.28186,135.71043 139.06644,135.81099 C 138.78234,135.95703 138.48655,136.06568 138.20317,136.21385 L 138.20317,136.24263 C 56.909305,174.84645 33.632664,276.90265 71.41461,352.11845 C 123.88789,461.93242 258.13839,499.47648 365.73317,464.80436 C 464.39383,437.56553 546.64649,340.44254 526.21563,230.74225 C 526.0886,230.06015 526.00533,229.38223 525.87032,228.69917 L 525.81277,228.69917 C 514.31342,152.46885 436.09489,106.71422 364.06418,124.64599 C 338.17194,131.09305 315.10898,141.8068 294.51314,155.49362 C 268.22865,132.18091 234.49669,120.14198 200.53148,120.55983 z M 399.91878,139.92593 C 402.48288,139.74553 404.89869,141.38217 405.61639,143.95453 L 411.31399,164.32778 C 411.35183,164.44702 411.39945,164.58032 411.42909,164.70186 C 412.14955,167.66966 410.31073,170.65737 407.34293,171.37784 C 404.37513,172.0983 401.38741,170.25949 400.66695,167.29168 L 394.96935,146.91844 C 394.14913,143.9786 395.8567,140.94758 398.79653,140.12736 C 399.16401,140.02483 399.55248,139.9517 399.91878,139.92593 z M 239.81041,152.7887 C 242.86175,152.66156 245.43842,155.03208 245.56556,158.08344 C 245.6927,161.13478 243.32217,163.71144 240.27082,163.83859 L 219.17818,165.45003 C 216.13478,165.68047 213.48081,163.40011 213.25037,160.35672 C 213.01994,157.31332 215.30028,154.65934 218.34368,154.42891 L 239.43632,152.81747 C 239.56065,152.80365 239.68542,152.79404 239.81041,152.7887 z M 137.33989,163.1192 C 137.70703,163.12665 138.06124,163.17901 138.43337,163.26308 L 159.09438,167.89597 C 159.21729,167.91923 159.31863,167.95074 159.43968,167.9823 C 162.39408,168.7559 164.18434,171.79021 163.41074,174.74461 C 162.63716,177.699 159.60283,179.46048 156.64844,178.68689 L 136.01621,174.02521 C 133.03911,173.35271 131.17122,170.41266 131.84372,167.43556 C 132.43218,164.8306 134.76998,163.06697 137.33989,163.1192 z M 332.66981,169.21966 C 334.44491,169.23033 336.18616,170.10635 337.24516,171.69438 C 338.93956,174.23522 338.2609,177.65433 335.72004,179.34873 L 318.51213,191.69353 C 316.03176,193.47205 312.60754,192.90779 310.829,190.4274 C 309.0505,187.94702 309.61477,184.49402 312.09514,182.71549 L 329.27427,170.37069 C 329.37331,170.29427 329.45805,170.23878 329.56203,170.16926 C 330.51485,169.53386 331.60475,169.21325 332.66981,169.21966 z M 484.77853,181.96732 C 487.82987,181.84019 490.40654,184.21072 490.53368,187.26207 C 490.66082,190.31341 488.29028,192.89008 485.23894,193.01722 L 464.1463,194.62866 C 461.1029,194.8591 458.44893,192.57875 458.21849,189.53535 C 457.98806,186.49195 460.2684,183.83798 463.3118,183.60754 L 484.40444,181.9961 C 484.52877,181.98228 484.65354,181.97267 484.77853,181.96732 z M 201.9415,188.09656 C 216.54729,188.15691 231.23013,192.41564 243.23472,200.47014 C 209.86378,237.60493 181.34731,290.27666 162.77751,331.80309 C 157.62325,342.79891 158.79323,355.70735 165.85651,365.58584 C 172.9198,375.46433 184.77618,380.77687 196.84802,379.45576 C 208.91984,378.13465 219.33914,370.39874 224.09867,359.2264 C 241.38694,320.56578 267.21524,274.70892 294.31171,244.92871 C 319.24692,271.4648 346.98733,314.64576 358.59712,348.4932 C 362.35813,360.01861 372.03311,368.6111 383.91979,370.99585 C 395.80649,373.38061 408.06043,369.18632 415.976,360.00351 C 423.89158,350.8207 426.24504,338.08643 422.13401,326.68117 C 407.76693,284.79504 376.44644,234.97259 347.11525,202.80098 C 357.61428,197.23609 368.62483,192.75739 380.29371,189.85189 C 384.60839,188.77776 389.00464,188.20588 393.41546,188.09656 C 424.29122,187.33131 455.55058,209.19145 459.6285,239.66274 L 459.77238,240.69867 L 459.97381,241.7346 C 473.59796,310.66853 414.60784,381.66113 346.51096,400.46174 L 345.82034,400.66317 L 345.12972,400.8646 C 267.5288,425.87128 166.83755,395.98007 131.7574,322.56573 L 131.61352,322.27797 L 131.46964,321.96144 C 109.9663,279.15287 124.82774,216.31489 167.81343,196.49909 L 168.5616,196.15378 L 169.30977,195.75092 C 179.26521,190.54551 190.58143,188.04963 201.9415,188.09656 z M 103.06796,225.15975 C 104.77066,225.23261 106.42259,226.10598 107.44187,227.63447 C 109.13627,230.17531 108.45761,233.6232 105.91676,235.3176 L 88.737623,247.6624 C 86.257249,249.44092 82.804234,248.84787 81.025717,246.3675 C 79.247204,243.88712 79.811475,240.43411 82.291851,238.65559 L 99.470985,226.33956 C 99.570021,226.26314 99.683518,226.17888 99.787518,226.10935 C 100.58153,225.57985 101.46054,225.26912 102.34856,225.18853 C 102.59277,225.16637 102.82471,225.14935 103.06796,225.15975 z M 357.12922,242.45399 C 359.48646,242.47698 361.6526,244.01978 362.36641,246.39627 C 363.24496,249.32116 361.57924,252.42392 358.65433,253.30246 L 338.6264,260.06476 C 335.73476,261.04142 332.58177,259.50331 331.60511,256.61167 C 330.62846,253.72004 332.19535,250.59582 335.08698,249.61916 L 355.11491,242.82808 C 355.23194,242.78391 355.34047,242.74908 355.46022,242.71297 C 356.00864,242.54825 356.58524,242.44869 357.12922,242.45399 z M 255.29177,245.70565 C 258.34312,245.57851 260.91979,247.94904 261.04692,251.00039 C 261.17406,254.05174 258.80353,256.6284 255.75218,256.75555 L 234.65954,258.36699 C 231.61615,258.59743 228.96217,256.31707 228.73174,253.27368 C 228.5013,250.23028 230.78165,247.5763 233.82505,247.34587 L 254.91769,245.73443 C 255.04202,245.72061 255.16679,245.71099 255.29177,245.70565 z M 488.20284,247.89261 C 489.26699,247.86826 490.34783,248.16579 491.31063,248.78466 L 509.12283,260.20864 C 509.23037,260.27254 509.33642,260.339 509.43936,260.41007 C 511.95091,262.1476 512.58689,265.58165 510.84937,268.0932 C 509.11184,270.60475 505.64901,271.24074 503.13747,269.50321 L 485.35404,258.07923 C 482.78658,256.42892 482.03475,252.99235 483.68505,250.42488 C 484.71649,248.82021 486.42926,247.93318 488.20284,247.89261 z M 372.20772,304.75353 C 372.57485,304.76099 372.92907,304.81335 373.3012,304.89741 L 393.93342,309.55908 C 394.05634,309.58234 394.18646,309.5851 394.30751,309.61663 C 397.2619,310.39023 399.02338,313.42456 398.24979,316.37894 C 397.47621,319.33333 394.47066,321.09482 391.51626,320.32122 L 370.88403,315.68832 C 367.90693,315.01582 366.03905,312.04699 366.71155,309.0699 C 367.3,306.46493 369.63782,304.70131 372.20772,304.75353 z M 196.38777,309.61663 C 197.45192,309.59229 198.53276,309.86104 199.49556,310.47991 L 217.30776,321.90389 C 217.4153,321.96778 217.52133,322.03427 217.62429,322.10532 C 220.13584,323.84285 220.74306,327.30568 219.00553,329.81722 C 217.26799,332.32877 213.83395,332.96476 211.3224,331.22724 L 193.5102,319.77448 C 190.94273,318.12417 190.21967,314.71637 191.86998,312.1489 C 192.90142,310.54424 194.61419,309.65721 196.38777,309.61663 z M 103.55714,310.88277 C 106.60849,310.75563 109.18516,313.12616 109.3123,316.17751 C 109.43944,319.22886 107.0689,321.80553 104.01756,321.93266 L 82.924918,323.54411 C 79.88152,323.77454 77.227549,321.49419 76.997109,318.4508 C 76.766669,315.4074 79.047022,312.75342 82.09042,312.52299 L 103.18306,310.91154 C 103.30739,310.89772 103.43216,310.88812 103.55714,310.88277 z M 486.53385,324.58003 C 488.30895,324.59071 490.0502,325.46672 491.1092,327.05475 C 492.8036,329.59559 492.09616,333.01471 489.5553,334.70911 L 472.37617,347.05391 C 469.89579,348.83243 466.44278,348.26816 464.66426,345.78778 C 462.88575,343.3074 463.45001,339.85439 465.9304,338.07587 L 483.13831,325.73107 C 483.23734,325.65465 483.32207,325.59916 483.42607,325.52963 C 484.37889,324.89424 485.46879,324.57363 486.53385,324.58003 z M 125.71448,361.70078 C 128.06936,361.77018 130.19892,363.36954 130.86535,365.75816 L 136.56295,386.1314 C 136.60079,386.25064 136.6484,386.35518 136.67805,386.47671 C 137.39851,389.44451 135.55968,392.43222 132.59189,393.15269 C 129.62409,393.87315 126.63637,392.0631 125.91591,389.09531 L 120.21831,368.72206 C 119.39809,365.78223 121.13443,362.72244 124.07427,361.90221 C 124.62548,361.74842 125.17105,361.68476 125.71448,361.70078 z M 431.42825,374.30456 C 434.47738,374.16962 437.04846,376.55018 437.1834,379.5993 L 438.13301,400.72072 C 438.14293,400.84543 438.16034,400.96971 438.16178,401.0948 C 438.19324,404.14864 435.71944,406.64587 432.66561,406.6773 C 429.61178,406.70876 427.11457,404.26374 427.08311,401.20991 L 426.13351,380.08849 C 425.99856,377.03937 428.37912,374.43951 431.42825,374.30456 z M 180.79131,416.37474 C 181.15844,416.3822 181.54143,416.43455 181.91356,416.51862 L 202.54579,421.18029 C 202.6687,421.20355 202.79882,421.23508 202.91987,421.26662 C 205.87426,422.04021 207.63575,425.04576 206.86215,428.00015 C 206.08857,430.95454 203.05424,432.71603 200.09985,431.94243 L 179.46762,427.30953 C 176.49052,426.63702 174.62263,423.66819 175.29513,420.6911 C 175.88359,418.08614 178.22139,416.32252 180.79131,416.37474 z M 373.76161,425.81319 C 376.81296,425.68605 379.38962,428.05658 379.51676,431.10793 C 379.6439,434.15928 377.27336,436.73595 374.22202,436.86308 L 353.12938,438.47453 C 350.08599,438.70496 347.432,436.42462 347.20158,433.38122 C 346.97114,430.33782 349.25148,427.68384 352.29489,427.45341 L 373.38753,425.84196 C 373.51186,425.82814 373.63662,425.81854 373.76161,425.81319 z M 262.68714,431.16548 C 263.75129,431.14114 264.83212,431.40989 265.79493,432.02876 L 283.60713,443.45274 C 283.71467,443.51663 283.82071,443.58311 283.92366,443.65417 C 286.43521,445.3917 287.04243,448.85452 285.3049,451.36607 C 283.56737,453.87762 280.13333,454.51361 277.62177,452.77608 L 259.80957,441.32333 C 257.2421,439.67302 256.51904,436.26522 258.16935,433.69775 C 259.20079,432.09308 260.91356,431.20605 262.68714,431.16548 z" id="path7165" sodipodi:nodetypes="ccsccccsccccccccssccsccsccsccccccssccsccsccsccsccsccsccccccsscccssccssccccccccccccccsccsccssccsccsccsccsccsccccccssccsccccssccsccccssccsccsccsccccsccsccsccccssccsccccssccccccssccsccsccsccccccssccsc" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="72.954"/>
- <path d="M 200.69955,120.72558 C 179.92268,120.98119 159.10138,125.89884 139.86758,135.66021 C 139.65135,135.75989 139.44993,135.87618 139.23451,135.97674 C 138.95041,136.12277 138.65462,136.23143 138.37124,136.3796 L 138.37124,136.40838 C 57.07738,175.0122 33.80074,277.0684 71.58268,352.28419 C 124.05596,462.09817 258.30646,499.64223 365.9012,464.9701 C 464.5619,437.73127 546.8146,340.60829 526.3837,230.908 C 526.2566,230.2259 526.1734,229.54798 526.0384,228.86492 L 525.9808,228.86492 C 514.4815,152.6346 436.263,106.87997 364.2322,124.81174 C 338.34,131.2588 315.27705,141.97255 294.68121,155.65937 C 268.39672,132.34666 234.66476,120.30773 200.69955,120.72558 z M 393.5835,188.26231 C 424.4593,187.49706 455.7186,209.3572 459.7966,239.82849 L 459.9405,240.86442 L 460.1419,241.90034 C 473.766,310.83428 414.7759,381.82688 346.679,400.62749 L 345.9884,400.82892 L 345.2978,401.03035 C 267.69687,426.03703 167.00562,396.14581 131.92546,322.73148 L 131.78159,322.44372 L 131.63771,322.12719 C 110.13437,279.31862 124.99581,216.48064 167.9815,196.66484 L 168.72967,196.31953 L 169.47784,195.91667 C 192.23313,184.01858 222.06128,186.31677 243.40279,200.63589 C 210.03185,237.77068 185.51537,282.44241 166.94557,323.96884 C 161.79132,334.96466 162.97305,347.88625 170.03633,357.76474 C 177.09962,367.64323 188.94461,372.9404 201.01644,371.61929 C 213.08828,370.29817 223.50721,362.56449 228.26674,351.39214 C 245.55501,312.73153 267.38331,274.87467 294.47978,245.09446 C 319.41498,271.63055 339.1554,302.81151 350.7652,336.65895 C 354.5262,348.18436 364.2057,356.78902 376.0924,359.17378 C 387.9791,361.55853 400.2285,357.35333 408.1441,348.17052 C 416.0596,338.98771 418.4131,326.25218 414.3021,314.84692 C 399.935,272.96079 376.6145,235.13833 347.2833,202.96673 C 357.7824,197.40184 368.7929,192.92314 380.4618,190.01763 C 384.7765,188.94351 389.1727,188.37163 393.5835,188.26231 z" id="path7219" opacity=".1" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="72.954"/>
+ <path id="path4139" d="M 107,155.9 C 47.7,206 37.8,300 78,365 c 40,73 125,113 206,113 74,-1 148,-29 196,-86 38,-44 58,-105 46,-162 -8,-65 -74,-114 -138,-109 -34,3 -66,16 -93,35 -25,-23 -60,-36 -94,-35 -34,0.4 -68,13.5 -94,34.9 z m 128,54 c -30.8,38 -55,81 -73.9,126 -11.3,29 28,58 51.7,36.7 18.2,-19.8 24.4,-48 39.9,-70 12.6,-17.8 26.5,-49 43,-55 28.4,32 51,69 66,109 15.5,26.6 61.9,14 61,-16.9 -3.1,-27 -18.4,-51 -31.4,-75 C 379,243 364,222 347,203 c 23.9,-13.4 54,-21.7 80,-7.2 20,9.7 33.7,30.4 34,52.6 7.5,59.8 -34.8,116 -86,142 C 306,424 214,414 158,359 124,327 110,272 134,230 c 13,-25 40,-42 68,-42 12.8,0.1 52,6.2 33,21.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="#ac39ac" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 107,155.9 C 47.7,206 37.8,300 78,365 c 40,73 125,113 206,113 74,-1 148,-29 196,-86 38,-44 58,-105 46,-162 -8,-65 -74,-114 -138,-109 -34,3 -66,16 -93,35 -25,-23 -60,-36 -94,-35 -34,0.4 -68,13.5 -94,34.9 z m 128,54 c -30.8,38 -55,81 -73.9,126 -11.3,29 28,58 51.7,36.7 18.2,-19.8 24.4,-48 39.9,-70 12.6,-17.8 26.5,-49 43,-55 28.4,32 51,69 66,109 15.5,26.6 61.9,14 61,-16.9 -3.1,-27 -18.4,-51 -31.4,-75 C 379,243 364,222 347,203 c 23.9,-13.4 54,-21.7 80,-7.2 20,9.7 33.7,30.4 34,52.6 7.5,59.8 -34.8,116 -86,142 C 306,424 214,414 158,359 124,327 110,272 134,230 c 13,-25 40,-42 68,-42 12.8,0.1 52,6.2 33,21.9 z" id="path7165" fill="#ac39ac" fill-rule="evenodd" stroke-linecap="round" stroke-width="73"/>
+ <path d="m400 140c11.6 2.3 16 42-.1 25C400 158 389 143 400 140m-160 13c19.9 12.8-37.8 21-22.3 1.4C225 152 233 154 240 153m-103 10c9-.5 38 9 19 15.7C150 178 120 173 137 163m196 6c17.4 10.3-30.7 36.6-19.4 11.9C321 178 325 171 333 169m152 13c19 11.8-34.4 21.7-24 2.9C468 182 477 184 485 182M103 225C122 235 69.9 259 85 236 92 233 96 227 103 225m254 18c19.3 10.7-36 27-21 6.3C343 248 350 244 357 243m-102 3c22.5 14.4-42.9 14.2-17.8.6C243 247 249 246 255 246m233 2c8 2.7 35 17.7 16.4 21.6C498 267 472 254 488 248m-116 57c8.7.1 38 8 19 14.8C384 319 354 315 372 305m-176 5c8.4 1.9 35 18.3 16.2 20.9C207 328 180 316 196 310m-92 1c18.7 14.4-39 19.6-22 1.9C89 312 97 312 104 311m383 14c18.8 16.5-42 30.9-14.2 8.3C477 330 481 326 487 325m-361 37c11.4 4.3 15.2 43-1.3 24.3C125 380 113 363 126 362m305 12c12.2 3.4 8.8 45.7-4.4 25.5C428 392 421 377 431 374m-250 42c7.4 3.6 34.8 3.2 21.7 15.6C196 432 161 426 181 416m193 10c19 11.9-34 21.6-24 2.7C357 426 366 428 374 426m-111 5c7.8 2.9 33.9 18.3 15.7 21.7C273 450 246 437 263 431" id="path4138" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="73"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/bicycle.svg b/vtm-themes/resources/assets/symbols/shopping/bicycle.svg
old mode 100755
new mode 100644
index fb6ed7ce..538d2aad
--- a/vtm-themes/resources/assets/symbols/shopping/bicycle.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/bicycle.svg
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path transform="matrix(-0.9834594,0,0,0.9834594,323.42176,-101.89163)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path596" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
- <path transform="matrix(-0.9834594,0,0,0.9834594,653.78261,-103.3933)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path595" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
- <path sodipodi:nodetypes="ccccc" id="path594" d="M 395.50064,219.78507 L 197.2842,220.78618 L 127.20771,350.92828 L 261.35419,350.92828 L 401.5072,255.82445" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="20.53"/>
- <path sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc" id="path593" d="M 387.8839,141.79102 C 398.65069,141.79102 406.78894,141.55079 415.13057,154.29434 C 417.53169,158.54247 418.62948,163.72941 417.74288,168.89256 C 416.6793,174.76358 413.20345,180.53176 409.10585,183.94641 C 403.67995,188.468 398.53061,188.1192 399.36281,192.18386 C 400.43059,197.39931 403.6893,204.64686 407.21088,216.41541 C 410.78555,228.36126 415.03025,242.98187 419.1968,257.38265 C 423.36335,271.7834 427.4534,285.97209 430.69096,297.02835 C 432.30979,302.55645 433.72356,307.30328 434.80924,310.85825 C 435.867,314.32184 436.8009,317.01227 436.71466,316.82046 C 440.08774,322.75515 440.54688,326.62214 446.20457,331.67337 C 452.54809,337.22515 457.71292,341.3265 459.5054,342.57934 C 464.05823,345.88667 466.1748,352.86639 463.77059,356.31512 C 460.74069,361.01519 454.48317,361.73616 449.90974,360.33004 C 445.56716,358.95151 438.6929,356.58361 430.72172,349.98147 L 430.66024,349.88928 L 430.56804,349.8278 C 419.47658,340.31417 415.37321,328.7676 414.95565,328.09953 L 414.3717,327.20826 L 413.97216,326.2248 C 413.01109,323.85899 412.43539,321.77291 411.2984,318.04978 C 410.16138,314.32666 408.72,309.51669 407.08794,303.94329 C 403.82387,292.79653 399.75458,278.58627 395.59378,264.2054 C 391.43295,249.82454 387.19865,235.27838 383.66933,223.48403 C 380.13999,211.68969 377.91028,202.00308 377.08605,199.94246 C 375.0799,194.92714 374.05501,189.51265 375.42644,184.08417 C 376.79786,178.65571 380.89603,174.27446 384.57479,173.256 C 392.97186,170.90677 390.74383,164.86682 386.44779,164.85806 L 350.44729,164.78478 L 350.35855,141.79152 C 350.35878,141.79102 373.72637,141.79102 387.8839,141.79102 z" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="25"/>
- <path id="path599" d="M 258.78569,346.85349 L 190.82923,180.50178" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="24.586"/>
- <path id="path600" d="M 282.14699,304.37879 L 241.08743,399.94641" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="8.974"/>
- <path transform="matrix(-0.2772911,0,0,0.2449148,316.20929,238.03626)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path597" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="31.31"/>
- <path sodipodi:nodetypes="cc" id="path601" d="M 300.4261,304.42236 L 264.15616,304.75482" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="12.54"/>
- <path sodipodi:nodetypes="cc" id="path602" d="M 259.57689,398.57363 L 223.30695,398.9061" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="12.539"/>
- <path sodipodi:nodetypes="cssccc" id="path603" d="M 157.55855,165.63576 L 242.85812,165.63576 C 246.04359,165.63576 250.15505,171.27063 246.04359,175.01517 C 241.59685,179.24723 201.62409,187.93397 201.62409,187.93397 C 201.62409,187.93397 190.65196,190.94246 184.81192,190.2346 C 178.97192,189.52672 158.79734,187.75702 157.55855,165.63576 z" fill="#ffffff" fill-rule="evenodd" stroke-width=".695"/>
+ <path id="path4147" d="M 376 140 C 367 140 358 141 351 141 L 349 163 L 385 163 C 401 166 376 174 374 182 C 372 191 376 200 378 208 L 214 209 L 205 185 C 215 182 240 176 244 173 C 248 169 244 164 241 164 L 156 164 C 157 182 171 186 179 188 L 189 211 C 178 231 168 248 158 267 C 75 243 35.699219 305 34.699219 351 C 34.699219 401 75 441 125 441 C 171 441 210 405 215 360 L 236 360 C 239 364 243 368 248 370 L 239 391 L 222 391 C 213 392 216 403 222 404 L 258 403 C 268 402 265 391 258 391 L 248 391 L 256 372 C 279 374 288 357 285 345 L 397 269 C 398 272 399 276 400 279 C 379 295 366 321 366 349 C 366 399 406 439 456 439 C 506 439 546 399 546 349 C 543 292 498 245 422 266 C 412 242 400 205 399 191 C 401 181 415 180 418 168 C 416 144 396 140 376 140 z M 223 228 L 384 228 C 386 234 388 241 390 248 C 352 275 315 302 276 327 L 283 309 C 291 309 290 309 299 308 C 308 307 304 296 299 296 L 263 296 C 253 297 256 309 263 309 L 273 309 L 265 327 C 265 326 264 326 263 326 L 223 228 z M 200 235 L 240 334 C 239 335 237 337 236 339 L 214 339 C 211 313 197 291 177 277 L 200 235 z M 458 284 C 495 284 519 318 520 349 C 520 384 491 413 456 413 C 397 410 375 354 408 306 C 412 321 419 337 430 348 C 463 377 483 353 446 330 C 438 318 433 305 429 291 C 439 286 449 284 458 284 z M 123 287 C 130 287 138 288 146 290 L 117 344 C 113 351 118 359 126 359 L 189 359 C 185 391 158 415 125 415 C 89 415 61 386 61 351 C 60.9 316 84 287 123 287 z M 164 300 C 176 310 185 323 188 339 L 143 339 L 164 300 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 376 140 C 367 140 358 141 351 141 L 349 163 L 385 163 C 401 166 376 174 374 182 C 372 191 376 200 378 208 L 214 209 L 205 185 C 215 182 240 176 244 173 C 248 169 244 164 241 164 L 156 164 C 157 182 171 186 179 188 L 189 211 C 178 231 168 248 158 267 C 75 243 35.699219 305 34.699219 351 C 34.699219 401 75 441 125 441 C 171 441 210 405 215 360 L 236 360 C 239 364 243 368 248 370 L 239 391 L 222 391 C 213 392 216 403 222 404 L 258 403 C 268 402 265 391 258 391 L 248 391 L 256 372 C 279 374 288 357 285 345 L 397 269 C 398 272 399 276 400 279 C 379 295 366 321 366 349 C 366 399 406 439 456 439 C 506 439 546 399 546 349 C 543 292 498 245 422 266 C 412 242 400 205 399 191 C 401 181 415 180 418 168 C 416 144 396 140 376 140 z M 223 228 L 384 228 C 386 234 388 241 390 248 C 352 275 315 302 276 327 L 283 309 C 291 309 290 309 299 308 C 308 307 304 296 299 296 L 263 296 C 253 297 256 309 263 309 L 273 309 L 265 327 C 265 326 264 326 263 326 L 223 228 z M 200 235 L 240 334 C 239 335 237 337 236 339 L 214 339 C 211 313 197 291 177 277 L 200 235 z M 458 284 C 495 284 519 318 520 349 C 520 384 491 413 456 413 C 397 410 375 354 408 306 C 412 321 419 337 430 348 C 463 377 483 353 446 330 C 438 318 433 305 429 291 C 439 286 449 284 458 284 z M 123 287 C 130 287 138 288 146 290 L 117 344 C 113 351 118 359 126 359 L 189 359 C 185 391 158 415 125 415 C 89 415 61 386 61 351 C 60.9 316 84 287 123 287 z M 164 300 C 176 310 185 323 188 339 L 143 339 L 164 300 z " id="path4144" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/book.svg b/vtm-themes/resources/assets/symbols/shopping/book.svg
old mode 100755
new mode 100644
index f0f73779..81c7ca6a
--- a/vtm-themes/resources/assets/symbols/shopping/book.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/book.svg
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 73.931354,159.8883 L 302.43289,419.37306 L 521.25215,293.50359 L 298.56009,35.95529 L 73.931354,159.8883 z" id="path3470" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 61.6534,188.60064 L 286.28195,444.21251 L 287.2502,541.03514 L 60.685154,284.9392 L 61.6534,188.60064 z" id="path3474" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
- <path d="M 519.50933,327.13704 L 313.25992,447.99014 L 313.11567,451.17546 L 519.19198,330.40891 L 519.50933,327.13704 z" id="path3476" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
- <path sodipodi:nodetypes="ccccc" id="path3505" d="M 519.50933,367.13704 L 313.25992,487.99014 L 313.11567,491.17546 L 519.19198,370.40891 L 519.50933,367.13704 z" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
- <path d="M 519.50933,407.13704 L 313.25992,527.99014 L 313.11567,531.17546 L 519.19198,410.40891 L 519.50933,407.13704 z" id="path3507" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16.477"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4137" d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4139" d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 76.77129,-43.39779 150.25131,-85.81648 212,-122 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 456.71159,435.65718 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 74.60979,-42.67729 150.25131,-85.81648 212,-122 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.73783,41.31178 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 74.60979,-41.2363 150.25131,-85.81648 212,-122 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" id="path3474" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 76.77129,-43.39779 150.25131,-85.81648 212,-122 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 456.71159,435.65718 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 74.60979,-42.67729 150.25131,-85.81648 212,-122 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.73783,41.31178 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 74.60979,-41.2363 150.25131,-85.81648 212,-122 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" id="path3507" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/butcher.svg b/vtm-themes/resources/assets/symbols/shopping/butcher.svg
old mode 100755
new mode 100644
index b5a764f0..b25bd009
--- a/vtm-themes/resources/assets/symbols/shopping/butcher.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/butcher.svg
@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <defs id="defs4">
-  <clipPath id="clipoutline2">
-   <path d="M 55.8,12 L 56.56,12.16 C 65.4,9.22 85.24,20.8 80.82,31.12 C 79.7,32.74 79.89,35.62 81.24,37.43 L 56.43,62.25 C 55.04,60.86 51.95,60.89 50.53,62.25 L 9.5,101.63 C 5.76,105.22 8.7,108.27 10.28,109.88 L 17.64,117.24 C 19.25,118.84 23.5,121 26.52,117.8 L 65.24,76.99 C 66.59,75.57 66.6,72.52 65.24,71.12 C 65.24,71.12 65.25,71.1 65.24,71.1 L 90.15,46.2 C 92.78,48.57 95.263827,48.774854 97.62,48.13 C 102.17057,46.884568 104.70725,51.336643 107.43,54.59 L 106.2,55.8 C 104.38,57.64 104.55,60.74 106.59,62.78 C 108.63,64.82 111.74,64.99 113.56,63.17 L 121.7,55.04 C 123.52,53.2 123.35,50.1 121.3,48.07 C 119.46,46.22 116.79,45.98 114.93,47.3 C 109.35,41.04 112.28,40.1 104.92,31.95 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2"/>
-  </clipPath>
-  <clipPath id="clipoutline1">
-   <path d="M 22.42,17.2 L 35.38,30.15 L 32.88,38.93 L 24.1,41.43 L 11.14,28.47 L 5.28,34.33 L 20.17,55.79 L 37.73,52.45 L 99.36,118.07 C 108.8,127.58 121.53,113.32 112.7,105.2 L 46.85,42.92 L 50.86,25.16 L 28.72,10.89 L 22.42,17.2 z M 103.48,109.17 C 105.16,107.49 107.88,107.49 109.56,109.17 C 111.24,110.85 111.24,113.57 109.56,115.25 C 107.88,116.92 105.16,116.92 103.48,115.25 C 101.8,113.57 101.8,110.85 103.48,109.17 z" id="outline1"/>
-  </clipPath>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <g id="g6443" transform="matrix(1.8557014,0,0,1.8557014,-202.40231,-219.83775)">
-  <path sodipodi:nodetypes="ccccssccccccscccczzssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscccsscccc" id="path3" d="M 366.80484,182.59267 C 364.56483,182.59867 362.70184,183.20542 361.17984,183.93642 C 358.51784,185.25541 356.61484,186.95142 354.80484,188.68642 C 352.14084,191.28942 349.79159,194.13392 347.77359,196.37392 C 346.77559,197.48692 345.87909,198.45342 345.21109,199.06142 C 344.88108,199.36642 344.60809,199.58242 344.46109,199.68642 C 344.43609,199.70543 344.41459,199.70667 344.39859,199.71767 L 332.11734,204.99892 C 331.68335,204.99192 331.27709,204.99892 330.83609,204.99892 C 314.0571,205.02192 299.04434,209.89067 284.86734,214.34267 C 269.23834,219.29267 254.31134,225.17467 239.24234,228.09267 C 232.32235,229.45267 224.51934,229.82667 216.36734,230.46767 C 208.22033,231.12767 199.68584,232.02767 191.30484,234.96767 C 183.85183,237.58166 177.54059,240.54717 170.77359,244.78017 C 167.80958,246.65218 165.20309,248.90592 162.71109,250.74892 C 160.2881,252.60393 157.95809,253.90467 157.08609,254.09267 L 153.24234,256.65517 C 153.24234,256.65517 149.77993,259.30104 147.98366,260.84118 L 140.75139,267.0422 C 133.48312,273.27409 131.11334,289.03867 131.11734,297.84267 C 131.11734,297.84368 131.11734,297.84992 131.11734,297.87392 C 131.11734,297.89793 131.11734,297.95492 131.11734,297.99892 C 131.18034,311.48993 135.55684,324.24867 142.55484,335.59267 C 149.58484,346.98467 159.24609,357.05217 170.21109,365.53017 C 192.24209,382.42916 219.90559,393.42617 246.02359,393.53017 C 251.1256,393.52817 256.18934,393.10017 261.11734,392.15517 C 265.72533,391.30918 269.72959,389.11342 272.77359,386.31142 C 274.68758,384.55342 278.25859,382.57392 279.52359,380.49892 C 281.7386,379.49592 281.85084,378.10242 283.55484,376.31142 C 286.06984,373.70342 287.71634,370.82517 289.61734,367.28017 C 292.75435,361.35216 296.57634,355.02867 299.61734,348.21767 C 303.08535,340.35967 304.33259,332.07042 305.52359,324.31142 C 306.67558,316.55341 307.75784,309.29342 309.92984,303.68642 C 312.14284,297.88343 315.98759,293.00042 320.77359,287.81142 C 325.52158,282.62742 331.16634,277.26567 335.99234,270.34267 C 339.74933,264.88866 344.18384,260.06392 348.05484,253.99892 C 351.46083,248.70392 354.22684,242.19367 354.80484,234.34267 L 364.49234,229.24892 L 365.30484,228.40517 C 366.35283,227.36916 367.19759,226.92392 368.52359,226.49892 C 370.48359,225.85993 373.57759,225.73717 377.52359,225.40517 C 381.37559,225.04417 386.53884,224.24592 391.17984,220.49892 C 393.09383,218.94192 394.71309,217.28417 395.96109,215.28017 C 397.20309,213.30116 398.03359,210.86067 398.02359,208.34267 C 398.0306,206.28967 397.46859,204.30367 396.64859,202.71767 C 395.18358,199.91867 393.18709,198.16592 391.21109,196.74892 C 388.21509,194.65492 385.00734,193.29967 381.99234,192.21767 C 380.67934,191.75467 379.39809,191.34092 378.21109,190.99892 C 377.55008,189.53192 376.76909,188.19017 375.71109,186.90517 C 374.7021,185.70117 373.40809,184.57117 371.83609,183.78017 C 370.27309,182.98017 368.44984,182.58167 366.80484,182.59267 z M 366.52359,190.09267 C 368.88965,189.93172 371.00231,191.83152 372.52359,197.28017 C 379.68359,198.89017 398.83708,204.63717 386.46109,214.65517 C 378.84509,220.82117 367.83309,215.16416 359.96109,223.15517 L 347.39859,229.74892 C 347.39159,229.50992 347.37933,229.27318 347.36734,229.03017 C 344.19134,230.18317 340.9306,231.57842 337.64859,232.18642 C 337.17659,228.84642 336.43583,225.59616 335.55484,222.40517 C 333.11284,223.37217 330.1391,224.22017 327.71109,224.65517 C 328.63909,220.13317 329.67334,216.67067 331.99234,213.21767 L 347.52359,206.56142 C 352.61018,204.35054 360.47699,190.50398 366.52359,190.09267 z M 168.80484,261.43642 C 169.37605,261.41885 169.95046,261.43667 170.52359,261.43642 C 184.18759,261.46341 198.45009,266.13492 209.33609,270.24892 C 218.1811,273.61093 225.48959,276.72642 232.14859,281.06142 C 238.80958,285.38843 244.70634,290.93142 250.74234,298.81142 C 260.19735,311.16543 270.03359,326.59967 274.02359,342.71767 C 274.9826,346.63267 275.61534,351.58817 275.61734,356.78017 C 275.60434,362.50817 274.86709,368.51392 272.58609,373.74892 C 270.37808,378.93492 266.09909,383.59217 259.71109,384.78017 C 255.2961,385.62716 250.71684,386.02817 246.05484,386.03017 C 222.08785,385.99016 195.59559,375.61867 174.77359,359.59267 C 154.02959,343.56168 138.68634,321.68192 138.61734,297.87392 C 138.61533,290.14691 140.28459,282.26742 143.89859,274.56142 L 150.17984,267.56142 L 157.11734,263.31142 C 160.8851,262.13017 164.80635,261.55938 168.80484,261.43642 z M 185.55484,296.81142 C 190.19984,296.84442 195.09259,297.89267 198.77359,300.96767 C 200.18359,302.18267 201.88384,304.05992 203.42984,306.37392 C 204.93284,308.69792 206.34659,311.38092 206.39859,314.62392 C 206.40258,315.94893 206.12134,317.40467 205.36734,318.71767 C 204.35134,320.50468 202.68984,321.71367 201.05484,322.34267 C 199.40783,322.98866 197.75259,323.18242 196.14859,323.18642 C 191.78858,323.16441 187.54359,321.75842 185.39859,321.06142 L 185.11734,320.96767 L 175.71109,315.84267 L 175.33609,315.62392 L 174.99234,315.34267 C 172.15834,312.68167 170.40634,309.88642 170.36734,306.68642 C 170.35434,304.83842 171.07034,303.07017 172.11734,301.78017 C 173.16635,300.47517 174.47659,299.55467 175.89859,298.84267 C 178.74959,297.43666 182.10084,296.82342 185.55484,296.81142 z M 185.55484,303.81142 C 183.64084,303.80643 181.79109,304.11067 180.33609,304.59267 C 178.8701,305.06167 177.88409,305.74417 177.58609,306.15517 C 177.37809,306.44018 177.38034,306.50542 177.36734,306.68642 C 177.33035,306.93342 177.60709,308.09317 179.46109,309.90517 L 187.92984,314.53017 C 189.90384,315.18617 193.48559,316.20942 196.14859,316.18642 C 197.16258,316.19241 198.00334,316.04267 198.49234,315.84267 C 198.99535,315.62567 199.11559,315.46967 199.27359,315.21767 C 199.34159,315.09168 199.39459,314.96092 199.39859,314.62392 C 199.4506,313.81193 198.77334,311.93392 197.61734,310.24892 C 196.50434,308.55592 195.00009,306.97142 194.21109,306.31142 C 192.54708,304.82043 189.02084,303.77642 185.55484,303.81142 z" fill="#ffffff" stroke="#ffffff"/>
-  <path id="path6439" d="M 144.94595,333.42528 L 168.60379,360.08201 L 198.92582,378.0753 L 231.58031,387.73836 L 259.56987,389.40441 L 270.56577,382.74023 L 277.89637,370.41149 L 283.22772,330.4264 L 254.90494,277.44616 L 208.58888,258.12003 L 169.93663,254.12152 L 151.94334,260.7857 L 139.28139,272.78123 L 134.61647,292.10736 L 137.28214,315.7652 L 144.94595,333.42528 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
-  <path id="path6441" d="M 323.21281,212.13718 L 345.53781,202.47411 L 364.53073,186.14687 L 374.86021,191.14501 L 390.85425,201.8077 L 393.51992,211.47076 L 384.52328,219.46778 L 366.52999,222.46666 L 341.53931,239.12711 L 313.54974,235.46181 L 323.21281,212.13718 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
- </g>
+ <path id="path4140" d="m 457.8,130.3 c -6.94963,6.11717 -11.28197,13.65281 -17.9,19.4 -0.6,0.6 -40.9,11 -40.9,11 -16.7,0 -44.7,9.1 -70.7,17.3 -29,9.2 -56.7,20 -85,25.5 -29.62626,5.20056 -61.68471,3.48898 -88,12.7 -21.484,6.98694 -36.21633,17.31191 -53,29.2 -9.505502,5.87934 -19.61059,12.31367 -27.3,18.8 -22.874126,16.93939 -31.01284,40.99693 -31.3,68.5 l 0,0.1 0,0.2 c 0.1,25 8.2,48.7 21,69.8 13,21 31,39.8 51,56 40.9,31.4 92,51.8 141,52 9.5,0 18.9,-0.8 28,-2.6 22.3803,-5.58108 43.35334,-29.14647 52.9,-46.2 16.26609,-26.59753 24.97463,-50.02583 29.6,-79.4 2.1,-14.4 4.1,-27.9 8.2,-38 10.93682,-25.24235 34.00537,-41.62692 48,-61.9 7,-10 15.2,-19 22.4,-30 6.3,-9.8 11.4,-21.9 12.5,-36.5 L 478,205.05 c 6.10027,-5.47056 15.90728,-4.81606 22.5,-5.35 15.21192,-2.7506 26.29614,-6.32491 34.2,-18.8 4.2212,-7.56556 5.06428,-15.85006 1.3,-23.3 -7.08036,-12.4997 -22.22771,-17.94202 -34,-21.7 -5.23663,-12.65014 -13.15142,-14.73244 -22.15,-16.25 -9.06799,0.14304 -16.48337,5.28027 -22.05,10.65 z m 21.7,2.6 c 4.4,-0.3 8.3,3.2 11,13.3 13.3,3 48.8,13.7 25.9,32 -14,11.4 -34.6,0.9 -49,15.8 l -26.3,12.6 c -3,0.4 -9,3 -15.1,4.2 -0.9,-6.2 -2.3,-12.2 -3.9,-18.2 -4.5,1.8 -10,3.4 -14.6,4.2 1.7,-8.4 3.6,-14.8 7.9,-21 l 28.8,-12.3 c 9.4,-4.1 24,-29.8 35,-30.6 z M 229.7,301.3 c 36.9149,27.65951 67.17676,73.72982 77.5,114.9 3.89522,19.15218 4.53861,40.49497 -2.6,57.5 -10.79991,20.8403 -29.25536,22.73742 -49.2,22.8 -44.5,-0.1 -94,-19.3 -132,-49 C 85,418 56,377 56,333 c 0,-14.3 3.1,-29 9.8,-43 17.521468,-23.01358 35.56555,-24.08307 57.1,-24.6 35.46574,3.53999 79.05373,17.68401 106.8,35.9 z M 168,338.6 c 7.13792,6.80786 13.80764,16.2447 14.1,25.3 -1.98563,11.37136 -8.88713,15.84682 -19,15.9 -15.82538,0.2563 -28.58537,-7.53777 -41.2,-16.5 -3.3,-2.9 -6.5,-8 -6.6,-14 0.33384,-6.86263 4.84875,-11.73317 10.3,-14.5 5.3,-2.6 11.5,-3.8 19,-3.8 7.5,0 16.6,1.9 23.4,7.6 z m -34.2,6.7 c -7.09011,2.05129 -4.6824,6.85146 -1.6,9.9 9.56447,5.67652 20.23845,11.55267 31,11.7 6.73073,-0.48095 5.2172,-7.05881 2.6,-11 -4.65045,-7.46091 -12.78077,-11.88547 -20.9,-12 -5,0 -8.4,0.6 -11.1,1.4 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m67 399l43.9 50 56 33.4 61 17.9 51.9 3.1 20.4-12.4 13.6-22.9 9.9-74-52.6-98-86-35.9-72-7.4-33.4 12.4-23.5 22.3-8.7 35.9 5 43.9 14.2 32.8" id="path6439-1" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m397 174l41-17.9 35-30 19 9.3 29.7 19.8 5 17.9-16.7 14.8-33.4 5.6-46 30.9-51.9-6.8 17.9-43" id="path6441-7" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 457.8,130.3 c -6.94963,6.11717 -11.28197,13.65281 -17.9,19.4 -0.6,0.6 -40.9,11 -40.9,11 -16.7,0 -44.7,9.1 -70.7,17.3 -29,9.2 -56.7,20 -85,25.5 -29.62626,5.20056 -61.68471,3.48898 -88,12.7 -21.484,6.98694 -36.21633,17.31191 -53,29.2 -9.505502,5.87934 -19.61059,12.31367 -27.3,18.8 -22.874126,16.93939 -31.01284,40.99693 -31.3,68.5 l 0,0.1 0,0.2 c 0.1,25 8.2,48.7 21,69.8 13,21 31,39.8 51,56 40.9,31.4 92,51.8 141,52 9.5,0 18.9,-0.8 28,-2.6 22.3803,-5.58108 43.35334,-29.14647 52.9,-46.2 16.26609,-26.59753 24.97463,-50.02583 29.6,-79.4 2.1,-14.4 4.1,-27.9 8.2,-38 10.93682,-25.24235 34.00537,-41.62692 48,-61.9 7,-10 15.2,-19 22.4,-30 6.3,-9.8 11.4,-21.9 12.5,-36.5 L 478,205.05 c 6.10027,-5.47056 15.90728,-4.81606 22.5,-5.35 15.21192,-2.7506 26.29614,-6.32491 34.2,-18.8 4.2212,-7.56556 5.06428,-15.85006 1.3,-23.3 -7.08036,-12.4997 -22.22771,-17.94202 -34,-21.7 -5.23663,-12.65014 -13.15142,-14.73244 -22.15,-16.25 -9.06799,0.14304 -16.48337,5.28027 -22.05,10.65 z m 21.7,2.6 c 4.4,-0.3 8.3,3.2 11,13.3 13.3,3 48.8,13.7 25.9,32 -14,11.4 -34.6,0.9 -49,15.8 l -26.3,12.6 c -3,0.4 -9,3 -15.1,4.2 -0.9,-6.2 -2.3,-12.2 -3.9,-18.2 -4.5,1.8 -10,3.4 -14.6,4.2 1.7,-8.4 3.6,-14.8 7.9,-21 l 28.8,-12.3 c 9.4,-4.1 24,-29.8 35,-30.6 z M 229.7,301.3 c 36.9149,27.65951 67.17676,73.72982 77.5,114.9 3.89522,19.15218 4.53861,40.49497 -2.6,57.5 -10.79991,20.8403 -29.25536,22.73742 -49.2,22.8 -44.5,-0.1 -94,-19.3 -132,-49 C 85,418 56,377 56,333 c 0,-14.3 3.1,-29 9.8,-43 17.521468,-23.01358 35.56555,-24.08307 57.1,-24.6 35.46574,3.53999 79.05373,17.68401 106.8,35.9 z M 168,338.6 c 7.13792,6.80786 13.80764,16.2447 14.1,25.3 -1.98563,11.37136 -8.88713,15.84682 -19,15.9 -15.82538,0.2563 -28.58537,-7.53777 -41.2,-16.5 -3.3,-2.9 -6.5,-8 -6.6,-14 0.33384,-6.86263 4.84875,-11.73317 10.3,-14.5 5.3,-2.6 11.5,-3.8 19,-3.8 7.5,0 16.6,1.9 23.4,7.6 z m -34.2,6.7 c -7.09011,2.05129 -4.6824,6.85146 -1.6,9.9 9.56447,5.67652 20.23845,11.55267 31,11.7 6.73073,-0.48095 5.2172,-7.05881 2.6,-11 -4.65045,-7.46091 -12.78077,-11.88547 -20.9,-12 -5,0 -8.4,0.6 -11.1,1.4 z" id="path3" fill="#ac39ac"/>
+ <path d="m 110.9,449 c 40.20445,29.48953 70.54686,37.66867 117,51.3 43.75755,4.0099 64.6846,3.52299 85.9,-32.2 -2.89971,-138.18259 -69.31764,-206.73222 -200.7,-215.3 -70.683095,24.86414 -67.278751,55.86057 -60.6,114.5 11.336816,33.82499 30.500184,50.38 58.4,81.7 z" id="path6439" opacity="0.1" fill="#ac39ac" fill-rule="evenodd"/>
+ <path d="m 473,126.1 c 25.72881,12.71875 64.93028,33.82998 53.7,47 -31.73705,22.10932 -70.86577,34.20499 -96.1,51.3 -53.6318,-4.85215 -53.88329,-2.05545 -33.8,-50.1 34.95936,-11.60252 49.11338,-24.9829 76.2,-48.2 z" id="path6441" opacity="0.1" fill="#ac39ac" fill-rule="evenodd"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/car_repair.svg b/vtm-themes/resources/assets/symbols/shopping/car_repair.svg
old mode 100755
new mode 100644
index e3ec71d2..36cdf6ea
--- a/vtm-themes/resources/assets/symbols/shopping/car_repair.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/car_repair.svg
@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <defs id="defs4">
-  <clipPath id="clipoutline2">
-   <path d="M 55.8,12 L 56.56,12.16 C 65.4,9.22 85.24,20.8 80.82,31.12 C 79.7,32.74 79.89,35.62 81.24,37.43 L 56.43,62.25 C 55.04,60.86 51.95,60.89 50.53,62.25 L 9.5,101.63 C 5.76,105.22 8.7,108.27 10.28,109.88 L 17.64,117.24 C 19.25,118.84 23.5,121 26.52,117.8 L 65.24,76.99 C 66.59,75.57 66.6,72.52 65.24,71.12 C 65.24,71.12 65.25,71.1 65.24,71.1 L 90.15,46.2 C 92.78,48.57 95.263827,48.774854 97.62,48.13 C 102.17057,46.884568 104.70725,51.336643 107.43,54.59 L 106.2,55.8 C 104.38,57.64 104.55,60.74 106.59,62.78 C 108.63,64.82 111.74,64.99 113.56,63.17 L 121.7,55.04 C 123.52,53.2 123.35,50.1 121.3,48.07 C 119.46,46.22 116.79,45.98 114.93,47.3 C 109.35,41.04 112.28,40.1 104.92,31.95 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2"/>
-  </clipPath>
-  <clipPath id="clipoutline1">
-   <path d="M 22.42,17.2 L 35.38,30.15 L 32.88,38.93 L 24.1,41.43 L 11.14,28.47 L 5.28,34.33 L 20.17,55.79 L 37.73,52.45 L 99.36,118.07 C 108.8,127.58 121.53,113.32 112.7,105.2 L 46.85,42.92 L 50.86,25.16 L 28.72,10.89 L 22.42,17.2 z M 103.48,109.17 C 105.16,107.49 107.88,107.49 109.56,109.17 C 111.24,110.85 111.24,113.57 109.56,115.25 C 107.88,116.92 105.16,116.92 103.48,115.25 C 101.8,113.57 101.8,110.85 103.48,109.17 z" id="outline1"/>
-  </clipPath>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#AC39AC" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 141.14967,158.36231 C 119.80221,158.36231 108.47786,170.01662 103.24986,183.65843 L 75.498084,255.31598 C 64.496777,256.72664 44.994807,269.64014 44.994807,294.10338 L 44.994807,385.22859 L 72.006925,385.22859 L 72.006925,414.37092 C 72.006925,450.22454 122.7471,449.80228 122.74711,414.37092 L 122.74711,385.22859 L 214.02027,385.22859 L 214.0499,385.22859 L 305.32301,385.22859 L 305.32301,414.37092 C 305.32301,449.80228 356.06294,450.22454 356.06323,414.37092 L 356.06323,385.22859 L 383.0753,385.22859 L 383.0753,294.10338 C 383.0753,269.64016 363.57346,256.72664 352.57197,255.31598 L 324.79067,183.65843 C 319.56268,170.01662 308.23843,158.36231 286.89082,158.36231 L 247.65972,158.36231 L 180.85418,158.36231 L 141.14967,158.36231 z M 140.82422,184.45726 L 213.9611,184.45726 L 214.02027,184.45726 L 214.0499,184.45726 L 287.21631,184.45726 C 296.36479,184.54244 300.28296,190.26369 302.89693,198.1852 L 323.81428,254.57634 L 214.0499,254.57634 L 214.02027,254.57634 L 213.9611,254.57634 L 104.22621,254.57634 L 125.14358,198.1852 C 127.75759,190.26369 131.67476,184.54244 140.82422,184.45726 z M 98.190635,282.00266 C 111.13564,282.00266 121.62284,292.80323 121.62284,306.14492 C 121.62283,319.48756 111.13564,330.31678 98.190635,330.31678 C 85.246593,330.31678 74.758433,319.48754 74.758433,306.14492 C 74.758433,292.80326 85.246593,282.00266 98.190635,282.00266 z M 329.87947,282.00266 C 342.82447,282.00266 353.31176,292.80326 353.31167,306.14492 C 353.31167,319.48754 342.82447,330.31678 329.87947,330.31678 C 316.93544,330.31678 306.41763,319.48756 306.41763,306.14492 C 306.41763,292.80323 316.93544,282.00266 329.87947,282.00266 z" id="path2301" fill="#ffffff"/>
- <g id="spanner" transform="matrix(-1.9177282,-1.988248,1.988248,-1.9177282,460.24478,551.21965)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="2.347">
-  <use height="580" width="580" xlink:href="#outline1" id="use4649" stroke-width="2.347"/>
-  <use height="580" width="580" xlink:href="#outline1" id="use4651" stroke-width="2.347"/>
-  <use height="580" width="580" xlink:href="#outline1" id="use4653" stroke-width="2.347"/>
-  <use height="580" width="580" xlink:href="#outline1" clip-path="url(#clipoutline1)" id="use4655" stroke-width="2.347"/>
-  <path d="M 24.33,15.4 L 37.78,28.78 L 34.45,40.47 L 23.5,43.74 L 9.9319417,30 L 5.2,34.54 L 19.4,54.48 L 38.3,50.34 L 100.8,116.7 C 108.3,125 121,114.03 111.94,105.1 L 45.04,42 L 48.9,24.83 L 28.94,10.8 L 24.33,15.4 z M 104.3,108.7 C 105.97,107.03 108.93,106.7 110.6,108.4 C 112.3,110.07 113.66,113.03 111.25,116.24 C 109.25,118.24 106.05,118.16 104.05,116 C 102.37,114.32 102.6,110.4 104.3,108.7 z" id="path4657" stroke-width="2.347"/>
-  <path d="M 24.2,15.42 L 47.67,39.07 L 50.89,25.2 L 28.79,10.8 L 24.2,15.42 z" id="path4659" stroke-width="2.347"/>
- </g>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4137" d="m 459.1,103.5 c -5.4,4.9 -8.9,12.4 -8.75,16.95 l 5.45,253.55 -43,26.8 15.9,76 30.5,0.1 c 0,-3.1 0.3,-39.8 0.4,-52 l 18.9,-10.4 18.7,10.6 -0.4,52 28.8,0.2 14.2,-76 -40.9,-28 9.45,-252 c 0.05,-5 -3.55,-12.9 -9.15,-17.9 -5.6,-5.1 -12.9,-7.4 -20.1,-7.35 -7.3,0.05 -14.5,2.55 -20,7.45 z m 29.3,20.1 c 0,4.8 -3.9,8.6 -8.7,8.6 -4.8,0 -8.6,-3.9 -8.6,-8.7 0,-4.8 3.9,-8.6 8.7,-8.6 4.8,0 8.6,3.9 8.6,8.7 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4139" d="m 103,184 -27,71 c -11,2 -31,15 -31,39 l 0,91 27,0 0,29 c 0,36 51,36 51,0 l 0,-29 182,0 0,29 c 0,36 51,36 51,0 l 0,-29 27,0 0,-91 c 0,-24 -19,-37 -30,-39 l -28,-71 c -5,-14 -17,-26 -38,-26 -48.66667,0 -97.33333,0 -146,0 -21,0 -32,12 -38,26 z m 184,1 c 9,0 13,5 16,13 l 21,57 -220,0 21,-57 c 3,-8 7,-13 16,-13 48.66667,0 97.33333,0 146,0 z M 122,306 c 0,14 -11,24 -24,24 -13,0 -23,-10 -23,-24 0,-13 10,-24 23,-24 13,0 24,11 24,24 z m 231,0 c 0,14 -10,24 -23,24 -13,0 -24,-10 -24,-24 0,-13 11,-24 24,-24 13,0 23,11 23,24 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 459.1,103.5 c -5.4,4.9 -8.9,12.4 -8.75,16.95 l 5.45,253.55 -43,26.8 15.9,76 30.5,0.1 c 0,-3.1 0.3,-39.8 0.4,-52 l 18.9,-10.4 18.7,10.6 -0.4,52 28.8,0.2 14.2,-76 -40.9,-28 9.45,-252 c 0.05,-5 -3.55,-12.9 -9.15,-17.9 -5.6,-5.1 -12.9,-7.4 -20.1,-7.35 -7.3,0.05 -14.5,2.55 -20,7.45 z m 29.3,20.1 c 0,4.8 -3.9,8.6 -8.7,8.6 -4.8,0 -8.6,-3.9 -8.6,-8.7 0,-4.8 3.9,-8.6 8.7,-8.6 4.8,0 8.6,3.9 8.6,8.7 z" id="path2303" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 103,184 -27,71 c -11,2 -31,15 -31,39 l 0,91 27,0 0,29 c 0,36 51,36 51,0 l 0,-29 182,0 0,29 c 0,36 51,36 51,0 l 0,-29 27,0 0,-91 c 0,-24 -19,-37 -30,-39 l -28,-71 c -5,-14 -17,-26 -38,-26 -48.66667,0 -97.33333,0 -146,0 -21,0 -32,12 -38,26 z m 184,1 c 9,0 13,5 16,13 l 21,57 -220,0 21,-57 c 3,-8 7,-13 16,-13 48.66667,0 97.33333,0 146,0 z M 122,306 c 0,14 -11,24 -24,24 -13,0 -23,-10 -23,-24 0,-13 10,-24 23,-24 13,0 24,11 24,24 z m 231,0 c 0,14 -10,24 -23,24 -13,0 -24,-10 -24,-24 0,-13 11,-24 24,-24 13,0 23,11 23,24 z" id="path2301" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/convenience.svg b/vtm-themes/resources/assets/symbols/shopping/convenience.svg
old mode 100755
new mode 100644
index 0c23d830..56ffedc0
--- a/vtm-themes/resources/assets/symbols/shopping/convenience.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/convenience.svg
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g10747" transform="translate(32,66)">
-  <path sodipodi:nodetypes="ccccc" id="path3264" d="M 477.06925,164.57688 L 48.196494,164.57688 L 97.86424,376.40271 L 427.39502,374.94461 L 477.06925,164.57688 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.17"/>
-  <path sodipodi:nodetypes="cc" d="M 128.06871,165.73536 L 128.06871,363.20709" id="path3268" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
-  <path id="path3280" d="M 86.424707,243.00115 L 445.19209,243.00115" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
-  <path sodipodi:nodetypes="cc" id="path3318" d="M 215.1525,165.73536 L 215.1525,363.25095" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
-  <path sodipodi:nodetypes="cc" d="M 306.2363,165.73536 L 306.2363,372.15933" id="path3320" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
-  <path sodipodi:nodetypes="cc" id="path3322" d="M 395.3201,165.73536 L 395.3201,373.5219" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
-  <path sodipodi:nodetypes="cc" d="M 104.24147,322.08495 L 427.37533,322.08495" id="path3324" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
- </g>
- <path d="M 287.11282,222.95322 L 340.84305,78.558998 L 356.51268,84.389791 L 302.02568,230.81774 L 287.11282,222.95322 z" id="path10756" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+ <path id="path4167" d="M 341 68.900391 C 332 68.800391 329 82 324 95 C 309 135 294 177 278 217 C 211 217 143 216 76 217 C 61 221 66 237 69 248 C 85 314 100 380 115 446 C 120 462 138 456 150 457 C 253 456 355 456 458 455 C 474 454 473 435 477 424 C 492 360 508 296 522 231 C 522 215 504 216 493 217 L 316 217 L 364 88 C 365.97105 75.461417 361.87766 74.539031 341 68.900391 z M 98 245 L 151 245 L 151 300 C 139 300 128 301 111 301 C 98 245 108 289 98 245 z M 170 245 L 238 245 L 238 300 L 170 300 L 170 245 z M 257 245 L 329 245 L 329 300 L 257 300 L 257 245 z M 348 245 L 418 245 L 418 300 L 348 300 L 348 245 z M 437 245 L 492 245 C 487 263 483 282 479 300 L 437 300 L 437 245 z M 115 318 C 127.5638 318.20964 140.30551 318.14167 151 319 L 151 379 C 144 378 137 378 130 378 C 125 359 128 371 115 318 z M 169 319 L 237 319 L 237 379 L 169 379 L 169 319 z M 256 319 L 328 319 L 328 379 L 256 379 L 256 319 z M 347 319 L 417 319 L 417 379 L 347 379 L 347 319 z M 436 319 L 473 319 C 468 339 464 359 459 379 L 436 379 L 436 319 z M 133 398 L 150 398 L 150 429 C 140 428 139 430 138 425 C 136 418 134 404 133 398 z M 169 398 L 237 398 L 237 428 L 169 428 L 169 398 z M 256 398 L 328 398 L 328 428 L 256 428 L 256 398 z M 347 398 L 417 398 L 417 428 L 347 428 L 347 398 z M 436 398 L 455 398 C 452 406 449 419 447 427 C 431 427 436 436 436 398 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 341 68.900391 C 332 68.800391 329 82 324 95 C 309 135 294 177 278 217 C 211 217 143 216 76 217 C 61 221 66 237 69 248 C 85 314 100 380 115 446 C 120 462 138 456 150 457 C 253 456 355 456 458 455 C 474 454 473 435 477 424 C 492 360 508 296 522 231 C 522 215 504 216 493 217 L 316 217 L 364 88 C 365.97105 75.461417 361.87766 74.539031 341 68.900391 z M 98 245 L 151 245 L 151 300 C 139 300 128 301 111 301 C 98 245 108 289 98 245 z M 170 245 L 238 245 L 238 300 L 170 300 L 170 245 z M 257 245 L 329 245 L 329 300 L 257 300 L 257 245 z M 348 245 L 418 245 L 418 300 L 348 300 L 348 245 z M 437 245 L 492 245 C 487 263 483 282 479 300 L 437 300 L 437 245 z M 115 318 C 127.5638 318.20964 140.30551 318.14167 151 319 L 151 379 C 144 378 137 378 130 378 C 125 359 128 371 115 318 z M 169 319 L 237 319 L 237 379 L 169 379 L 169 319 z M 256 319 L 328 319 L 328 379 L 256 379 L 256 319 z M 347 319 L 417 319 L 417 379 L 347 379 L 347 319 z M 436 319 L 473 319 C 468 339 464 359 459 379 L 436 379 L 436 319 z M 133 398 L 150 398 L 150 429 C 140 428 139 430 138 425 C 136 418 134 404 133 398 z M 169 398 L 237 398 L 237 428 L 169 428 L 169 398 z M 256 398 L 328 398 L 328 428 L 256 428 L 256 398 z M 347 398 L 417 398 L 417 428 L 347 428 L 347 398 z M 436 398 L 455 398 C 452 406 449 419 447 427 C 431 427 436 436 436 398 z " id="path4164" mix-blend-mode="normal" solid-color="#000000" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="#ac39ac" filter-blend-mode="normal" shape-rendering="auto"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/diy.svg b/vtm-themes/resources/assets/symbols/shopping/diy.svg
old mode 100755
new mode 100644
index d0daad03..bdc0cfe9
--- a/vtm-themes/resources/assets/symbols/shopping/diy.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/diy.svg
@@ -1,129 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r="0.8" id="circle4300"/>
-    <circle cx="6.5" r="0.8" id="circle4302"/>
-    <circle cx="10" r="0.8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity="0.75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-            <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width="0.125"/></marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <filter y="0" x="0" filterUnits="userSpaceOnUse" id="ShadowBlur">
-   <feGaussianBlur id="feGaussianBlur6" stdDeviation="2" in="SourceGraphic"/>
-  </filter>
-  <clipPath id="clipoutline2">
-   <path d="M 55.8,12 L 56.56,12.16 C 65.4,9.22 85.24,20.8 80.82,31.12 C 79.7,32.74 79.89,35.62 81.24,37.43 L 56.43,62.25 C 55.04,60.86 51.95,60.89 50.53,62.25 L 9.5,101.63 C 5.76,105.22 8.7,108.27 10.28,109.88 L 17.64,117.24 C 19.25,118.84 23.5,121 26.52,117.8 L 65.24,76.99 C 66.59,75.57 66.6,72.52 65.24,71.12 C 65.24,71.12 65.25,71.1 65.24,71.1 L 90.15,46.2 C 92.78,48.57 95.263827,48.774854 97.62,48.13 C 102.17057,46.884568 104.70725,51.336643 107.43,54.59 L 106.2,55.8 C 104.38,57.64 104.55,60.74 106.59,62.78 C 108.63,64.82 111.74,64.99 113.56,63.17 L 121.7,55.04 C 123.52,53.2 123.35,50.1 121.3,48.07 C 119.46,46.22 116.79,45.98 114.93,47.3 C 109.35,41.04 112.28,40.1 104.92,31.95 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2"/>
-  </clipPath>
-  <clipPath id="clipoutline1">
-   <path d="M 22.42,17.2 L 35.38,30.15 L 32.88,38.93 L 24.1,41.43 L 11.14,28.47 L 5.28,34.33 L 20.17,55.79 L 37.73,52.45 L 99.36,118.07 C 108.8,127.58 121.53,113.32 112.7,105.2 L 46.85,42.92 L 50.86,25.16 L 28.72,10.89 L 22.42,17.2 z M 103.48,109.17 C 105.16,107.49 107.88,107.49 109.56,109.17 C 111.24,110.85 111.24,113.57 109.56,115.25 C 107.88,116.92 105.16,116.92 103.48,115.25 C 101.8,113.57 101.8,110.85 103.48,109.17 z" id="outline1"/>
-  </clipPath>
-  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.30267,-3.20138)" y2="86.68" x2="84.3" y1="66.2" x1="73.88" id="lgdg" xlink:href="#BlackTransparent"/>
-  <linearGradient gradientTransform="matrix(0.26,0,0,0.26,-106.57,101.57)" gradientUnits="userSpaceOnUse" y2="-241.2" x2="655.42" y1="-137.5" x1="550.96" id="lg55" xlink:href="#WhiteTransparent"/>
-  <linearGradient gradientTransform="matrix(0.2,0,0,0.2,-80.94,88.3)" gradientUnits="userSpaceOnUse" y2="-186.26" x2="607.66" y1="-252.6" x1="646.24" id="lg51" xlink:href="#WhiteTransparent"/>
-  <linearGradient y2="6037.53" x2="2375.5" y1="6145.31" x1="2482.96" id="lg19" xlink:href="#BlackTransparent" gradientUnits="userSpaceOnUse"/>
-  <linearGradient gradientTransform="matrix(7.75e-2,7.75e-2,-0.36,0.36,78.84,-44.8)" gradientUnits="userSpaceOnUse" x2="626.1" x1="577.03" id="lg16" xlink:href="#WhiteTransparent"/>
-  <linearGradient gradientTransform="matrix(0.3,0.3,-9e-2,9e-2,78.84,-44.8)" gradientUnits="userSpaceOnUse" y2="368.27" x2="0" y1="288.57" id="lg12" xlink:href="#WhiteTransparent"/>
-  <linearGradient gradientTransform="matrix(0.33,0.33,-9.44e-2,9.44e-2,9.03,-48.1)" gradientUnits="userSpaceOnUse" y2="-1.72" x2="0" y1="62.74" id="lg09" xlink:href="#WhiteTransparent"/>
-  <linearGradient gradientTransform="matrix(9.98e-2,9.98e-2,-0.28,0.28,78.84,-44.8)" gradientUnits="userSpaceOnUse" x2="419.88" x1="543.1" id="lg05" xlink:href="#BlackTransparent"/>
-  <linearGradient gradientTransform="matrix(8.07e-2,7.75e-2,-0.35,0.36,77.14,-45.89)" gradientUnits="userSpaceOnUse" y2="254.83" x2="615.59" y1="254.36" x1="512.7" id="lg02" xlink:href="#WhiteTransparent"/>
-  <linearGradient gradientTransform="matrix(0.1,0.1,-0.22,0.2,75.6,-33.53)" gradientUnits="userSpaceOnUse" y2="118.3" x2="638.3" y1="69.99" x1="637.03" id="lg1999" xlink:href="#WhiteTransparent"/>
-  <linearGradient id="BlackTransparent">
-   <stop id="stop4625"/>
-   <stop id="stop4627" offset="1" stop-opacity="0"/>
-  </linearGradient>
-  <linearGradient id="WhiteTransparent">
-   <stop id="stop4620" stop-color="#ffffff"/>
-   <stop id="stop4622" offset="1" stop-color="#ffffff" stop-opacity="0"/>
-  </linearGradient>
-  <linearGradient inkscape:collect="always" xlink:href="#BlackTransparent" id="linearGradient4756" gradientUnits="userSpaceOnUse" gradientTransform="matrix(5.1645214,0,0,5.1645214,646.72889,-106.63978)" x1="73.88" y1="66.2" x2="84.3" y2="86.68"/>
-  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4780" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5164521,0.5164521,-1.1361947,1.0329043,1038.7299,-263.27259)" x1="637.03" y1="69.99" x2="638.3" y2="118.3"/>
-  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4784" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.4167769,0.4002504,-1.8075825,1.8592277,1046.6832,-327.10608)" x1="512.7" y1="254.36" x2="615.59" y2="254.83"/>
-  <linearGradient inkscape:collect="always" xlink:href="#BlackTransparent" id="linearGradient4787" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5154192,0.5154192,-1.446066,1.446066,1055.4629,-321.47675)" x1="543.1" x2="419.88"/>
-  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4791" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7042921,1.7042921,-0.4875308,0.4875308,694.92767,-338.51967)" y1="62.74" x2="0" y2="-1.72"/>
-  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4794" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5493564,1.5493564,-0.4648069,0.4648069,1055.4629,-321.47675)" y1="288.57" x2="0" y2="368.27"/>
-  <linearGradient inkscape:collect="always" xlink:href="#WhiteTransparent" id="linearGradient4798" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.4002504,0.4002504,-1.8592277,1.8592277,1055.4629,-321.47675)" x1="577.03" x2="626.1"/>
-  <linearGradient inkscape:collect="always" xlink:href="#BlackTransparent" id="linearGradient4801" gradientUnits="userSpaceOnUse" x1="2482.96" y1="6145.31" x2="2375.5" y2="6037.53" gradientTransform="matrix(5.1645214,0,0,5.1645214,648.29204,-90.106189)"/>
-  <clipPath id="clipoutline2-1">
-   <path d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="outline2-7"/>
-  </clipPath>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" stroke-width="3.408" stroke="#eee" fill="#ac39ac"/>
- </g>
- <g id="spanner" transform="matrix(-2.39037,-2.47827,2.47827,-2.39037,402.26708,618.45764)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="2.347">
-  <use height="580" width="580" xlink:href="#outline1" id="use4649"/>
-  <use height="580" width="580" xlink:href="#outline1" id="use4651"/>
-  <use height="580" width="580" xlink:href="#outline1" id="use4653"/>
-  <use height="580" width="580" xlink:href="#outline1" clip-path="url(#clipoutline1)" id="use4655"/>
-  <path d="M 24.33,15.4 L 37.78,28.78 L 34.45,40.47 L 23.5,43.74 L 9.9319417,30 L 5.2,34.54 L 19.4,54.48 L 38.3,50.34 L 100.8,116.7 C 108.3,125 121,114.03 111.94,105.1 L 45.04,42 L 48.9,24.83 L 28.94,10.8 L 24.33,15.4 z M 104.3,108.7 C 105.97,107.03 108.93,106.7 110.6,108.4 C 112.3,110.07 113.66,113.03 111.25,116.24 C 109.25,118.24 106.05,118.16 104.05,116 C 102.37,114.32 102.6,110.4 104.3,108.7 z" id="path4657"/>
-  <path d="M 24.2,15.42 L 47.67,39.07 L 50.89,25.2 L 28.79,10.8 L 24.2,15.42 z" id="path4659"/>
- </g>
- <g id="hammer" transform="matrix(2.5848118,-2.5382215,2.5382215,2.5848118,-128.23765,257.86414)" fill="#ffffff" stroke="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="2.347">
-  <path d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z" id="path5678" inkscape:connector-curvature="0" stroke-width="2.347"/>
- </g>
+ <path id="path4144" d="m 180,48.75 c -55,0.1 -97,41.09961 -116,81.09961 39,-32 104,-55 123,-15 1.3,7.7 9.79961,15.19961 18.59961,16.59961 l -1.19922,138 c -7.7,-0.1 -16.29961,8.50078 -16.59961,16.30078 L 182,509.84961 c -0.6,20.4 16,20.9 25,21 l 41,0.40039 c 8.9,0 26.8,-5.60039 26.5,-22.90039 l -3.80078,-222 c -0.1,-7.7 -8.49844,-16.29922 -12.39844,-16.44922 L 255.69922,130.75 c 13.9,-0.6 21.50078,-6.90117 26.30078,-15.20117 9.4,-16 28.8,-10.49844 45,-8.89844 l -0.0996,6.79883 c 0,10.2 9.00039,18.4 20.40039,18.5 11.4,0.1 20.59922,-8 20.69922,-18 l 0.40039,-45 c -0.4,-10.2 -9.40039,-18.5 -20.40039,-18.5 C 338,50.84922 329,56.84961 328,65.84961 c -33,-2.2 -27,-13 -71,-15 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4146" d="M 441 57.548828 C 432.04778 57.448798 423.20006 60.799559 416.5 66.849609 C 409.79994 72.899659 405.66316 82.04537 405.90039 93.25 L 412.40039 400.25 L 359.40039 433.25 L 379 527.25 L 416.5 527.44922 L 417 463.44922 L 440.30078 450.65039 L 463.30078 463.65039 L 462.90039 527.65039 L 498.40039 527.94922 L 516 434.94922 L 466 400.04883 L 477.80078 89.449219 C 478.05147 82.850949 473.09976 72.735901 466 66.650391 C 459.09786 60.734271 449.95222 57.648848 441 57.548828 z M 441.69922 80.548828 C 447.59943 80.598828 452.19922 85.35 452.19922 91.25 C 452.19922 97.25 447.45021 101.89961 441.5 101.84961 C 435.54979 101.79961 430.95 97.050601 431 91.150391 C 431.05 85.250181 435.79901 80.498818 441.69922 80.548828 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 180,48.75 c -55,0.1 -97,41.09961 -116,81.09961 39,-32 104,-55 123,-15 1.3,7.7 9.79961,15.19961 18.59961,16.59961 l -1.19922,138 c -7.7,-0.1 -16.29961,8.50078 -16.59961,16.30078 L 182,509.84961 c -0.6,20.4 16,20.9 25,21 l 41,0.40039 c 8.9,0 26.8,-5.60039 26.5,-22.90039 l -3.80078,-222 c -0.1,-7.7 -8.49844,-16.29922 -12.39844,-16.44922 L 255.69922,130.75 c 13.9,-0.6 21.50078,-6.90117 26.30078,-15.20117 9.4,-16 28.8,-10.49844 45,-8.89844 l -0.0996,6.79883 c 0,10.2 9.00039,18.4 20.40039,18.5 11.4,0.1 20.59922,-8 20.69922,-18 l 0.40039,-45 c -0.4,-10.2 -9.40039,-18.5 -20.40039,-18.5 C 338,50.84922 329,56.84961 328,65.84961 c -33,-2.2 -27,-13 -71,-15 z" id="path4138" fill="#ac39ac"/>
+ <path d="M 441 57.548828 C 432.04778 57.448798 423.20006 60.799559 416.5 66.849609 C 409.79994 72.899659 405.66316 82.04537 405.90039 93.25 L 412.40039 400.25 L 359.40039 433.25 L 379 527.25 L 416.5 527.44922 L 417 463.44922 L 440.30078 450.65039 L 463.30078 463.65039 L 462.90039 527.65039 L 498.40039 527.94922 L 516 434.94922 L 466 400.04883 L 477.80078 89.449219 C 478.05147 82.850949 473.09976 72.735901 466 66.650391 C 459.09786 60.734271 449.95222 57.648848 441 57.548828 z M 441.69922 80.548828 C 447.59943 80.598828 452.19922 85.35 452.19922 91.25 C 452.19922 97.25 447.45021 101.89961 441.5 101.84961 C 435.54979 101.79961 430.95 97.050601 431 91.150391 C 431.05 85.250181 435.79901 80.498818 441.69922 80.548828 z " id="path4136" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/greengrocer.svg b/vtm-themes/resources/assets/symbols/shopping/greengrocer.svg
old mode 100755
new mode 100644
index 141100df..e2e06a32
--- a/vtm-themes/resources/assets/symbols/shopping/greengrocer.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/greengrocer.svg
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.79354273,1.2601716)" xlink:href="#linearGradient829" id="radialGradient874" cx="180.25" cy="198.42" r="101.58"/>
-  <linearGradient id="linearGradient829">
-   <stop id="stop830" stop-color="#ffffff" stop-opacity=".342"/>
-   <stop offset="1" id="stop831" stop-color="#ffffff" stop-opacity="0"/>
-  </linearGradient>
-  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.007004,0.99304475)" xlink:href="#linearGradient829" id="radialGradient832" cx="360.85" cy="167.47" r="46.39"/>
-  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.74491357,1.3424376)" xlink:href="#linearGradient855" id="linearGradient850" x1="465.29" y1="248.24" x2="463.27" y2="405.77"/>
-  <linearGradient id="linearGradient855">
-   <stop id="stop856" stop-color="#ffffff" stop-opacity="0"/>
-   <stop offset="1" id="stop857" stop-color="#ffa617" stop-opacity=".733"/>
-  </linearGradient>
-  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.4586159,0.68558144)" xlink:href="#linearGradient855" id="linearGradient854" x1="157.81" y1="120.96" x2="155.41" y2="231.63"/>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g8499">
-  <path d="M 472.00214,95.129535 C 472.00214,95.129535 434.20859,223.21789 323.16094,185.0368 C 323.14167,185.11689 336.56042,73.44468 472.00214,95.129535 z" id="path6571" fill="#ffffff"/>
-  <path d="M 285.86201,253.57666 C 305.05175,234.59325 331.25716,223.1413 360.3512,223.1413 C 419.05538,223.1413 466.82345,270.703 466.82345,329.5103 C 466.82345,331.67689 466.82345,333.53396 466.72029,335.80372 H 466.51397 C 464.65689,358.81079 457.33177,387.38908 439.999,422.87982 C 439.999,422.87982 410.18268,479.93322 386.24705,506.13857 L 384.08049,508.202 C 372.5254,519.8603 356.2244,527.18541 338.58229,527.18541 C 316.91638,527.18541 297.72663,516.66199 286.06834,500.36102 H 285.75883 C 274.10053,516.66199 254.91079,527.18541 233.24494,527.18541 C 215.3964,527.18541 199.30176,519.96345 187.64347,508.202 L 185.4769,506.13857 C 161.74763,479.93322 131.72495,422.87982 131.72495,422.87982 C 114.39227,387.38908 107.06715,358.60446 105.41641,335.80372 H 104.90056 C 104.59105,333.63715 104.59105,331.78007 104.59105,329.5103 C 104.59105,270.703 152.3591,223.1413 211.26957,223.1413 C 240.26053,223.1413 266.46591,234.59325 285.86201,253.57666" id="path6573" fill="#ffffff"/>
-  <path id="path10957" d="M 128.25883,55.38435 C 128.25883,55.38435 150.71409,167.29081 248.14354,143.21279 C 248.15388,143.28245 245.20296,47.199967 128.25883,55.38435 z" fill="#ffffff"/>
-  <path id="path10959" d="M 282.75941,231.04959 C 282.75941,231.04959 281.6773,116.14689 269.774,86.172268 C 257.8707,56.197648 309.81236,86.172268 309.81236,86.172268 L 282.75941,231.04959 z" fill="#ffffff" stroke="#ffffff" stroke-width="4.836"/>
- </g>
+ <path id="path4136" d="m 128,55 c 0,0 23,112 120,88 0,0 -2,-87 -104,-88.1 -5,0 -10,0.1 -16,0.1 z m 142,16 c -6.02,3.904252 -4.21986,11.512733 -2,16 6.84702,27.71608 8.30642,55.87911 10,83 2,32 2,61 2,61 l 5,1 27,-147.5 c 0,0 -14,-7.5 -26,-11.5 -5.37432,-2.555812 -10.58043,-3.006197 -16,-2 z m 53,114 C 434,223 472,95 472,95 459,93 448,92 437,92 334,93 323,185 323,185 Z M 106,315 c 1,44 8,72 26,108 0,0 30,57 48.5,77 18.5,20 34.5,27 52.5,27 22,0 47,-18.5 53,-18.5 6,0 31,18.5 53,18.5 17,0 34,-7 52.5,-27 18.5,-20 48.5,-77 48.5,-77 17,-36 25,-64 26,-108 1,-44 -47,-92 -106,-92 -29,0 -55,12 -74,31 -19,-19 -46,-31 -75,-31 -59,0 -106,48 -105,92 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 128,55 c 0,0 23,112 120,88 0,0 -2,-87 -104,-88.1 -5,0 -10,0.1 -16,0.1 z m 142,16 c -6.02,3.904252 -4.21986,11.512733 -2,16 6.84702,27.71608 8.30642,55.87911 10,83 2,32 2,61 2,61 l 5,1 27,-147.5 c 0,0 -14,-7.5 -26,-11.5 -5.37432,-2.555812 -10.58043,-3.006197 -16,-2 z m 53,114 C 434,223 472,95 472,95 459,93 448,92 437,92 334,93 323,185 323,185 Z M 106,315 c 1,44 8,72 26,108 0,0 30,57 48.5,77 18.5,20 34.5,27 52.5,27 22,0 47,-18.5 53,-18.5 6,0 31,18.5 53,18.5 17,0 34,-7 52.5,-27 18.5,-20 48.5,-77 48.5,-77 17,-36 25,-64 26,-108 1,-44 -47,-92 -106,-92 -29,0 -55,12 -74,31 -19,-19 -46,-31 -75,-31 -59,0 -106,48 -105,92 z" id="path6571" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/laundrette.svg b/vtm-themes/resources/assets/symbols/shopping/laundrette.svg
old mode 100755
new mode 100644
index 019ad675..e4cf7319
--- a/vtm-themes/resources/assets/symbols/shopping/laundrette.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/laundrette.svg
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 82.4375 65.40625 L 82.4375 520.375 L 494.21875 520.375 L 494.21875 65.40625 L 82.4375 65.40625 z M 286 198.09375 C 341.22173 198.09375 386.03125 242.93453 386.03125 298.15625 C 386.03124 353.37798 341.22172 398.1875 286 398.1875 C 230.77828 398.1875 185.9375 353.37797 185.9375 298.15625 C 185.9375 242.93453 230.77828 198.09375 286 198.09375 z " id="rect7039" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.955"/>
- <g id="g7055" transform="matrix(1.0477726,0,0,1.0477726,-9.5831747,-13.991926)">
-  <path transform="translate(4.3399146,21.699573)" d="m 373.23267,276.20596 c 0,52.73111 -42.74701,95.47812 -95.47812,95.47812 -52.73111,0 -95.47812,-42.74701 -95.47812,-95.47812 0,-52.73111 42.74701,-95.47812 95.47812,-95.47812 52.73111,0 95.47812,42.74701 95.47812,95.47812 z" sodipodi:ry="95.478119" sodipodi:rx="95.478119" sodipodi:cy="276.20596" sodipodi:cx="277.75455" id="path7043" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
-  <path sodipodi:nodetypes="cc" id="path7045" d="M 190.78628,250.19634 L 190.78628,349.95467" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.665"/>
-  <path id="path7047" d="M 370.09478,300.0755 L 350.20059,300.0755" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="39.801"/>
- </g>
- <path sodipodi:type="arc" id="path7049" sodipodi:cx="340.68329" sodipodi:cy="124.30897" sodipodi:rx="10.849787" sodipodi:ry="10.849787" d="M 351.53308,124.30897 A 10.849787,10.849787 0 1 1 329.8335,124.30897 A 10.849787,10.849787 0 1 1 351.53308,124.30897 z" transform="matrix(0.853028,0,0,0.853028,92.865028,12.025478)" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
- <path transform="matrix(0.853028,0,0,0.853028,150.14226,12.025478)" d="M 351.53308,124.30897 A 10.849787,10.849787 0 1 1 329.8335,124.30897 A 10.849787,10.849787 0 1 1 351.53308,124.30897 z" sodipodi:ry="10.849787" sodipodi:rx="10.849787" sodipodi:cy="124.30897" sodipodi:cx="340.68329" id="path7051" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
- <path transform="matrix(0.853028,0,0,0.853028,35.587804,12.025478)" d="M 351.53308,124.30897 A 10.849787,10.849787 0 1 1 329.8335,124.30897 A 10.849787,10.849787 0 1 1 351.53308,124.30897 z" sodipodi:ry="10.849787" sodipodi:rx="10.849787" sodipodi:cy="124.30897" sodipodi:cx="340.68329" id="path7053" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
- <path id="path7099" d="M 82.4375,65.40625 L 82.4375,520.375 L 494.21875,520.375 L 494.21875,65.40625 L 82.4375,65.40625 z M 286,198.09375 C 341.22173,198.09375 386.03125,242.93453 386.03125,298.15625 C 386.03124,353.37798 341.22172,398.1875 286,398.1875 C 230.77828,398.1875 185.9375,353.37797 185.9375,298.15625 C 185.9375,242.93453 230.77828,198.09375 286,198.09375 z" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20.955"/>
- <path transform="matrix(1.0477726,0,0,1.0477726,-5.0359311,8.744292)" d="M 373.23267,276.20596 A 95.478119,95.478119 0 1 1 182.27643,276.20596 A 95.478119,95.478119 0 1 1 373.23267,276.20596 z" sodipodi:ry="95.478119" sodipodi:rx="95.478119" sodipodi:cy="276.20596" sodipodi:cx="277.75455" id="path7103" sodipodi:type="arc" opacity=".2" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
+ <path id="path4154" d="m 72,520 c 0,6 5,11 10,11 l 412,0 c 6,0 11,-5 11,-11 l 0,-455 c 0,-5 -5,-10 -11,-10 L 82,55 C 77,54.9 72,60 72,65 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 72,520 c 0,6 5,11 10,11 l 412,0 c 6,0 11,-5 11,-11 l 0,-455 c 0,-5 -5,-10 -11,-10 L 82,55 C 77,54.9 72,60 72,65 Z" id="path4142" fill="#ac39ac" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 93,75.9 0,434 391,0 0,-434 z" id="path4147" opacity="0.9" fill="#ffffff"/>
+ <path d="M 285.75 187.84961 C 246.5 187.69961 212.5 207.69922 192.5 238.69922 C 186.2 236.39922 180.1 243.10039 180 247.90039 L 180.5 264.69922 C 176.5 275.69922 175.5 286.69922 175.5 297.69922 C 175.5 309.69922 176.5 320.69922 180.5 330.69922 L 180.5 352.69922 C 180.8 359.79922 188.50078 364.20039 194.80078 360.90039 C 214.80078 389.70039 248.80078 408.69922 285.80078 408.69922 C 341.80078 408.69922 388.80078 366.69922 395.80078 311.69922 C 400.40078 304.79922 400.4 295.9 396 289 C 392 233 344 187.99961 285.75 187.84961 z M 286 208.84961 C 329 208.99961 365 239 374 280 L 357 280 C 323 280.1 325.30078 320.6 357.30078 321 L 373 320.69922 C 362 359.69922 328 387.69922 286 387.69922 C 245 387.69922 211 360.69922 200 323.69922 L 200 272.69922 C 211 235.69922 245 208.69961 286 208.84961 z " id="path4137" opacity="0.9" fill="#ac39ac"/>
+ <path d="m 374,280 -17,0 c -34,0.1 -31.7,40.6 0.3,41 l 15.7,-0.3 c -11,39 -45,67 -87,67 -41,0 -75,-27 -86,-64 l 0,-51 c 11,-37 45,-64 86,-63.85 43,0.15 79,30.15 88,71.15 z" id="path4158" opacity="0.2" fill="#ac39ac"/>
+ <path d="m 346,117.9 c 0,11 -9,20 -20,20 -11,0 -20,-9 -20,-20 0,-11 9,-20 20,-20 11,0 20,9 20,20 z" id="path4145" opacity="0.9" fill="#ac39ac"/>
+ <path d="m 403,117.9 c 0,11 -9,20 -19,20 -11,0 -20,-9 -20,-20 0,-11 9,-20 20,-20 10,0 19,9 19,20 z" id="path4143" opacity="0.9" fill="#ac39ac"/>
+ <path d="m 461,117.9 c 0,11 -9,20 -20,20 -11,0 -20,-9 -20,-20 0,-11 9,-20 20,-20 11,0 20,9 20,20 z" id="path4140" opacity="0.9" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/marketplace.svg b/vtm-themes/resources/assets/symbols/shopping/marketplace.svg
old mode 100755
new mode 100644
index 50b5f76c..d3c932db
--- a/vtm-themes/resources/assets/symbols/shopping/marketplace.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/marketplace.svg
@@ -1,50 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.79354273,1.2601716)" xlink:href="#linearGradient829" id="radialGradient874" cx="180.25" cy="198.42" r="101.58"/>
-  <linearGradient id="linearGradient829">
-   <stop id="stop830" stop-color="#ffffff" stop-opacity=".342"/>
-   <stop offset="1" id="stop831" stop-color="#ffffff" stop-opacity="0"/>
-  </linearGradient>
-  <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.007004,0.99304475)" xlink:href="#linearGradient829" id="radialGradient832" cx="360.85" cy="167.47" r="46.39"/>
-  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(0.74491357,1.3424376)" xlink:href="#linearGradient855" id="linearGradient850" x1="465.29" y1="248.24" x2="463.27" y2="405.77"/>
-  <linearGradient id="linearGradient855">
-   <stop id="stop856" stop-color="#ffffff" stop-opacity="0"/>
-   <stop offset="1" id="stop857" stop-color="#ffa617" stop-opacity=".733"/>
-  </linearGradient>
-  <linearGradient gradientUnits="userSpaceOnUse" gradientTransform="scale(1.4586159,0.68558144)" xlink:href="#linearGradient855" id="linearGradient854" x1="157.81" y1="120.96" x2="155.41" y2="231.63"/>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 52.563382,155.99203 c 29.546561,13.99402 60.765028,15.58941 94.300788,0 l 29.70446,-102.365016 -74.17088,0 z" id="path3250" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
- <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3252" d="m 147.18933,155.99203 c 29.54656,13.99402 60.76502,15.58941 94.30078,0 l 10.19396,-102.365016 -74.17088,0 z" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
- <path d="m 240.83975,155.99203 c 29.54656,13.99402 60.76502,15.58941 94.30078,0 l -9.31654,-102.365016 -74.17089,0 z" id="path3039" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
- <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3041" d="m 335.46569,155.99203 c 29.54656,13.99402 60.76503,15.58941 94.30079,0 l -28.82705,-102.365016 -74.17089,0 z" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
- <path d="m 429.11611,155.99203 c 29.54656,13.99402 60.76503,15.58941 94.30079,0 l -48.33756,-102.365016 -74.17088,0 z" id="path3043" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
- <g id="g4244" transform="translate(0,14)">
-  <path inkscape:connector-curvature="0" id="path3834" d="m 88.674599,376.21895 399.655541,0" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.988"/>
-  <path d="m 126.70277,514.91701 0,-130.49777" id="path3846" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
-  <path inkscape:connector-curvature="0" id="path3848" d="m 446.26059,514.91701 0,-130.49777" sodipodi:nodetypes="cc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="25"/>
- </g>
- <g id="g4238" transform="matrix(1.0962905,0,0,1.0962905,3.593298,-35.169215)">
-  <path d="m 209.74503,225.79765 c 0,0 -10.56174,35.79543 -41.59499,25.12539 -0.005,0.0224 3.7446,-31.18541 41.59499,-25.12539 z" id="path6571" inkscape:connector-curvature="0" fill="#ffffff"/>
-  <path d="m 157.72652,270.07711 c 5.36274,-5.30508 12.68607,-8.50543 20.81666,-8.50543 16.40541,0 29.75463,13.29154 29.75463,29.72577 0,0.60547 0,1.12444 -0.0288,1.75875 h -0.0576 c -0.51898,6.42953 -2.56606,14.41598 -7.40985,24.33419 0,0 -8.33244,15.94407 -15.02146,23.2674 l -0.60547,0.57664 c -3.22916,3.25801 -7.78462,5.30508 -12.71487,5.30508 -6.05474,0 -11.41748,-2.94086 -14.67549,-7.49631 h -0.0865 c -3.25802,4.55545 -8.62076,7.49631 -14.67547,7.49631 -4.98794,0 -9.48572,-2.01824 -12.74374,-5.30508 l -0.60546,-0.57664 c -6.63136,-7.32333 -15.02146,-23.2674 -15.02146,-23.2674 -4.84377,-9.91821 -6.89084,-17.96232 -7.35216,-24.33419 h -0.14415 c -0.0865,-0.60547 -0.0865,-1.12445 -0.0865,-1.75875 0,-16.43423 13.34921,-29.72577 29.81226,-29.72577 8.10178,0 15.42511,3.20035 20.84552,8.50543" id="path6573" inkscape:connector-curvature="0" fill="#ffffff"/>
-  <path id="path10957" d="m 113.68291,214.69051 c 0,0 6.27532,31.27326 33.50285,24.54444 0.003,0.0195 -0.82177,-26.83164 -33.50285,-24.54444 z" inkscape:connector-curvature="0" fill="#ffffff"/>
-  <path id="path10959" d="m 156.85947,263.78173 c 0,0 -0.30241,-32.11059 -3.62889,-40.48726 -3.32648,-8.37667 11.18908,0 11.18908,0 l -7.56019,40.48726 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-width="1.351"/>
- </g>
- <g id="g6443" transform="matrix(0.61265013,0,0,0.61265013,223.35252,104.87275)">
-  <path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccssccccccscccczzssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscccsscccc" id="path3" d="m 366.80484,182.59267 c -2.24001,0.006 -4.103,0.61275 -5.625,1.34375 -2.662,1.31899 -4.565,3.015 -6.375,4.75 -2.664,2.603 -5.01325,5.4475 -7.03125,7.6875 -0.998,1.113 -1.8945,2.0795 -2.5625,2.6875 -0.33001,0.305 -0.603,0.521 -0.75,0.625 -0.025,0.019 -0.0465,0.0203 -0.0625,0.0312 l -12.28125,5.28125 c -0.43399,-0.007 -0.84025,0 -1.28125,0 -16.77899,0.023 -31.79175,4.89175 -45.96875,9.34375 -15.629,4.95 -30.556,10.832 -45.625,13.75 -6.91999,1.36 -14.723,1.734 -22.875,2.375 -8.14701,0.66 -16.6815,1.56 -25.0625,4.5 -7.45301,2.61399 -13.76425,5.5795 -20.53125,9.8125 -2.96401,1.87201 -5.5705,4.12575 -8.0625,5.96875 -2.42299,1.85501 -4.753,3.15575 -5.625,3.34375 l -3.84375,2.5625 c 0,0 -3.46241,2.64587 -5.25868,4.18601 l -7.23227,6.20102 c -7.26827,6.23189 -9.63805,21.99647 -9.63405,30.80047 0,10e-4 0,0.007 0,0.0312 0,0.024 0,0.081 0,0.125 0.063,13.49101 4.4395,26.24975 11.4375,37.59375 7.03,11.392 16.69125,21.4595 27.65625,29.9375 22.031,16.89899 49.6945,27.896 75.8125,28 5.10201,-0.002 10.16575,-0.43 15.09375,-1.375 4.60799,-0.84599 8.61225,-3.04175 11.65625,-5.84375 1.91399,-1.758 5.485,-3.7375 6.75,-5.8125 2.21501,-1.003 2.32725,-2.3965 4.03125,-4.1875 2.515,-2.608 4.1615,-5.48625 6.0625,-9.03125 3.13701,-5.92801 6.959,-12.2515 10,-19.0625 3.46801,-7.858 4.71525,-16.14725 5.90625,-23.90625 1.15199,-7.75801 2.23425,-15.018 4.40625,-20.625 2.213,-5.80299 6.05775,-10.686 10.84375,-15.875 4.74799,-5.184 10.39275,-10.54575 15.21875,-17.46875 3.75699,-5.45401 8.1915,-10.27875 12.0625,-16.34375 3.40599,-5.295 6.172,-11.80525 6.75,-19.65625 l 9.6875,-5.09375 0.8125,-0.84375 c 1.04799,-1.03601 1.89275,-1.48125 3.21875,-1.90625 1.96,-0.63899 5.054,-0.76175 9,-1.09375 3.852,-0.361 9.01525,-1.15925 13.65625,-4.90625 1.91399,-1.557 3.53325,-3.21475 4.78125,-5.21875 1.242,-1.97901 2.0725,-4.4195 2.0625,-6.9375 0.007,-2.053 -0.555,-4.039 -1.375,-5.625 -1.46501,-2.799 -3.4615,-4.55175 -5.4375,-5.96875 -2.996,-2.094 -6.20375,-3.44925 -9.21875,-4.53125 -1.313,-0.463 -2.59425,-0.87675 -3.78125,-1.21875 -0.66101,-1.467 -1.442,-2.80875 -2.5,-4.09375 -1.00899,-1.204 -2.303,-2.334 -3.875,-3.125 -1.563,-0.8 -3.38625,-1.1985 -5.03125,-1.1875 z m -0.28125,7.5 c 2.36606,-0.16095 4.47872,1.73885 6,7.1875 7.16,1.61 26.31349,7.357 13.9375,17.375 -7.616,6.166 -18.628,0.50899 -26.5,8.5 l -12.5625,6.59375 c -0.007,-0.239 -0.0193,-0.47574 -0.0312,-0.71875 -3.176,1.153 -6.43674,2.54825 -9.71875,3.15625 -0.472,-3.34 -1.21276,-6.59026 -2.09375,-9.78125 -2.442,0.967 -5.41574,1.815 -7.84375,2.25 0.928,-4.522 1.96225,-7.9845 4.28125,-11.4375 l 15.53125,-6.65625 c 5.08659,-2.21088 12.9534,-16.05744 19,-16.46875 z m -197.71875,71.34375 c 0.57121,-0.0176 1.14562,2.5e-4 1.71875,0 13.664,0.027 27.9265,4.6985 38.8125,8.8125 8.84501,3.36201 16.1535,6.4775 22.8125,10.8125 6.66099,4.32701 12.55775,9.87 18.59375,17.75 9.45501,12.35401 19.29125,27.78825 23.28125,43.90625 0.95901,3.915 1.59175,8.8705 1.59375,14.0625 -0.013,5.728 -0.75025,11.73375 -3.03125,16.96875 -2.20801,5.186 -6.487,9.84325 -12.875,11.03125 -4.41499,0.84699 -8.99425,1.248 -13.65625,1.25 -23.96699,-0.04 -50.45925,-10.4115 -71.28125,-26.4375 -20.744,-16.03099 -36.08725,-37.91075 -36.15625,-61.71875 -0.002,-7.72701 1.66725,-15.6065 5.28125,-23.3125 l 6.28125,-7 6.9375,-4.25 c 3.76776,-1.18125 7.68901,-1.75204 11.6875,-1.875 z m 16.75,35.375 c 4.645,0.033 9.53775,1.08125 13.21875,4.15625 1.41,1.215 3.11025,3.09225 4.65625,5.40625 1.503,2.324 2.91675,5.007 2.96875,8.25 0.004,1.32501 -0.27725,2.78075 -1.03125,4.09375 -1.016,1.78701 -2.6775,2.996 -4.3125,3.625 -1.64701,0.64599 -3.30225,0.83975 -4.90625,0.84375 -4.36001,-0.022 -8.605,-1.428 -10.75,-2.125 l -0.28125,-0.0937 -9.40625,-5.125 -0.375,-0.21875 -0.34375,-0.28125 c -2.834,-2.661 -4.586,-5.45625 -4.625,-8.65625 -0.013,-1.848 0.703,-3.61625 1.75,-4.90625 1.04901,-1.305 2.35925,-2.2255 3.78125,-2.9375 2.851,-1.40601 6.20225,-2.01925 9.65625,-2.03125 z m 0,7 c -1.914,-0.005 -3.76375,0.29925 -5.21875,0.78125 -1.46599,0.469 -2.452,1.1515 -2.75,1.5625 -0.208,0.28501 -0.20575,0.35025 -0.21875,0.53125 -0.037,0.247 0.23975,1.40675 2.09375,3.21875 l 8.46875,4.625 c 1.974,0.656 5.55575,1.67925 8.21875,1.65625 1.01399,0.006 1.85475,-0.14375 2.34375,-0.34375 0.50301,-0.217 0.62325,-0.373 0.78125,-0.625 0.068,-0.12599 0.121,-0.25675 0.125,-0.59375 0.052,-0.81199 -0.62525,-2.69 -1.78125,-4.375 -1.113,-1.693 -2.61725,-3.2775 -3.40625,-3.9375 -1.66401,-1.49099 -5.19025,-2.535 -8.65625,-2.5 z" fill="#ffffff" stroke="#ffffff"/>
-  <path inkscape:connector-curvature="0" id="path6439" d="m 144.94595,333.42528 23.65784,26.65673 30.32203,17.99329 32.65449,9.66306 27.98956,1.66605 10.9959,-6.66418 7.3306,-12.32874 5.33135,-39.98509 -28.32278,-52.98024 -46.31606,-19.32613 -38.65225,-3.99851 -17.99329,6.66418 -12.66195,11.99553 -4.66492,19.32613 2.66567,23.65784 7.66381,17.66008 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
-  <path inkscape:connector-curvature="0" id="path6441" d="m 323.21281,212.13718 22.325,-9.66307 18.99292,-16.32724 10.32948,4.99814 15.99404,10.66269 2.66567,9.66306 -8.99664,7.99702 -17.99329,2.99888 -24.99068,16.66045 -27.98957,-3.6653 9.66307,-23.32463 z" opacity=".1" fill="#ffffff" fill-rule="evenodd"/>
- </g>
- <path d="m 147.18933,155.99203 c 29.54656,13.99402 60.76502,15.58941 94.30078,0 l 10.19396,-102.365016 -74.17088,0 z" id="path4254" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
- <path d="m 335.46569,155.99203 c 29.54656,13.99402 60.76503,15.58941 94.30079,0 l -28.82705,-102.365016 -74.17089,0 z" id="path4256" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.99"/>
+ <path solid-color="#000000" color="#000000" color-interpolation="sRGB" image-rendering="auto" shape-rendering="auto" color-interpolation-filters="linearRGB" mix-blend-mode="normal" solid-opacity="1" white-space="normal" color-rendering="auto" isolation="auto" fill="none" id="path4144" d="M97 51L47.6 154c-1.3 2.8-.2 6.1 2.6 7.4 30 14.3 62.7 16 97 1 29.4 13.3 61 14.8 94 .2 29.4 13 61 14.5 94-.2 34 12.9 63 13.5 94 .2 30 13.4 63 14.5 96-1.2 2.8-1.3 4-4.6 2.6-7.3L480 51c-.9-1.9-2.8-3.1-5-3.1L102 48C100 48 98 49 97 51" opacity="0.8" filter-gaussianBlur-deviation="0" stroke-width="64" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff"/>
+ <path solid-color="#000000" color="#000000" color-interpolation="sRGB" image-rendering="auto" shape-rendering="auto" color-interpolation-filters="linearRGB" solid-opacity="1" color-rendering="auto" fill="none" white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4146" d="M89 405L114 405l0 124c3 18.5 24.8 13.5 25-.1L139 405l295 0 0 124c1.3 21.5 26.4 14.6 24.8-.1L459 405l29 0c21.6-3.1 16-28.6.3-29L89 376c-21.9 2.8-15.9 28.6-.2 28.9" opacity="0.8" filter-gaussianBlur-deviation="0" stroke-width="64" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff"/>
+ <path fill="none" id="path4148" d="m128 200c2.9 12.4 10.9 25.9 24.6 27.9 5.7.8 15.9.9 11.2-7.2-3.1-11.7-14.4-19.6-26-20.4C134 200 131 200 128 200m44 10c3.3 14.4 3.2 29 4 44 2.7-14.7 5.3-29.3 8-44-2.4-1.5-16.6-8.2-12 0zm16 30c11 4.4 24.5 2.3 32.8-6.4C227 228 231 220 234 212c-11 0-23-.9-32.5 5.9C194 223 189 231 188 240m-67 44c.7 10.3 4 20.4 8.4 29.7 5 8.5 10.7 16.8 16.6 24.6 2.9 4.7 9.7 6.9 15.3 6.6 6.4.9 12.7-5.9 16.3-7 6.7 9.2 22.5 9.4 29.4.7 3.9-5.4 8.7-11 12-17C226 310 231 298 232 285 233 269 220 254 204 252 194 251 183 253 177 261 163 247 138 250 127 265 123 271 121 277 121 284" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path fill="none" id="path4150" d="m445 218c-6.1 3.5-9.2 11.1-16.7 12.5-6.2 1-12.6.8-18.6 2.8-18 4.7-35.5 13.5-54.6 13.3-12.3.8-24 6-33.6 13.8-7.6 4.7-15.6 10.9-16.6 20.4-3.3 17.5 6.4 34.6 19.6 45.5 16 14 38 22.9 60 19.4 13-4.7 19.4-18.6 24.3-30.5 3.4-11 1.8-24.5 11.2-32.8 7.4-8 14.8-16.4 19.7-26 .1-6.9 6-10.7 12-12 7.2-.2 16.6-3.5 15.7-12.4-2.6-7-11.7-8.7-17-13.9-1.6-.6-3.5-.5-5 .2" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M97 51L47.6 154c-1.3 2.8-.2 6.1 2.6 7.4 30 14.3 62.7 16 97 1 29.4 13.3 61 14.8 94 .2 29.4 13 61 14.5 94-.2 34 12.9 63 13.5 94 .2 30 13.4 63 14.5 96-1.2 2.8-1.3 4-4.6 2.6-7.3L480 51c-.9-1.9-2.8-3.1-5-3.1L102 48C100 48 98 49 97 51" id="path4145" fill="#ac39ac" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m181 58.9l63.9 0-9.9 93c-29 12.6-55.9 11.5-82 .4z" id="path4143" fill="#ffffff" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m332 58.9l64 0 25.9 94c-29 12.2-55.9 10.8-81.9-.8z" id="path3250" fill="#ffffff" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="M89 405L114 405l0 124c3 18.5 24.8 13.5 25-.1L139 405l295 0 0 124c1.3 21.5 26.4 14.6 24.8-.1L459 405l29 0c21.6-3.1 16-28.6.3-29L89 376c-21.9 2.8-15.9 28.6-.2 28.9" id="path3834" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m128 200c2.9 12.4 10.9 25.9 24.6 27.9 5.7.8 15.9.9 11.2-7.2-3.1-11.7-14.4-19.6-26-20.4C134 200 131 200 128 200m44 10c3.3 14.4 3.2 29 4 44 2.7-14.7 5.3-29.3 8-44-2.4-1.5-16.6-8.2-12 0zm16 30c11 4.4 24.5 2.3 32.8-6.4C227 228 231 220 234 212c-11 0-23-.9-32.5 5.9C194 223 189 231 188 240m-67 44c.7 10.3 4 20.4 8.4 29.7 5 8.5 10.7 16.8 16.6 24.6 2.9 4.7 9.7 6.9 15.3 6.6 6.4.9 12.7-5.9 16.3-7 6.7 9.2 22.5 9.4 29.4.7 3.9-5.4 8.7-11 12-17C226 310 231 298 232 285 233 269 220 254 204 252 194 251 183 253 177 261 163 247 138 250 127 265 123 271 121 277 121 284" id="path6571" fill="#ac39ac"/>
+ <path d="m445 218c-6.1 3.5-9.2 11.1-16.7 12.5-6.2 1-12.6.8-18.6 2.8-18 4.7-35.5 13.5-54.6 13.3-12.3.8-24 6-33.6 13.8-7.6 4.7-15.6 10.9-16.6 20.4-3.3 17.5 6.4 34.6 19.6 45.5 16 14 38 22.9 60 19.4 13-4.7 19.4-18.6 24.3-30.5 3.4-11 1.8-24.5 11.2-32.8 7.4-8 14.8-16.4 19.7-26 .1-6.9 6-10.7 12-12 7.2-.2 16.6-3.5 15.7-12.4-2.6-7-11.7-8.7-17-13.9-1.6-.6-3.5-.5-5 .2" id="path4162" fill="#ac39ac"/>
+ <path d="m451 226c8.8-1.7 15.4 12.4 3.6 12.3-7.4-.1-13 4.9-19.6 7.5-5.2 3.8-5.5-2-7.8-4.5-7 2.9-.2-9.2 4.5-7.9 5.7-1.6 8.8-6.7 12.8-10.4 2.8-2.6 6.5-.5 6.6 3" id="path4160" opacity="0.8" fill="#ffffff"/>
+ <path d="m368 279c15 13 34.6 43.8 19.5 59.7-28.4 12.7-68-17.5-76-37-3.7-9.8-4.1-22.6 3.3-30.8 13.7-11.7 42 1.3 53 8.4" id="path4158" opacity="0.8" fill="#ffffff"/>
+ <path d="m328 294c1.4 6.9 11.2 10 17.6 9.1 9.4-4.3-.9-17.5-8.8-15.8-4.3-.7-8.7 3.4-8.8 6.7m16 .9c4.8 8.7-15.9 1.7-10.3-2.8 3.7-1.1 8.4.3 10.3 2.8" id="path4156" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/shopping/supermarket.svg b/vtm-themes/resources/assets/symbols/shopping/supermarket.svg
old mode 100755
new mode 100644
index 7d7f9cc6..e49fe7a9
--- a/vtm-themes/resources/assets/symbols/shopping/supermarket.svg
+++ b/vtm-themes/resources/assets/symbols/shopping/supermarket.svg
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#AC39AC" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 538.75588,90.924252 L 489.34651,118.92063 L 426.02351,388.57001 L 426.02351,445.69918 L 137.1468,445.69918" id="path2492" sodipodi:nodetypes="ccccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.17"/>
- <path d="M 479.06925,164.57688 L 56.196494,164.57688 L 105.86424,358.40271 L 425.39502,402.94461 L 479.06925,164.57688 z" id="path3264" sodipodi:nodetypes="ccccc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="28.17"/>
- <path id="path3268" d="M 128.06871,165.73536 L 128.06871,343.20709" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
- <path sodipodi:nodetypes="cc" d="M 86.424707,243.00115 L 445.19209,243.00115" id="path3280" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
- <path transform="matrix(1.0862609,0,0,1.1358574,373.78132,-86.8033)" sodipodi:open="true" sodipodi:end="6.2832427" sodipodi:start="0.00024710373" d="M -184.12699,498.68445 A 29.153439,29.153439 0 1 1 -184.12699,498.67892" sodipodi:ry="29.153439" sodipodi:rx="29.153439" sodipodi:cy="498.67725" sodipodi:cx="-213.28043" id="path3284" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
- <path transform="matrix(1.0862609,0,0,1.1358574,618.76176,-84.803297)" sodipodi:open="true" sodipodi:end="6.2832427" sodipodi:start="0.00024710373" d="M -184.12699,498.68445 A 29.153439,29.153439 0 1 1 -184.12699,498.67892" sodipodi:ry="29.153439" sodipodi:rx="29.153439" sodipodi:cy="498.67725" sodipodi:cx="-213.28043" id="path3316" sodipodi:type="arc" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
- <path d="M 215.1525,165.73536 L 215.1525,363.25095" id="path3318" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
- <path id="path3320" d="M 306.2363,165.73536 L 306.2363,372.15933" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
- <path d="M 395.3201,165.73536 L 395.3201,385.5219" id="path3322" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
- <path id="path3324" d="M 104.24147,322.08495 L 427.37533,322.08495" sodipodi:nodetypes="cc" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="18.782"/>
+ <path id="path4171" d="M 532 66 L 492 85 C 482 91 467 95 467 110 C 464 119 462 129 460 139 C 322 139 184.00039 138 45.900391 139 C 32.600391 141 33.399219 157 37.699219 167 C 53.699219 229 69 291 86 353 C 102.17043 364.49053 112.03787 363.54734 122 364 L 404 403 C 406 414 406 423 392 419 C 304 420 215 419 127 420 C 112 428 97 440 93 458 C 85 490 120 524 150 509 C 173 499 183 470 172 448 L 342 448 C 324 477 352 522 387 514 C 415 508 430 473 416 449 C 429 450 434 436 432 425 C 432 406 431 387 437 368 C 456 284 475 201 494 117 C 510 108 528 100 542 89 C 549 80 543 66 532 66 z M 66.800781 167 L 111 167 L 111 222 L 81 222 C 76 204 71.000781 185 66.800781 167 z M 130 167 L 198 167 L 198 222 L 130 222 L 130 167 z M 217 167 L 289 167 L 289 222 L 217 222 L 217 167 z M 308 167 L 378 167 L 378 222 L 308 222 L 308 167 z M 397 167 L 453 167 C 449 185 444 204 440 222 C 426 221 411 222 397 222 L 397 167 z M 110.13281 239.98047 C 111.47664 258.13303 111 286.96276 111 301 C 99 305 100 292 97 283 C 93 269 89 255 86 241 C 90 242 104.13281 239.98047 110.13281 239.98047 z M 130 241 L 198 241 L 198 301 L 130 301 L 130 241 z M 217 241 L 289 241 L 289 301 L 217 301 L 217 241 z M 308 241 L 378 241 L 378 301 L 308 301 L 308 241 z M 397 241 L 436 241 C 431 261 426 281 422 302 C 414 301 402 304 397 300 L 397 241 z M 417.62305 320 C 415.04008 338.51378 407.3205 362.71378 404 376 C 393.01894 373.92425 396.45266 372.69883 397 355 L 397 321 C 400 321 413.62305 320 417.62305 320 z M 108.61914 320.41016 C 109.67837 320.42798 110.73633 320.57031 111.23633 320.57031 C 111.23633 320.57031 112 339 109 333 L 106 321 C 106.5 320.5 107.55991 320.39234 108.61914 320.41016 z M 130 321 L 198 321 C 198.26087 329.54037 198.73887 340.0182 198.52148 347.17969 C 176.52148 344.17969 151.90039 341 128.90039 337 C 129.7389 331.09938 129 326 130 321 z M 217 321 L 289 321 L 289 360 C 265 356 241 353 217 350 L 217 321 z M 308 321 L 378 321 L 378 372 C 354 369 331 366 308 363 L 308 321 z M 135.93164 447.05469 C 147.32527 447.42516 157.71016 455.98865 155 469 C 147.33904 504.50947 100 490 115 459 C 119.86781 450.38346 128.136 446.80121 135.93164 447.05469 z M 380.38086 448.99023 C 408.83809 449.57903 403.54688 498.89062 375 492 C 351 487 354 449 379 449 C 379.46875 448.98438 379.92916 448.98089 380.38086 448.99023 z " mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 532 66 L 492 85 C 482 91 467 95 467 110 C 464 119 462 129 460 139 C 322 139 184.00039 138 45.900391 139 C 32.600391 141 33.399219 157 37.699219 167 C 53.699219 229 69 291 86 353 C 102.17043 364.49053 112.03787 363.54734 122 364 L 404 403 C 406 414 406 423 392 419 C 304 420 215 419 127 420 C 112 428 97 440 93 458 C 85 490 120 524 150 509 C 173 499 183 470 172 448 L 342 448 C 324 477 352 522 387 514 C 415 508 430 473 416 449 C 429 450 434 436 432 425 C 432 406 431 387 437 368 C 456 284 475 201 494 117 C 510 108 528 100 542 89 C 549 80 543 66 532 66 z M 66.800781 167 L 111 167 L 111 222 L 81 222 C 76 204 71.000781 185 66.800781 167 z M 130 167 L 198 167 L 198 222 L 130 222 L 130 167 z M 217 167 L 289 167 L 289 222 L 217 222 L 217 167 z M 308 167 L 378 167 L 378 222 L 308 222 L 308 167 z M 397 167 L 453 167 C 449 185 444 204 440 222 C 426 221 411 222 397 222 L 397 167 z M 110.13281 239.98047 C 111.47664 258.13303 111 286.96276 111 301 C 99 305 100 292 97 283 C 93 269 89 255 86 241 C 90 242 104.13281 239.98047 110.13281 239.98047 z M 130 241 L 198 241 L 198 301 L 130 301 L 130 241 z M 217 241 L 289 241 L 289 301 L 217 301 L 217 241 z M 308 241 L 378 241 L 378 301 L 308 301 L 308 241 z M 397 241 L 436 241 C 431 261 426 281 422 302 C 414 301 402 304 397 300 L 397 241 z M 417.62305 320 C 415.04008 338.51378 407.3205 362.71378 404 376 C 393.01894 373.92425 396.45266 372.69883 397 355 L 397 321 C 400 321 413.62305 320 417.62305 320 z M 108.61914 320.41016 C 109.67837 320.42798 110.73633 320.57031 111.23633 320.57031 C 111.23633 320.57031 112 339 109 333 L 106 321 C 106.5 320.5 107.55991 320.39234 108.61914 320.41016 z M 130 321 L 198 321 C 198.26087 329.54037 198.73887 340.0182 198.52148 347.17969 C 176.52148 344.17969 151.90039 341 128.90039 337 C 129.7389 331.09938 129 326 130 321 z M 217 321 L 289 321 L 289 360 C 265 356 241 353 217 350 L 217 321 z M 308 321 L 378 321 L 378 372 C 354 369 331 366 308 363 L 308 321 z M 135.93164 447.05469 C 147.32527 447.42516 157.71016 455.98865 155 469 C 147.33904 504.50947 100 490 115 459 C 119.86781 450.38346 128.136 446.80121 135.93164 447.05469 z M 380.38086 448.99023 C 408.83809 449.57903 403.54688 498.89062 375 492 C 351 487 354 449 379 449 C 379.46875 448.98438 379.92916 448.98089 380.38086 448.99023 z " id="path4168" fill="#ac39ac" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/golf.svg b/vtm-themes/resources/assets/symbols/sport/golf.svg
old mode 100755
new mode 100644
index c59454cd..0f095624
--- a/vtm-themes/resources/assets/symbols/sport/golf.svg
+++ b/vtm-themes/resources/assets/symbols/sport/golf.svg
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
- </g>
- <rect id="rect2996" width="11.793" height="467.51" x="73.35" y="56.25" fill="#ffffff" stroke="#ffffff" stroke-linecap="square" stroke-width="20.948"/>
- <path d="M 77.95768,51.756614 L 257.39682,118.5291 L 78.29184,191.43915 L 77.95768,51.756614 z" id="path2998" sodipodi:nodetypes="cccc" fill="#ffffff" fill-rule="evenodd"/>
- <path transform="matrix(4.0375831,0,0,4.0375831,-822.63179,-683.71826)" d="M 299.66943,208.31152 C 299.66936,205.71883 298.73333,203.53402 296.86133,201.75708 C 294.98919,199.98031 292.75677,199.09188 290.16406,199.0918 C 287.57416,199.09188 285.36664,199.98031 283.5415,201.75708 C 281.71625,203.53402 280.80366,205.71883 280.80371,208.31152 C 280.80366,210.90144 281.71625,213.08479 283.5415,214.86157 C 285.36664,216.63849 287.57416,217.52692 290.16406,217.52686 C 292.75677,217.52692 294.98919,216.63849 296.86133,214.86157 C 298.73333,213.08479 299.66936,210.90144 299.66943,208.31152 L 299.66943,208.31152 z M 274.90186,304.21338 C 276.91743,304.21336 278.54926,303.25389 279.79736,301.33496 L 306.86768,260.58008 L 308.30908,266.19629 L 304.2793,296.7251 C 304.08586,298.26024 304.42131,299.6284 305.28564,300.82959 C 306.14982,302.03074 307.34953,302.77488 308.88477,303.06201 C 310.42277,303.3491 311.83927,303.03709 313.13428,302.12598 C 314.42911,301.21483 315.17325,299.99022 315.3667,298.45215 L 319.5415,267.20703 C 319.63809,266.14943 319.54288,265.04494 319.25586,263.89355 L 310.03613,227.17285 L 334.0874,222.85303 C 335.33534,222.66266 336.34315,222.0152 337.11084,220.91064 C 337.87831,219.80622 338.16542,218.62995 337.97217,217.38184 C 337.68495,216.13386 336.96571,215.07771 335.81445,214.21338 L 280.51807,177.78271 L 275.47754,185.12598 C 274.22945,186.85459 274.51802,188.34287 276.34326,189.59082 C 278.0688,190.6456 279.55561,190.35703 280.80371,188.7251 L 283.68652,184.40527 L 328.61182,213.92773 L 291.89551,220.55029 C 290.55072,220.83747 289.4704,221.53327 288.65454,222.6377 C 287.83856,223.74225 287.6225,224.91852 288.00635,226.1665 L 295.92529,257.12598 L 270.00635,295.86377 C 269.52584,296.72508 269.2856,297.63622 269.28564,298.59717 C 269.2856,300.13231 269.83785,301.45213 270.94238,302.55664 C 272.04683,303.66111 273.36665,304.21336 274.90186,304.21338 L 274.90186,304.21338 z" id="flowRoot2383" fill="#ffffff"/>
+ <path id="path4140" d="m 269.37626,86.386248 c -4.64019,6.500192 -3.61935,12.071785 3.24814,16.714782 6.49627,3.99297 12.0645,2.87865 16.70469,-3.250098 l 11.04366,-16.064761 167.97497,110.688989 -137.3497,25.07217 c -5.01141,1.11431 -9.09478,3.71439 -12.0645,7.80023 -3.06253,4.17869 -3.89776,8.54311 -2.4129,13.27896 l 29.69723,116.07486 -97.44404,144.86142 c -1.76327,3.2501 -2.69131,6.68591 -2.69131,10.21459 0,5.75731 2.04168,10.67889 6.21785,14.85758 4.17618,4.1787 9.09478,6.22161 14.84862,6.22161 7.51711,0 13.64217,-3.62153 18.37516,-10.77174 l 101.1562,-153.21882 5.38262,21.0792 -15.12702,114.21766 c -0.74244,5.75731 0.55682,10.86461 3.80495,15.41474 3.24814,4.55014 7.70272,7.33593 13.45656,8.35739 5.75384,1.11432 11.04366,-0.0929 15.96226,-3.52867 4.8258,-3.43582 7.60992,-7.98596 8.35235,-13.74327 L 434.1959,393.65961 c 0.37122,-3.99297 0,-8.07881 -1.02084,-12.44322 l -34.33743,-137.43263 90.01974,-16.15762 c 4.64019,-0.74288 8.44515,-3.15724 11.32207,-7.24307 2.87692,-4.1787 3.99056,-8.54311 3.24813,-13.27897 -1.11364,-4.64299 -3.80495,-8.63597 -8.07393,-11.88606 L 288.30825,58.899722 Z M 59.082739,523.38488 l 30.346859,0 0,-325.00961 149.692612,-60.54464 -149.4142,-56.644536 0,-11.607485 -30.486065,0.09286 C 58.897404,220.90647 59.082739,372.14796 59.082739,523.38488 Z M 299.72312,148.78809 c -6.86748,6.68591 -10.20842,14.85758 -10.20842,24.60787 0,9.75029 3.43374,17.92196 10.20842,24.51501 6.86749,6.68591 15.12703,10.02887 24.77863,10.02887 9.7444,0 18.09675,-3.34296 25.05704,-10.02887 7.05309,-6.68591 10.48683,-14.85758 10.48683,-24.51501 0,-9.75029 -3.52654,-17.92196 -10.48683,-24.60787 -7.05309,-6.68591 -15.40544,-10.02887 -25.05704,-10.02887 -9.7444,0 -18.00395,3.34296 -24.77863,10.02887 z" mix-blend-mode="normal" isolation="auto" white-space="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 269.37626,86.386248 c -4.64019,6.500192 -3.61935,12.071785 3.24814,16.714782 6.49627,3.99297 12.0645,2.87865 16.70469,-3.250098 l 11.04366,-16.064761 167.97497,110.688989 -137.3497,25.07217 c -5.01141,1.11431 -9.09478,3.71439 -12.0645,7.80023 -3.06253,4.17869 -3.89776,8.54311 -2.4129,13.27896 l 29.69723,116.07486 -97.44404,144.86142 c -1.76327,3.2501 -2.69131,6.68591 -2.69131,10.21459 0,5.75731 2.04168,10.67889 6.21785,14.85758 4.17618,4.1787 9.09478,6.22161 14.84862,6.22161 7.51711,0 13.64217,-3.62153 18.37516,-10.77174 l 101.1562,-153.21882 5.38262,21.0792 -15.12702,114.21766 c -0.74244,5.75731 0.55682,10.86461 3.80495,15.41474 3.24814,4.55014 7.70272,7.33593 13.45656,8.35739 5.75384,1.11432 11.04366,-0.0929 15.96226,-3.52867 4.8258,-3.43582 7.60992,-7.98596 8.35235,-13.74327 L 434.1959,393.65961 c 0.37122,-3.99297 0,-8.07881 -1.02084,-12.44322 l -34.33743,-137.43263 90.01974,-16.15762 c 4.64019,-0.74288 8.44515,-3.15724 11.32207,-7.24307 2.87692,-4.1787 3.99056,-8.54311 3.24813,-13.27897 -1.11364,-4.64299 -3.80495,-8.63597 -8.07393,-11.88606 L 288.30825,58.899722 Z M 59.082739,523.38488 l 30.346859,0 0,-325.00961 149.692612,-60.54464 -149.4142,-56.644536 0,-11.607485 -30.486065,0.09286 C 58.897404,220.90647 59.082739,372.14796 59.082739,523.38488 Z M 299.72312,148.78809 c -6.86748,6.68591 -10.20842,14.85758 -10.20842,24.60787 0,9.75029 3.43374,17.92196 10.20842,24.51501 6.86749,6.68591 15.12703,10.02887 24.77863,10.02887 9.7444,0 18.09675,-3.34296 25.05704,-10.02887 7.05309,-6.68591 10.48683,-14.85758 10.48683,-24.51501 0,-9.75029 -3.52654,-17.92196 -10.48683,-24.60787 -7.05309,-6.68591 -15.40544,-10.02887 -25.05704,-10.02887 -9.7444,0 -18.00395,3.34296 -24.77863,10.02887 z" id="rect2996" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/shooting.svg b/vtm-themes/resources/assets/symbols/sport/shooting.svg
old mode 100755
new mode 100644
index 7529da1c..cb2b4f16
--- a/vtm-themes/resources/assets/symbols/sport/shooting.svg
+++ b/vtm-themes/resources/assets/symbols/sport/shooting.svg
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 214.71605,127.23752 c 12.02355,3.4e-4 22.28808,-4.24912 30.79365,-12.74843 8.50497,-8.49858 12.75759,-18.96878 12.75794,-31.41065 -3.5e-4,-12.03609 -4.25297,-22.3038 -12.75794,-30.80316 -8.50557,-8.49849 -18.7701,-12.748 -30.79365,-12.74839 -12.02407,3.9e-4 -22.39301,4.2499 -31.1069,12.74839 -8.71433,8.49936 -13.07136,18.76707 -13.07115,30.80316 -2.1e-4,12.44187 4.35682,22.91207 13.07115,31.41065 8.71389,8.49931 19.08283,12.74877 31.1069,12.74843 z m 29.23689,27.37638 c -1.65833,9.12573 -7.4614,13.68844 -17.40925,13.68814 l -103.90484,0 c -12.44166,3e-4 -18.6624,-5.3914 -18.66223,-16.17521 -1.7e-4,-4.56872 1.45537,-8.30244 4.36654,-11.20112 -7.88525,2.89868 -11.82776,8.0816 -11.82763,15.5487 -1.3e-4,10.78376 6.42944,16.17551 19.28873,16.1752 l 108.85995,0 c 13.69419,3.1e-4 20.12377,-6.0116 19.28873,-18.03571 z m -121.31409,13.68814 103.90484,0 c 9.94785,3e-4 15.75092,-4.56241 17.40925,-13.68814 -0.41797,-10.78316 -6.84755,-16.17491 -19.28873,-16.17521 l -108.85995,0 c -0.4178,3e-4 -2.90486,0.82934 -7.4611,2.48702 -2.91117,2.89868 -4.36671,6.6324 -4.36654,11.20112 -1.7e-4,10.78381 6.22057,16.17551 18.66223,16.17521 z m 108.87891,166.09968 0,-1.86055 c -2.5e-4,1.3e-4 -2.5e-4,0.20266 0,0.60754 z m -1.25301,12.43518 0,-1.86056 c -2.6e-4,0.41781 -2.6e-4,0.62664 0,0.62651 z m 19.91528,-206.5377 c 0.40471,0.41802 0.81603,0.83565 1.23401,1.25301 1.65772,3.31636 2.90438,7.05008 3.74003,11.20113 0.41737,4.13904 -0.62046,8.90428 -3.11353,14.29569 -3e-4,0.83564 -0.41797,1.87351 -1.25301,3.11357 -5.79702,8.70806 -14.50482,13.06194 -26.12332,13.06163 l -59.72679,0 0,160.4991 0,0 -34.21093,170.46622 c -1.24057,6.63202 0.006,12.74834 3.74003,18.34897 3.73351,5.6005 8.91643,9.02097 15.5487,10.26141 6.63189,1.24027 12.74822,-0.003 18.34898,-3.73057 5.60037,-3.72746 9.22963,-8.91352 10.88791,-15.5582 l 34.83743,-176.67426 16.17521,0 0,0 34.83748,176.67426 c 1.24,6.64468 4.66048,11.83074 10.26136,15.5582 5.60024,3.72733 11.9254,4.97084 18.97552,3.73057 6.22671,-1.24044 11.30836,-4.66091 15.24491,-10.26141 3.93586,-5.60063 5.07496,-11.71695 3.41732,-18.34897 l -34.21097,-171.70022 0,-143.71635 22.45101,-29.0605 23.21983,-1.54239 18.47168,-24.02565 155.7997,-8.68174 -0.7082,-15.5865 -238.53891,5.12778 c 0,0 -17.22065,6.29771 -23.88214,9.92447 z m -18.66227,194.10252 0,-1.25301 c -2.5e-4,1.3e-4 -2.5e-4,-0.2024 0,-0.60754 z" id="flowRoot2391" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" fill="#ffffff"/>
+ <path id="path4136" d="m 245.8,114.2 c 8.5,-8.5 12.8,-19 12.8,-31.4 0,-12 -4.3,-22.3 -12.8,-30.8 C 237.3,43.5 227,39.2 215,39.2 c -12,0 -22.4,4.3 -31,12.8 -8.7,8.5 -13,18.8 -13,30.8 0,12.4 4.4,22.9 13,31.4 8.7,8.5 19,12.8 31,12.8 12,0 22.3,-4.3 30.8,-12.8 z M 96.5,156.3 c 0,10.8 6.4,16.2 19.3,16.2 l 109,0 c 13.7,0 20,-6 19.25,-18.05 0.05,-11.5142 -6.35,-16.15 -18.85,-16.15 0,0 -103.82937,-1.04852 -109,0 -5.17063,1.04852 -4.81051,1.05473 -8.90422,2.73158 C 100.4,143.6 96.5,148.8 96.5,156.3 Z m 154.1,-15.7 c 3.21183,3.11657 3.90351,6.74306 4.9,12.5 -0.60272,6.3922 -1.07123,12.88153 -4.4,17.4 -5.8,8.7 -14.5,13 -26,13 l -59.7,0 0,161 -34,171 c -1.2,6.6 0,12.8 3.7,18.4 3.7,5.6 8.9,9 15.6,10.3 6.6,1.2 12.8,0 18.3,-3.7 5.6,-3.7 9.2,-8.9 10.9,-15.6 l 34.8,-177 16.2,0 34.8,177 c 1.2,6.6 4.7,11.8 10.3,15.6 5.6,3.7 11.9,5 19,3.7 6.2,-1.2 11.3,-4.7 15.2,-10.3 3.9,-5.6 5.1,-11.7 3.4,-18.4 l -34,-172 0,-144 22.4,-29 23,-1.5 18.5,-24 156,-8.7 -0.7,-15.6 -238,5.1 c 0,0 -17.2,6.3 -23.9,9.9 0,0 10.21932,1.52256 13.7,4.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 245.8,114.2 c 8.5,-8.5 12.8,-19 12.8,-31.4 0,-12 -4.3,-22.3 -12.8,-30.8 C 237.3,43.5 227,39.2 215,39.2 c -12,0 -22.4,4.3 -31,12.8 -8.7,8.5 -13,18.8 -13,30.8 0,12.4 4.4,22.9 13,31.4 8.7,8.5 19,12.8 31,12.8 12,0 22.3,-4.3 30.8,-12.8 z M 96.5,156.3 c 0,10.8 6.4,16.2 19.3,16.2 l 109,0 c 13.7,0 20,-6 19.25,-18.05 0.05,-11.5142 -6.35,-16.15 -18.85,-16.15 0,0 -103.82937,-1.04852 -109,0 -5.17063,1.04852 -4.81051,1.05473 -8.90422,2.73158 C 100.4,143.6 96.5,148.8 96.5,156.3 Z m 154.1,-15.7 c 3.21183,3.11657 3.90351,6.74306 4.9,12.5 -0.60272,6.3922 -1.07123,12.88153 -4.4,17.4 -5.8,8.7 -14.5,13 -26,13 l -59.7,0 0,161 -34,171 c -1.2,6.6 0,12.8 3.7,18.4 3.7,5.6 8.9,9 15.6,10.3 6.6,1.2 12.8,0 18.3,-3.7 5.6,-3.7 9.2,-8.9 10.9,-15.6 l 34.8,-177 16.2,0 34.8,177 c 1.2,6.6 4.7,11.8 10.3,15.6 5.6,3.7 11.9,5 19,3.7 6.2,-1.2 11.3,-4.7 15.2,-10.3 3.9,-5.6 5.1,-11.7 3.4,-18.4 l -34,-172 0,-144 22.4,-29 23,-1.5 18.5,-24 156,-8.7 -0.7,-15.6 -238,5.1 c 0,0 -17.2,6.3 -23.9,9.9 0,0 10.21932,1.52256 13.7,4.9 z" id="flowRoot2391" fill="#39ac39"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/soccer.svg b/vtm-themes/resources/assets/symbols/sport/soccer.svg
old mode 100755
new mode 100644
index 93fb8679..b01eb704
--- a/vtm-themes/resources/assets/symbols/sport/soccer.svg
+++ b/vtm-themes/resources/assets/symbols/sport/soccer.svg
@@ -1,84 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 291.6875 37.21875 C 143.19033 37.21875 22.65625 151.99467 22.65625 293.40625 C 22.65625 434.81273 143.18524 549.5625 291.6875 549.5625 C 440.18977 549.5625 560.71877 434.81272 560.71875 293.40625 C 560.71875 151.99468 440.18469 37.218751 291.6875 37.21875 z M 271.5 58.5 L 327.625 104.90625 L 312.78125 164.125 L 250.4375 193.09375 L 171.5625 172.1875 L 159.84375 123.96875 L 190.09375 78.3125 L 271.5 58.5 z M 411.25 83.25 L 483.5 142.5 L 463.15625 216.59375 L 397.125 226.46875 L 335.34375 164.6875 L 345.21875 108.5625 L 411.25 83.25 z M 151.21875 94.25 C 148.65143 104.33591 146.07144 114.44535 143.6875 124.53125 L 107.375 133.875 C 110.30908 128.55698 114.00512 123.61575 118.40625 119.03125 C 122.25723 114.07999 126.28395 109.28848 131.96875 105.4375 C 137.65353 101.03637 143.33342 97.550847 151.21875 94.25 z M 162.78125 191.46875 L 235.5625 211.8125 L 254.09375 290.65625 L 178.1875 349.34375 L 112.15625 347.5 L 95.46875 259.84375 L 162.78125 191.46875 z M 472.3125 236.1875 L 509.34375 298.5625 L 458.1875 383.09375 L 394 377.03125 L 370.53125 323.3125 L 409.96875 247.375 L 472.3125 236.1875 z M 36.78125 257.46875 L 75.125 269.75 L 95.46875 354.84375 L 70.71875 399.40625 C 64.850589 401.78509 59.336915 395.55027 53.46875 382.71875 C 47.050446 368.78185 38.434082 340.71784 35.5 319.8125 C 32.749296 298.71868 32.930267 278.1907 36.78125 257.46875 z M 544.03125 291.75 C 544.21466 313.0221 542.54672 330.99653 539.0625 349.15625 C 534.84475 367.1224 528.60483 383.45288 522.375 396.65625 C 516.14519 409.121 510.44544 417.94433 503.84375 423.8125 L 474.15625 389.3125 L 526.03125 301.65625 L 544.03125 291.75 z M 268.75 305.875 L 351.46875 327.53125 L 377.875 389.6875 L 332.21875 449.65625 L 229.15625 428.03125 L 195.21875 360.15625 L 268.75 305.875 z M 220.71875 443.40625 L 330.03125 462.6875 L 361.375 510.71875 L 353.5 531.8125 C 338.27944 534.02323 322.85209 535.66449 306.53125 536.03125 C 289.66029 536.39803 271.69583 536.01621 255.375 534.1875 C 237.95388 531.62017 221.80777 527.0271 207.6875 522.4375 C 193.56723 517.49135 182.75452 512.00381 173.21875 505.21875 L 171.9375 480.46875 L 220.71875 443.40625 z " id="path10456" fill="#ffffff" fill-rule="evenodd" stroke-width=".183" stroke-miterlimit="10"/>
- <path d="M 151.21755,94.265209 C 143.33221,97.566052 137.64742,101.05027 131.96264,105.4514 C 126.27785,109.30238 122.24349,114.07027 118.39251,119.02153 C 113.99138,123.60603 110.32378,128.5573 107.3897,133.87532 L 143.69897,124.52293 L 143.69897,124.52293 C 146.08291,114.43703 148.65023,104.35112 151.21755,94.265209 z" i:knockout="Off" stroke-miterlimit="10" id="path10544" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 190.09415,78.311135 L 271.51493,58.506079 L 327.62926,104.90126 L 312.77547,164.13305 L 250.42622,193.10711 L 171.57275,172.20177 L 159.83642,123.97279 L 190.09415,78.311135 z" i:knockout="Off" stroke-miterlimit="10" id="path10546" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 345.23376,108.56886 L 335.33632,164.68319 L 397.1303,226.4823 L 463.1472,216.57977 L 483.5024,142.49419 L 411.2506,83.2624 L 345.23376,108.56886 z" i:knockout="Off" stroke-miterlimit="10" id="path10548" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 409.9669,247.38764 L 472.3162,236.20145 L 509.359,298.5507 L 458.1959,383.08895 L 394.0129,377.03741 L 370.5453,323.30193 L 409.9669,247.38764 z" i:knockout="Off" stroke-miterlimit="10" id="path10550" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 503.8576,423.79935 L 474.15,389.32388 L 526.0466,301.66307 L 544.0178,291.76564 C 544.2012,313.03773 542.5508,331.0039 539.0666,349.16362 C 534.8488,367.12979 528.6088,383.45571 522.379,396.65908 C 516.1492,409.12384 510.4593,417.93118 503.8576,423.79935 z" i:knockout="Off" stroke-miterlimit="10" id="path10552" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 195.22879,360.16643 L 268.76423,305.88591 L 351.46868,327.52477 L 377.8754,389.69573 L 332.21377,449.65595 L 229.15412,428.01709 L 195.22879,360.16643 z" i:knockout="Off" stroke-miterlimit="10" id="path10554" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 353.48586,531.80517 C 338.26531,534.01591 322.86138,535.65615 306.54054,536.02291 C 289.66957,536.38967 271.69831,536.02291 255.37748,534.1942 C 237.95637,531.62688 221.81891,527.04238 207.69864,522.45278 C 193.57837,517.50661 182.75894,512.0052 173.22317,505.22014 L 171.93951,480.45872 L 220.71863,443.42102 L 330.0183,462.68103 L 361.3712,510.72664 L 353.48586,531.80517 z" i:knockout="Off" stroke-miterlimit="10" id="path10556" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 95.46999,259.85749 L 162.7705,191.45669 L 235.57242,211.81189 L 254.09382,290.66536 L 178.17444,349.3521 L 112.15758,347.5132 L 95.46999,259.85749 z" i:knockout="Off" stroke-miterlimit="10" id="path10558" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
- <path d="M 70.71367,399.41488 C 64.8455,401.79373 59.3441,395.55371 53.47593,382.72219 C 47.05763,368.7853 38.43876,340.72814 35.50468,319.8228 C 32.75397,298.72899 32.93735,278.1955 36.78834,257.47355 L 75.11479,269.76002 L 95.46999,354.8535 L 70.71367,399.41488 z" i:knockout="Off" stroke-miterlimit="10" id="path10560" opacity=".202" fill="#ffffff" fill-rule="evenodd" stroke="#000000" stroke-width=".183"/>
+ <path id="path4154" d="m 289.9,534 c 140,0 252,-110 252,-244 0,-135 -113,-244 -252,-244 -139,0 -252,110 -252,244 0,135 114,244 252,244 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 289.9,534 c 140,0 252,-110 252,-244 0,-135 -113,-244 -252,-244 -139,0 -252,110 -252,244 0,135 114,244 252,244 z" id="path10456" fill="#39ac39" fill-rule="evenodd"/>
+ <path d="m83 391l-.4.8.6-.9c0 0-.1 0-.1 0" id="path4194" opacity="0.7" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 271,65 -76.25,18.700196 -28.25,43.399414 11,45.80078 74,20 58,-27.70117 14,-56 z" id="path4152" opacity="0.7" fill="#ffffff"/>
+ <path d="m 402,90 -62.04981,23.90039 -9.45019,52.90039 58,59 61.90039,-9.5 19,-71 z" id="path4150" opacity="0.7" fill="#ffffff"/>
+ <path d="m 158,100 c -7.4,3.2 -12.8,6.49922 -18,10.69922 -5.3,3.6 -9.10078,8.2 -12.80078,13 -4.1,4.4 -7.59883,9 -10.29883,14 l 33.79883,-8.89844 C 153.07032,118.69402 155.62435,108.42026 158,100 Z" id="path4148" opacity="0.7" fill="#ffffff"/>
+ <path d="m 169,193 -63.0498,65 15.5498,84.09961 61.90039,1.70117 71,-56 -17.40039,-75 z" id="path4146" opacity="0.7" fill="#ffffff"/>
+ <path d="m 459,235 -58.25,10.75 -36.84961,72.05078 22,51 60,5.79883 47.90039,-81 z" id="path4144" opacity="0.7" fill="#ffffff"/>
+ <path d="m 50.800781,256 c -3.7,19 -3.801172,39 -1.201172,59 2.3,20 10.800391,46.8 17.400391,60 4.7,12.3 10.000781,18.00078 15.800781,15.30078 L 105.59961,348.5 86.599609,267.5 Z" id="path4142" opacity="0.7" fill="#ffffff"/>
+ <path d="m 527.05078,288.19922 -16.95117,9.30078 -48.69922,84 27.90039,32.90039 c 7.57087,-8.71789 13.33843,-18.0083 17.39844,-26.20117 5.8,-13.4 11.70117,-28.59883 15.70117,-45.79883 3.3,-17.2 4.90039,-34.00117 4.65039,-54.20117 z" id="path4140" opacity="0.7" fill="#ffffff"/>
+ <path d="m 269,302 -68.59961,51.64941 32.19922,64.85058 97,20.59961 42.90039,-57 -24.80078,-59 z" id="path4138" opacity="0.7" fill="#ffffff"/>
+ <path d="m 224,434 -45.80078,35 1.20117,23.69922 c 23.6594,15.70827 51.42276,23.55601 77.19922,27.60156 C 288.166,523.45295 319.33058,522.24118 348.5,518 l -0.0996,0 7.40039,-20 -29.5,-45.80078 z" id="path10544-7-3" opacity="0.7" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/stadium.svg b/vtm-themes/resources/assets/symbols/sport/stadium.svg
old mode 100755
new mode 100644
index c7265a4f..e89caa8e
--- a/vtm-themes/resources/assets/symbols/sport/stadium.svg
+++ b/vtm-themes/resources/assets/symbols/sport/stadium.svg
@@ -1,86 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 515.17299,377.03118 c -20.79972,36.33327 -112.22974,63.68581 -221.89963,63.68581 -109.6294,0 -201.055428,-27.31618 -221.899622,-63.62941 -1.65365,4.05018 -2.593567,8.39759 -2.593567,13.0869 0,15.63105 10.372889,27.69444 23.092722,36.44025 12.719837,8.74584 29.252907,15.58444 49.178017,21.37905 39.85024,11.5892 93.24163,18.44575 152.22245,18.44575 58.98082,0 112.32234,-6.85655 152.17258,-18.44575 19.92509,-5.79461 36.50806,-12.63321 49.22788,-21.37905 12.71985,-8.74581 23.14261,-20.8092 23.14261,-36.44025 0,-4.71397 -0.97353,-9.07516 -2.64344,-13.1433 z" id="path8348" inkscape:connector-curvature="0" color="#000000" stroke-width="20" fill="#ffffff"/>
- <path d="M 53.011285,235.60069 80.898961,398.67962" id="path8386" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="27.495"/>
- <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path8390" d="M 534.81537,235.60069 504.92769,398.67962" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="27.495"/>
- <path d="m 380.16282,401.68557 0,69.53157 c 0,7.7333 -9.97321,13.95902 -22.36146,13.95902 l -119.34969,0 c -12.38825,0 -22.36144,-6.22572 -22.36144,-13.95902 l 0,-69.53157 c 15.10064,-75.61835 164.69789,-65.07936 164.07259,0 z" id="rect8396" inkscape:connector-curvature="0" sodipodi:nodetypes="csssscc" fill="#ffffff" stroke="#ffffff" stroke-width="1.833"/>
- <path d="m 293.26086,151.21526 c -67.73755,0 -129.02076,7.64529 -174.78745,20.56796 -22.883345,6.46133 -41.873216,14.08314 -56.481532,23.83526 -14.608315,9.75211 -26.550681,23.17075 -26.550681,40.60029 0,17.42953 11.942366,30.84818 26.550681,40.60029 14.608316,9.75211 33.598187,17.42748 56.481532,23.88882 45.76669,12.92266 107.0499,20.56796 174.78745,20.56796 67.73753,0 129.02075,-7.6453 174.78744,-20.56796 22.88334,-6.46134 41.92773,-14.13671 56.53604,-23.88882 14.60833,-9.75211 26.55068,-23.17076 26.55068,-40.60029 0,-17.42954 -11.94235,-30.84818 -26.55068,-40.60029 -14.60831,-9.75212 -33.6527,-17.37393 -56.53604,-23.83526 -45.76669,-12.92267 -107.04991,-20.56796 -174.78744,-20.56796 z m 0,34.27992 c 65.02777,0 123.95371,7.58484 165.19212,19.2289 20.6192,5.82203 36.78382,12.79314 46.50457,19.28246 9.72078,6.48932 11.28541,10.89799 11.28541,12.21223 0,1.31424 -1.56463,5.77647 -11.28541,12.26578 -9.72075,6.48932 -25.88537,13.46044 -46.50457,19.28247 -41.23841,11.64406 -100.16435,19.22889 -165.19212,19.22889 -65.02778,0 -123.8992,-7.58483 -165.13761,-19.22889 -20.61921,-5.82203 -36.838335,-12.79315 -46.559104,-19.28247 -9.720766,-6.48931 -11.230883,-10.95154 -11.230883,-12.26578 0,-1.31424 1.510117,-5.72291 11.230883,-12.21223 9.720769,-6.48932 25.939894,-13.46043 46.559104,-19.28246 41.23841,-11.64406 100.10983,-19.2289 165.13761,-19.2289 z" id="path8399" inkscape:connector-curvature="0" color="#000000" stroke-width="20" fill="#ffffff"/>
- <path id="path8448" d="m 454.93025,189.87027 -16.16896,-2.2584 -32.15618,69.87649 0.59472,0.99439 z m -98.62833,-18.27468 -12.91403,-1.17342 -4.92699,78.55632 1.71919,0.99439 z m -217.84102,18.27468 16.16896,-2.2584 32.15618,69.87649 -0.59472,0.99439 z m 98.62833,-18.27468 12.91403,-1.17342 4.92699,78.55632 -1.71919,0.99439 z M 296.40625,248 c -58.15272,0.73744 -116.76511,6.184 -172.6875,22.34375 65.9861,16.22062 134.61121,19.43848 202.40286,17.50329 49.43696,-1.96006 99.20082,-6.84765 146.84714,-20.22204 C 415.55493,252.49212 355.69862,247.78689 296.40625,248 z" opacity=".5" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4139" d="m 36.4,217 c 0,16.3 8.6,29 19.7,38.8 l 14.3,93 c -1.2,2.8 -2.3,8.2 -2.3,14 6,50 90,66 149,78 0.9,6.8 10,12 21,12 l 113,0 c 11.8,0 21.3,-5.9 21.3,-13.2 59.8,-14 136,-26 140,-77 0,-5.8 -1.2,-11.2 -2.5,-14.2 l 15.3,-93 c 10.6,-9.6 18.8,-22 18.8,-37.8 0,-20.8 -12.00187,-40.49045 -29.4,-46 C 363.88445,123.87221 232.26246,120.29262 65.2,170.95 48.183566,176.10979 36.4,196.4 36.4,217 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 36.4,217 c 0,16.3 8.6,29 19.7,38.8 l 14.3,93 c -1.2,2.8 -2.3,8.2 -2.3,14 6,50 90,66 149,78 0.9,6.8 10,12 21,12 l 113,0 c 11.8,0 21.3,-5.9 21.3,-13.2 59.8,-14 136,-26 140,-77 0,-5.8 -1.2,-11.2 -2.5,-14.2 l 15.3,-93 c 10.6,-9.6 18.8,-22 18.8,-37.8 0,-20.8 -12.00187,-40.49045 -29.4,-46 C 363.88445,123.87221 232.26246,120.29262 65.2,170.95 48.183566,176.10979 36.4,196.4 36.4,217 Z" id="path4155" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 492,216.7 c -13.8,10.4 -32.8,16.8 -46,20.7 -37.9,10.7 -93,17.9 -154,17.9 -60.7,0 -116,-7.2 -154,-17.9 -15.5,-6 -33.8,-9.5 -46,-20.7 13.7,-10.5 32.7,-16.8 46,-20.7 37.9,-10.7 93,-17.8 153,-17.8 60,0 116,7.2 154.5,17.8 16.4,5.7 33.9,10 46.5,20.7 z" id="path4153" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 255,180 c -6,0.3 -12,0.6 -17.9,1.1 l 9.2,44.5 c -18.3,1.2 -36.6,3 -54.8,5.9 l -19.3,-42 c -7.2,1.3 -14,2.8 -20.6,4.3 l 27.7,40 c -11.2,2 -22,4.2 -33,6.9 37.5,9.5 89,15.8 146,15.8 61,0 115,-7.1 153,-17.8 -11.9,-2.7 -23.9,-4.9 -36,-6.7 l 26,-37.5 c -6.4,-1.6 -13.3,-3 -20.5,-4.4 l -18.3,39.6 c -18.4,-2.5 -36.9,-4 -55,-4.9 l 8.8,-43 c -6,-0.5 -12,-0.9 -18.3,-1.2 l -3.1,44.8 c -24.36272,-1.46155 -48.23545,-0.74947 -70.8,0.2 z" id="path4157" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.5" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 481,359 c -33.8,22 -70,31 -107,36.5 l 0,-21.6 c 0.6,-61 -141,-71.9 -156,0 l 0,22.7 C 179,391 134,382 102,359 L 88,274 c 63,25.9 146,32.5 204,32.7 70.9,-4.2 145,-5.3 205,-33 z" id="path4149" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/swimming_outdoor.svg b/vtm-themes/resources/assets/symbols/sport/swimming_outdoor.svg
old mode 100755
new mode 100644
index 819f9edb..bb2ad43c
--- a/vtm-themes/resources/assets/symbols/sport/swimming_outdoor.svg
+++ b/vtm-themes/resources/assets/symbols/sport/swimming_outdoor.svg
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata1976"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#39AC39" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 520.67002,338.45757 C 516.5973,339.70107 511.33749,339.46262 504.43807,337.98711 C 497.42585,336.39109 491.03409,328.95069 479.38379,329.36219 C 467.45018,329.77627 450.59521,340.46638 434.30939,340.46638 C 417.79285,340.11513 399.24314,328.88917 382.38944,328.88917 C 365.59215,329.00838 350.32165,340.64201 334.2038,340.99711 C 317.80261,341.0548 301.45785,330.13135 285.3964,329.89548 C 269.10803,329.4827 253.66832,339.58312 238.45423,339.46262 C 223.46703,339.16906 210.17586,328.41739 195.30147,328.88917 C 180.03097,329.4827 163.29009,341.29323 148.35931,342.00216 C 133.31571,342.23931 119.68482,331.01847 106.39492,330.89795 C 92.9922,330.66208 77.947335,339.10752 68.898104,340.99839 C 59.848858,342.71363 54.136528,342.89054 51.987986,341.5304 L 51.987986,372.83415 C 54.136528,374.19172 59.848858,374.0161 68.898104,372.30214 C 77.947335,370.41129 92.990929,361.96583 106.39492,362.20172 C 119.6861,362.32093 133.31571,373.54178 148.35931,373.30335 C 163.29009,372.71492 180.03097,360.60571 195.30147,360.19163 C 210.17586,359.60193 223.46575,370.5869 238.45423,370.82279 C 253.66832,370.94329 269.10803,360.90312 285.3964,361.19797 C 301.45785,361.43256 317.80261,372.35726 334.2038,372.30086 C 350.32165,371.94576 365.59215,360.30957 382.38944,360.19163 C 399.24314,360.13522 417.79285,371.53298 434.30939,371.8304 C 450.59521,371.8304 467.45147,361.13643 479.38379,360.72493 C 491.03409,360.19163 497.42585,367.75253 504.43807,369.2883 C 511.33749,370.76509 516.5973,371.00096 520.67002,369.76005 L 520.67002,338.45757 z" i:knockout="Off" id="path113" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 252.64917,321.80515 L 382.04844,252.76229 C 371.87111,230.43599 364.6871,213.60535 360.50156,201.61535 C 356.20192,189.6843 354.39311,187.02684 356.82496,181.35681 C 359.3132,175.50986 355.8635,174.62405 374.8106,166.88752 C 393.75516,158.85486 450.42471,135.82093 468.91801,134.69923 C 487.01648,133.75443 486.28192,153.71684 483.28473,160.45089 C 480.00296,167.00547 463.14926,168.65917 450.36829,173.85744 C 437.41554,178.81855 423.1642,184.36937 406.70661,190.51244 L 465.91955,320.80137 C 458.28559,327.35596 448.1608,329.89804 434.47478,328.89173 C 420.56185,327.53671 402.01085,314.30708 384.70593,314.24426 C 367.45609,314.30708 347.77443,329.07119 331.99629,329.36475 C 316.16045,329.3045 303.60511,316.54919 290.37033,315.25187 C 277.08171,313.94812 264.58277,316.13255 252.64917,321.80515 z" i:knockout="Off" id="path115" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 485.13331,209.06343 C 505.08288,209.06343 521.27127,225.96969 521.27127,246.80254 C 521.27127,267.63539 505.08162,284.54164 485.13331,284.54164 C 465.185,284.54164 448.99406,267.63539 448.99406,246.80254 C 448.99406,225.96969 465.18371,209.06343 485.13331,209.06343" i:knockout="Off" id="path117" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 165.32709,324.34338 C 150.00019,321.50773 134.39126,317.14144 117.42475,311.23041 C 100.34415,304.97325 71.218417,296.58422 64.317713,288.37466 C 57.418297,279.92922 62.451206,263.03834 76.365405,262.27045 C 90.333465,261.50258 118.0465,273.90537 146.83379,284.1827 C 175.45059,294.34337 208.19654,307.04101 246.82531,322.92813 C 242.07444,325.52663 235.79674,326.35348 227.76539,325.17152 C 219.62119,323.81138 209.3285,316.31074 198.86527,316.07614 C 188.34565,315.89795 177.3171,318.73361 165.32709,324.34338 z" i:knockout="Off" id="path119" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 520.67002,390.848 C 516.5973,391.96842 511.33749,391.7928 504.43807,390.316 C 497.42585,388.78151 491.03409,381.21806 479.38379,381.75007 C 467.45018,382.16285 450.59521,392.85296 434.30939,392.85296 C 417.79285,392.50042 399.24314,381.27831 382.38944,381.27831 C 365.59215,381.39753 350.32165,393.03245 334.2038,393.38497 C 317.80261,393.44522 301.45785,382.51923 285.3964,382.28207 C 269.10803,381.86799 253.66832,391.96842 238.45423,391.85049 C 223.46703,391.55564 210.17586,380.80527 195.30147,381.27831 C 180.03097,381.86799 163.29009,393.67982 148.35931,394.39131 C 133.31571,394.6259 119.68482,383.40377 106.39492,383.28583 C 92.9922,383.05123 77.947335,391.49539 68.898104,393.38626 C 59.848858,395.21943 54.136528,395.15791 51.987986,393.8593 L 51.987986,425.16176 C 54.136528,426.46036 59.848858,426.5219 68.898104,424.68873 C 77.947335,422.79658 92.990929,414.35371 106.39492,414.58831 C 119.6861,414.70624 133.31571,425.92836 148.35931,425.69376 C 163.29009,424.98229 180.03097,413.17047 195.30147,412.58078 C 210.17586,412.10775 223.46575,422.85811 238.45423,423.15296 C 253.66832,423.2709 269.10803,413.17047 285.3964,413.58453 C 301.45785,413.8217 317.80261,424.7477 334.2038,424.68745 C 350.32165,424.3349 365.59215,412.69616 382.38944,412.58078 C 399.24314,412.58078 417.79285,423.8029 434.30939,424.15544 C 450.59521,424.15544 467.45147,413.46532 479.38379,413.05252 C 491.03409,412.63846 497.42585,420.07885 504.43807,421.67615 C 511.33749,423.15296 516.5973,423.39011 520.67002,422.15049 L 520.67002,390.848 z" i:knockout="Off" id="path121" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 518.98652,442.22225 C 514.9138,443.34267 509.65399,443.16705 502.75457,441.69025 C 495.74235,440.15576 489.35059,432.59231 477.70029,433.12432 C 465.76668,433.5371 448.91171,444.22721 432.62589,444.22721 C 416.10935,443.87467 397.55964,432.65256 380.70594,432.65256 C 363.90865,432.77178 348.63815,444.4067 332.5203,444.75922 C 316.11911,444.81947 299.77435,433.89348 283.7129,433.65632 C 267.42453,433.24224 251.98482,443.34267 236.77073,443.22474 C 221.78353,442.92989 208.49236,432.17952 193.61797,432.65256 C 178.34747,433.24224 161.60659,445.05407 146.67581,445.76556 C 131.63221,446.00015 118.00132,434.77802 104.71142,434.66008 C 91.3087,434.42548 76.26383,442.86964 67.2146,444.76051 C 58.16536,446.59368 52.45303,446.53216 50.30448,445.23355 L 50.30448,476.53601 C 52.45303,477.83461 58.16536,477.89615 67.2146,476.06298 C 76.26383,474.17083 91.30743,465.72796 104.71142,465.96256 C 118.0026,466.08049 131.63221,477.30261 146.67581,477.06801 C 161.60659,476.35654 178.34747,464.54472 193.61797,463.95503 C 208.49236,463.482 221.78225,474.23236 236.77073,474.52721 C 251.98482,474.64515 267.42453,464.54472 283.7129,464.95878 C 299.77435,465.19595 316.11911,476.12195 332.5203,476.0617 C 348.63815,475.70915 363.90865,464.07041 380.70594,463.95503 C 397.55964,463.95503 416.10935,475.17715 432.62589,475.52969 C 448.91171,475.52969 465.76797,464.83957 477.70029,464.42677 C 489.35059,464.01271 495.74235,471.4531 502.75457,473.0504 C 509.65399,474.52721 514.9138,474.76436 518.98652,473.52474 L 518.98652,442.22225 z" i:knockout="Off" id="path4736" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4143" d="M 543.88672,290 C 543.88672,430.21776 430.21776,543.88672 290,543.88672 149.78224,543.88672 36.113281,430.21776 36.113281,290 36.113282,149.78224 149.78224,36.113282 290,36.113281 430.21776,36.113281 543.88672,149.78224 543.88672,290 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 543.88672,290 C 543.88672,430.21776 430.21776,543.88672 290,543.88672 149.78224,543.88672 36.113281,430.21776 36.113281,290 36.113282,149.78224 149.78224,36.113282 290,36.113281 430.21776,36.113281 543.88672,149.78224 543.88672,290 Z" id="path3267-7" fill="#39ac39"/>
+ <path d="m 363.82245,152.60823 c -15.6238,6.44481 -12.69434,7.12835 -14.94026,12.01079 -2.05063,4.68714 -0.48825,6.93306 3.02711,16.79558 3.51535,9.96018 9.37428,23.8263 17.86972,41.98896 l -107.41361,57.61276 c 9.76487,-4.68714 20.21329,-6.54247 31.24759,-5.46833 10.93666,1.07413 21.38508,11.6202 34.17706,11.71785 13.08493,-0.29295 29.29462,-12.49904 43.64899,-12.49904 14.35436,0.0976 29.68521,11.0343 41.01247,12.10844 11.32725,0.87884 19.52974,-1.26943 26.07221,-6.73776 L 390.5782,171.84503 c 13.57317,-5.07774 25.38867,-9.66723 36.13003,-13.67082 10.54607,-4.29655 24.41219,-5.66363 27.244,-11.13196 2.44122,-5.37068 3.02711,-21.09213 -10.59489,-21.2386 -27.44152,5.14858 -53.79222,16.10333 -79.53489,26.80458 z m 61.81165,65.81525 c 0,17.28382 13.37787,31.24759 29.88051,31.24759 16.50264,0 29.88051,-13.96377 29.88051,-31.24759 0,-17.28383 -13.37787,-31.2476 -29.88051,-31.2476 -16.50264,0 -29.88051,13.96377 -29.88051,31.2476 z m -308.08177,12.69433 c -11.52255,0.68354 -15.6238,14.64731 -9.96017,21.48272 5.66363,6.83542 29.78286,13.67083 43.94193,18.94386 14.06142,4.88244 26.95105,8.49544 39.64539,10.74136 9.96017,-4.68714 19.0415,-7.03071 27.73224,-6.83541 8.69074,0.1953 17.18618,6.44481 23.92394,7.51895 6.64011,0.97649 11.71785,0.29295 15.8191,-1.85533 -32.02879,-13.18257 -58.58925,-23.43569 -83.00143,-32.02878 -19.03067,-6.32229 -41.40913,-18.29503 -58.101,-17.96737 z m 59.66338,66.40114 c -12.49904,0.1953 -23.72864,-9.08133 -34.76295,-9.17898 -11.13196,-0.1953 -23.4357,6.83541 -31.0523,8.39779 -7.51895,1.36709 -12.206092,1.56238 -13.963769,0.3906 l 0,25.87691 c 1.757677,1.07414 6.542469,0.97649 13.963769,-0.39059 7.51895,-1.56238 19.92034,-8.59309 31.0523,-8.39779 11.03431,0.0977 22.26391,9.37428 34.76295,9.17898 12.40139,-0.48825 26.16986,-10.54607 38.8642,-10.74136 12.30374,-0.48825 23.33804,8.59309 35.73943,8.78838 12.59669,0.0977 25.38868,-8.20249 38.8642,-8.00719 13.28023,0.19529 26.8534,9.27663 40.03598,9.17898 13.37788,-0.29295 25.97457,-9.96017 39.93834,-10.05782 13.96377,-0.0976 29.29462,9.37428 42.96544,9.66722 13.47553,0 27.34165,-8.88603 37.10652,-9.17898 9.66723,-0.39059 14.94026,5.85893 20.50624,7.12836 5.76127,1.26943 10.05782,1.36708 13.47552,0.39059 l 0,-25.87691 c -3.32006,1.07414 -7.71425,0.87884 -13.47552,-0.3906 -5.76128,-1.36708 -11.13196,-7.51895 -20.50624,-7.12835 -9.76487,0.39059 -23.82629,9.17898 -37.10652,9.17898 -13.67082,-0.29295 -29.00167,-9.56958 -42.96544,-9.56958 -13.86612,0.0977 -26.36516,9.76488 -39.93834,10.05782 -13.57317,0.0976 -27.14635,-8.98368 -40.03598,-9.17898 -13.47552,-0.39059 -26.26751,8.0072 -38.8642,7.90955 -12.01079,-0.1953 -22.75215,-8.59309 -34.56765,-8.78839 -16.02853,-0.35278 -26.67597,9.86942 -40.03598,10.74136 z m 0,42.96545 c -12.49904,0.19529 -23.72864,-9.08134 -34.76295,-9.17898 -11.13196,-0.1953 -23.4357,6.83541 -31.0523,8.39779 -7.51895,1.56238 -12.206092,1.46473 -13.963769,0.39059 l 0,25.87692 c 1.757677,1.07413 6.542469,1.07413 13.963769,-0.3906 7.51895,-1.56238 19.92034,-8.59309 31.0523,-8.39779 11.03431,0.0977 22.26391,9.37428 34.76295,9.17898 12.40139,-0.58589 26.16986,-10.35076 38.8642,-10.74136 12.30374,-0.39059 23.33804,8.49544 35.73943,8.78839 12.59669,0.0976 25.38868,-8.30015 38.8642,-7.90955 13.28023,0.1953 26.8534,9.27663 40.03598,9.17898 13.37788,-0.29295 25.97457,-9.96017 39.93834,-10.05782 13.96377,0 29.29462,9.27663 42.96544,9.56958 13.47553,0 27.34165,-8.88604 37.10652,-9.17898 9.66723,-0.3906 14.94026,5.85892 20.50624,7.12835 5.76127,1.26944 10.05782,1.36709 13.47552,0.3906 l 0,-25.87692 c -3.32006,0.87884 -7.71425,0.78119 -13.47552,-0.39059 -5.76128,-1.26943 -11.13196,-7.51895 -20.50624,-7.12836 -9.76487,0.3906 -23.82629,9.17898 -37.10652,9.17898 -13.67082,-0.29294 -29.00167,-9.56957 -42.96544,-9.56957 -13.86612,0.0976 -26.36516,9.76487 -39.93834,10.05782 -13.57317,0.0976 -27.14635,-8.98369 -40.03598,-9.17899 -13.47552,-0.39059 -26.26751,8.0072 -38.8642,7.90955 -12.01079,-0.1953 -22.75215,-8.59309 -34.56765,-8.78838 -16.02852,-0.35279 -26.67597,9.86941 -40.03598,10.74136 z m -1.36708,42.57485 c -12.49904,0.19529 -23.72865,-9.08134 -34.76295,-9.17898 -11.13196,-0.1953 -23.4357,6.83541 -31.0523,8.39779 -7.51896,1.56238 -12.206094,1.46473 -13.963772,0.39059 l 0,25.87692 c 1.757678,1.07413 6.542462,1.07413 13.963772,-0.3906 7.51895,-1.56238 19.92034,-8.59309 31.0523,-8.39779 11.0343,0.0976 22.26391,9.37428 34.76295,9.17898 12.40139,-0.58589 26.16986,-10.35076 38.86419,-10.74136 12.30374,-0.39059 23.33805,8.49544 35.73944,8.78839 12.59669,0.0977 25.38867,-8.30015 38.8642,-7.90955 13.28023,0.1953 26.8534,9.27663 40.03598,9.17898 13.37788,-0.29295 25.97457,-9.96017 39.93833,-10.05782 13.96377,0 29.29463,9.27663 42.96545,9.56958 13.47552,0 27.34165,-8.88604 37.10652,-9.17898 9.66722,-0.3906 14.94026,5.85892 20.50623,7.12835 5.76128,1.26944 10.05782,1.36709 13.47553,0.3906 l 0,-25.87692 c -3.32006,0.87884 -7.71425,0.78119 -13.47553,-0.39059 -5.76127,-1.26944 -11.13195,-7.51895 -20.50623,-7.12836 -9.76487,0.3906 -23.82629,9.17898 -37.10652,9.17898 -13.67082,-0.29294 -29.00168,-9.56957 -42.96545,-9.56957 -13.86612,0.0976 -26.36515,9.76487 -39.93833,10.05782 -13.57317,0.0976 -27.14635,-8.98369 -40.03598,-9.17899 -13.47553,-0.39059 -26.26751,8.0072 -38.8642,7.90955 -12.01079,-0.1953 -22.75215,-8.59309 -34.56765,-8.78838 -16.02852,-0.35279 -26.67598,9.86941 -40.03598,10.74136 z" id="path113" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/sport/tennis.svg b/vtm-themes/resources/assets/symbols/sport/tennis.svg
old mode 100755
new mode 100644
index 05041311..793d0484
--- a/vtm-themes/resources/assets/symbols/sport/tennis.svg
+++ b/vtm-themes/resources/assets/symbols/sport/tennis.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.896,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.314 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" id="path1329" inkscape:connector-curvature="0" fill="#39AC39" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <circle cx="171.59" cy="397.93" r="50.55" id="circle2441" fill="#ffffff"/>
- <path d="M 285.113,104.116 C 231.611,50.615 157.245,39.652 111.872,83.61 c -49.437,47.896 -32.996,119.739 20.506,173.241 41.901,41.901 91.901,63.271 137.089,45.097 18.605,6.366 50.105,19.328 80.532,41.943 -1.016,4.799 0.331,9.996 4.058,13.723 l 90.51,90.51 c 5.857,5.858 15.355,5.858 21.213,10e-4 l 10.606,-10.606 c 5.857,-5.858 5.857,-15.355 0,-21.214 l -90.51,-90.509 c -3.727,-3.727 -8.923,-5.072 -13.722,-4.058 -22.709,-30.555 -35.684,-62.186 -42.022,-80.761 17.662,-44.908 -3.277,-95.118 -45.019,-136.861 z m 58.886,211.623 c -19.857,-10.854 -38.697,-19.558 -55.349,-26.429 5.108,-4.233 10.157,-8.811 15.132,-13.786 4.976,-4.975 9.55,-10.033 13.776,-15.159 6.876,16.658 15.582,35.506 26.441,55.374 z" id="path2443" inkscape:connector-curvature="0" fill="#ffffff"/>
+ <path id="path4139" d="M 181.12305,56.443359 C 155.30805,56.396903 130.98438,65.26875 112,84 c -49,47.9 -33,120 20.5,173 41.9,41.9 92,63 137,45 18.6,6.4 50,19.30039 81,41.90039 -1,4.8 0.29961,9.99922 4.09961,13.69922 l 91,91 c 5.9,5.9 15.4,5.9 21,0 L 477.19922,438 c 5.9,-5.9 5.9,-15.4 0,-21 l -90,-90 c -3.7,-3.7 -8.89922,-5.09961 -13.69922,-4.09961 -22.7,-30.6 -35.7,-62 -42,-81 17.7,-44.9 -3.3,-95.00117 -45.75,-137.45117 C 254.67578,73.317188 216.49915,56.507022 181.12305,56.443359 Z M 319.19922,261.5 c 6.9,16.7 15.60078,35.49922 26.30078,55.19922 -20,-10.7 -38.79961,-19.39922 -55.09961,-26.19922 5.1,-4.2 10.2,-8.80078 15,-13.80078 5,-5 9.59883,-9.99922 13.79883,-15.19922 z M 172,347 c -28.16652,0 -51,22.83348 -51,51 0,28.16652 22.83348,51 51,51 28.16652,0 51,-22.83348 51,-51 0,-28.16652 -22.83348,-51 -51,-51 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 181.12305,56.443359 C 155.30805,56.396903 130.98438,65.26875 112,84 c -49,47.9 -33,120 20.5,173 41.9,41.9 92,63 137,45 18.6,6.4 50,19.30039 81,41.90039 -1,4.8 0.29961,9.99922 4.09961,13.69922 l 91,91 c 5.9,5.9 15.4,5.9 21,0 L 477.19922,438 c 5.9,-5.9 5.9,-15.4 0,-21 l -90,-90 c -3.7,-3.7 -8.89922,-5.09961 -13.69922,-4.09961 -22.7,-30.6 -35.7,-62 -42,-81 17.7,-44.9 -3.3,-95.00117 -45.75,-137.45117 C 254.67578,73.317188 216.49915,56.507022 181.12305,56.443359 Z M 319.19922,261.5 c 6.9,16.7 15.60078,35.49922 26.30078,55.19922 -20,-10.7 -38.79961,-19.39922 -55.09961,-26.19922 5.1,-4.2 10.2,-8.80078 15,-13.80078 5,-5 9.59883,-9.99922 13.79883,-15.19922 z M 172,347 c -28.16652,0 -51,22.83348 -51,51 0,28.16652 22.83348,51 51,51 28.16652,0 51,-22.83348 51,-51 0,-28.16652 -22.83348,-51 -51,-51 z" id="circle2441" fill="#39ac39"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/archaeological2.svg b/vtm-themes/resources/assets/symbols/tourist/archaeological2.svg
old mode 100755
new mode 100644
index 708b605c..b5c15b43
--- a/vtm-themes/resources/assets/symbols/tourist/archaeological2.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/archaeological2.svg
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 267.96875 50.75 C 266.59016 50.733287 265.25398 50.7811 264.03125 50.875 C 257.85906 51.348974 250.18948 53.312633 247.28125 55.15625 C 246.03908 55.943693 243.5692 57.409906 241.78125 58.4375 C 237.066 61.147574 225.84467 73.383628 220.8125 81.3125 C 217.61382 86.352459 214.10046 92.131556 212.90625 94.28125 C 212.63315 94.772826 211.09349 97.002404 209.5 99.25 C 207.90652 101.49759 205.97821 104.53391 205.1875 106 C 204.39681 107.46608 203.55493 108.69242 203.34375 108.71875 C 203.13259 108.74506 201.631 110.90965 200 113.53125 C 192.86213 125.00432 184.0611 135.87915 180.59375 137.46875 C 175.90847 139.6167 167.95117 146.86437 163.5 153.0625 C 161.89772 155.2936 159.20213 158.97351 157.53125 161.25 C 153.7998 166.33397 147.68751 176.89384 145.5625 181.90625 C 144.69427 183.95419 143.25532 187.36705 142.34375 189.5 C 140.40659 194.0327 137.0853 203.10134 136.875 204.46875 C 136.7949 204.98961 136.31802 206.75971 135.8125 208.375 C 135.30698 209.99031 134.56519 212.56933 134.15625 214.125 C 133.74733 215.6807 132.79109 219.28869 132.03125 222.15625 C 131.27144 225.02378 130.4824 228.26873 130.28125 229.34375 C 130.08011 230.41876 129.84916 231.39246 129.75 231.5 C 129.58921 231.67439 128.52887 236.72319 127.59375 241.90625 C 127.40674 242.94275 127.17735 243.90668 127.0625 244.03125 C 126.70512 244.41886 124.15726 262.44881 124.3125 263.5 C 124.39327 264.04721 124.35361 264.60045 124.21875 264.75 C 124.08385 264.89957 123.83353 266.84719 123.65625 269.0625 C 123.47899 271.2778 123.24591 273.98706 123.15625 275.09375 C 123.06656 276.20044 122.91544 278.49835 122.8125 280.1875 C 122.70955 281.87662 122.54264 284.25891 122.4375 285.5 C 122.15608 288.82206 122.05966 290.56397 122 293.0625 C 121.97063 294.2932 121.87761 295.36687 121.8125 295.4375 C 121.60357 295.66409 121.216 305.11771 121.3125 307.5625 C 121.36376 308.8613 121.41687 310.72122 121.4375 311.71875 C 121.63662 321.35362 122.74099 333.1701 124.59375 345.34375 C 125.70525 352.64685 126.36875 359.07551 126.34375 362.5625 C 126.32296 365.46768 126.32287 365.47107 124.96875 365.0625 C 124.22401 364.83781 122.49722 364.04958 121.125 363.3125 C 119.75276 362.57541 117.66886 361.70606 116.5 361.375 C 115.33113 361.04393 114.21041 360.62681 114 360.4375 C 113.78959 360.24817 111.14724 359.69407 108.15625 359.1875 C 105.16524 358.68092 102.15134 357.98514 101.4375 357.65625 C 99.005606 356.53573 92.160853 354.96547 88.65625 354.71875 C 81.044903 354.1829 73.263748 356.99391 70.46875 361.28125 C 68.049904 364.99163 66.516343 371.17509 66.90625 375.6875 C 67.443714 381.90774 70.844221 394.70874 72.3125 396.0625 C 72.443065 396.18289 72.794066 396.9732 73.09375 397.84375 C 73.657599 399.4814 75.544576 402.68958 78.78125 407.5 C 79.811048 409.03056 80.846294 410.78593 81.09375 411.40625 C 81.54231 412.53061 86.355218 419.07865 93.75 428.5625 C 95.89369 431.31181 98.090247 434.16248 98.625 434.90625 C 99.014999 435.44878 104.02733 440.17756 110.9375 446.59375 C 129.25303 445.68729 148.97219 445.70661 168.15625 447.625 C 233.25495 454.13491 263.64735 456.3049 324.40625 447.625 C 337.52214 445.75131 351.89635 443.99982 366.71875 442.4375 C 373.15722 440.39741 377.9689 438.64243 381.90625 436.875 C 383.20762 436.29084 385.30202 435.44197 386.5625 434.96875 C 393.65302 432.30669 409.99398 423.0864 416.03125 418.34375 C 417.68551 417.04422 419.62808 415.66211 420.34375 415.28125 C 423.81662 413.43323 428.53661 409.08721 436.5 400.4375 C 445.15793 391.03335 445.39184 390.75352 450.46875 381.5 C 453.99514 375.07243 466.23802 362.37011 473.28125 357.84375 C 474.23147 357.23314 476.29868 355.75396 477.875 354.53125 C 482.71858 350.77417 485.53961 348.71052 487.21875 347.71875 C 488.10331 347.19628 489.41429 346.24774 490.15625 345.59375 C 490.8982 344.9398 492.69039 343.52474 494.125 342.46875 C 507.05377 332.95229 516.28866 324.30998 520.59375 317.71875 C 523.14984 313.80534 524.86093 308.63291 526 301.4375 C 526.8713 295.93363 526.84648 295.22254 525.46875 287.96875 C 523.57869 278.01712 519.85092 267.76171 516.3125 262.8125 C 510.96005 255.32593 507.64221 252.15802 499.375 246.71875 C 495.93079 244.45272 488.14835 240.87923 486.59375 240.84375 C 486.05135 240.83136 485.40721 240.63151 485.15625 240.40625 C 484.90525 240.1809 481.43861 239.54802 477.46875 239 C 473.49887 238.45198 470.13555 237.9 469.96875 237.75 C 469.2018 237.06024 478.41884 228.68189 480.9375 227.78125 C 482.20335 227.32861 483.81503 228.06898 487.40625 230.8125 C 489.95969 232.7632 491.72054 233.21023 494.0625 232.46875 C 494.92659 232.19521 500.00852 230.8927 505.375 229.59375 C 519.70918 226.12415 520.40757 225.91481 520.59375 225.21875 C 520.84952 224.26256 519.94104 222.98084 514.15625 216.09375 C 511.24712 212.63028 508.47686 209.30468 508 208.71875 C 504.89107 204.89893 496.35129 196.49823 478.3125 179.5625 C 455.25935 157.91903 392.46963 100.1163 390.09375 98.34375 C 389.25013 97.714349 383.88551 93.040504 378.1875 87.96875 C 361.79428 73.377233 342.03357 57.109939 337.28125 54.3125 C 335.01625 52.979219 334.77009 53.248073 334 58 C 333.65988 60.098764 332.74748 63.783387 331.96875 66.1875 C 329.44354 73.983576 328.06795 78.897989 327.9375 80.5 C 327.76897 82.569417 329.73162 86.332753 332.5625 89.3125 C 333.8056 90.620992 334.85943 92.051171 334.90625 92.5 C 335.06592 94.030785 332.71843 97.957379 328.90625 102.5625 C 325.09907 107.16159 325.09669 107.18039 324.84375 105.1875 C 324.35428 101.33057 322.05063 89.727233 321.46875 88.21875 C 319.36574 82.767072 314.58433 75.65243 308.96875 69.59375 C 304.64502 64.928821 294.50227 57.846888 288.4375 55.25 C 284.59366 53.604098 279.04611 51.894937 278.71875 52.25 C 278.58848 52.391297 278.10443 52.272539 277.625 52 C 276.4178 51.313764 272.10453 50.800139 267.96875 50.75 z M 273.34375 67.25 C 277.40498 67.172193 281.85226 68.072529 285.21875 69.84375 C 288.64405 71.645908 289.22727 72.099159 293.65625 76.40625 C 298.25399 80.877474 298.47819 81.150024 300.375 84.90625 C 303.96023 92.006022 305.44034 97.697781 305.34375 104.09375 C 305.27323 108.76452 303.94724 117.14209 303.15625 118 C 302.82931 118.35459 302.52366 119.04646 302.46875 119.53125 C 302.24688 121.48996 299.34507 126.21101 296.4375 129.375 C 292.99898 133.11676 292.91201 133.17046 285.9375 133.78125 C 272.26396 134.97878 266.63916 134.55765 251 131.1875 C 248.13941 130.57106 245.10082 129.93035 244.25 129.75 C 243.39922 129.56963 240.92281 128.98023 238.75 128.46875 C 236.57721 127.95725 233.46879 127.37934 231.84375 127.15625 C 230.2187 126.93313 228.36438 126.51356 227.71875 126.25 C 226.19586 125.62833 225.81974 125.24928 225.71875 124.28125 C 225.60267 123.16828 227.31976 118.65222 228.625 116.625 C 229.72112 114.92257 232.06732 110.75102 233.84375 107.34375 C 234.36724 106.33969 235.81675 103.91099 237.0625 101.9375 C 238.30825 99.964012 240.17839 96.836708 241.25 95 C 248.60286 82.397547 258.72968 71.894244 266.78125 68.46875 C 268.60637 67.692268 270.90701 67.296684 273.34375 67.25 z M 479.0625 260.46875 C 487.11317 260.66102 494.68675 262.89084 499.8125 267.09375 C 504.35626 270.81944 507.85553 276.18157 508.625 280.65625 C 509.40964 285.21933 508.31734 293.49619 506.28125 298.53125 C 504.74305 302.3351 504.47263 302.71227 498.09375 309.625 C 492.92917 315.22172 490.77347 317.24517 488.21875 318.90625 C 486.42206 320.07446 483.75011 321.8818 482.28125 322.90625 C 480.8124 323.9307 477.97407 325.82054 475.96875 327.09375 C 473.96347 328.36695 470.9575 330.30691 469.28125 331.4375 C 464.93313 334.37034 459.21474 337.28938 457.15625 337.59375 C 454.93198 337.92262 454.76415 337.75524 454.53125 334.875 C 454.35695 332.71939 450.73565 317.87285 449.25 313.25 C 448.07561 309.59565 445.53114 297.12684 445.0625 292.65625 C 443.82168 280.81974 447.98461 270.22955 455.5 266.03125 C 462.50504 262.11805 471.01183 260.27648 479.0625 260.46875 z " id="path8938" fill="#ffffff" stroke="#ffffff" stroke-width="4.716"/>
- <path d="M 55.895722,502.66176 C 81.761522,498.62856 128.61643,493.1521 172.51157,497.54157 C 237.61025,504.05149 267.98965,506.22147 328.74855,497.54157 C 382.42864,489.87303 456.43424,483.89819 501.38234,487.09948" id="path9010" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="bevel" stroke-linecap="square" stroke-width="40"/>
+ <path id="path4140" d="M 272.58789 49.798828 C 269.5625 49.85 266.375 50.175781 263 50.800781 C 240 55.700781 226 76.800781 215 95.800781 C 203 117.10078 187.10078 135.39961 168.30078 150.59961 C 126.30078 216.39961 120.29922 287.59961 128.69922 357.59961 C 113.09922 363.99961 89.799609 340.89961 75.099609 359.59961 C 61.199609 382.39961 80.399609 406.59961 93.099609 425.59961 C 104.09961 447.49961 123.49961 453.19961 146.09961 449.59961 C 200.89961 451.69961 256.09961 462.10039 310.09961 453.40039 C 371.09961 449.50039 430.09961 431.80039 463.09961 376.40039 C 483.69961 351.70039 520.09961 341.60039 532.09961 309.40039 C 540.39961 277.60039 516.49922 240.59961 483.19922 237.59961 C 481.99922 224.79961 504.59922 241.5 513.19922 233 C 545.09922 225.1 504.90039 202 496.40039 190 C 450.00039 146 403 102 354 61 C 336 40 328 79 334 92 C 336 113 325 88 321 80 C 307 62.5 293.76562 49.440625 272.58789 49.798828 z M 275 72.099609 C 306.8 72.499609 311.00039 119.80078 295.90039 132.80078 L 296 132.80078 C 274.7 137.30078 253 130.39922 233 125.69922 C 247.2 107.09922 255 80.899609 275 72.099609 z M 481 264.84961 C 506.6 265.19961 519 294 501 309 C 491.2 317 469 339.79922 461 331.69922 C 450.1 301.69922 440.2 264.69961 481 264.84961 z M 472.33398 468.53516 C 424.95334 468.72221 377.71875 473.81875 331 480 C 285 487.8 238 486.39961 192 481.09961 C 141 474.69961 89 479.70078 38 488.30078 L 44.199219 527.80078 C 95.199219 518.90078 147.19922 514.80039 199.19922 521.90039 C 248.19922 527.40039 298.19922 526.39922 347.19922 518.19922 C 406.09922 511.09922 466.19922 505.29922 525.19922 510.69922 L 528 470.80078 C 509.4375 469.14141 490.87424 468.46196 472.33398 468.53516 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 272.58789,49.798828 C 269.5625,49.85 266.375,50.175781 263,50.800781 c -23,4.9 -37,26 -48,45 -12,21.299999 -27.89922,39.598829 -46.69922,54.798829 -42,65.8 -48.00156,137 -39.60156,207 -15.6,6.4 -38.899611,-16.7 -53.599611,2 -13.9,22.8 5.3,47 18,66 11.000001,21.9 30.400001,27.6 53.000001,24 54.8,2.1 110,12.50078 164,3.80078 61,-3.9 120,-21.6 153,-77 20.6,-24.7 57,-34.8 69,-67 8.3,-31.8 -15.60039,-68.80078 -48.90039,-71.80078 -1.2,-12.8 21.4,3.90039 30,-4.59961 31.9,-7.9 -8.29883,-31 -16.79883,-43 C 450.00039,146 403,102 354,61 336,40 328,79 334,92 336,113 325,88 321,80 307,62.5 293.76562,49.440625 272.58789,49.798828 Z M 275,72.099609 c 31.8,0.4 36.00039,47.701171 20.90039,60.701171 l 0.0996,0 c -21.3,4.5 -43,-2.40156 -63,-7.10156 14.2,-18.6 22,-44.799611 42,-53.599611 z M 481,264.84961 c 25.6,0.35 38,29.15039 20,44.15039 -9.8,8 -32,30.79922 -40,22.69922 -10.9,-30 -20.8,-66.99961 20,-66.84961 z m -8.66602,203.68555 C 424.95334,468.72221 377.71875,473.81875 331,480 c -46,7.8 -93,6.39961 -139,1.09961 -51,-6.4 -103,-1.39883 -154,7.20117 l 6.199219,39.5 c 51,-8.9 103.000001,-13.00039 155.000001,-5.90039 49,5.5 99,4.49883 148,-3.70117 58.9,-7.1 119,-12.9 178,-7.5 L 528,470.80078 c -18.5625,-1.65937 -37.12576,-2.33882 -55.66602,-2.26562 z" id="path4170" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/attraction.svg b/vtm-themes/resources/assets/symbols/tourist/attraction.svg
old mode 100755
new mode 100644
index ede1e880..d6dd9699
--- a/vtm-themes/resources/assets/symbols/tourist/attraction.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/attraction.svg
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g4670" transform="translate(-4,0)">
-  <path transform="translate(30.687831,46.031746)" d="M 411.21693,457.24867 267.60639,382.68184 124.76501,458.71169 151.30418,299.08753 34.85508,186.73183 194.86773,162.6455 265.73961,17.175999 338.09369,161.91399 498.34402,184.3646 383.04866,297.90393 411.21693,457.24867 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.565689" sodipodi:arg1="0.93737044" sodipodi:r2="121.83687" sodipodi:r1="243.67374" sodipodi:cy="260.84656" sodipodi:cx="266.98413" sodipodi:sides="5" id="path4629" sodipodi:type="star" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="16"/>
-  <path sodipodi:type="star" id="path4631" sodipodi:sides="5" sodipodi:cx="266.98413" sodipodi:cy="260.84656" sodipodi:r1="243.67374" sodipodi:r2="121.83687" sodipodi:arg1="0.93737044" sodipodi:arg2="1.565689" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 411.21693,457.24867 267.60639,382.68184 124.76501,458.71169 151.30418,299.08753 34.85508,186.73183 194.86773,162.6455 265.73961,17.175999 338.09369,161.91399 498.34402,184.3646 383.04866,297.90393 411.21693,457.24867 z" transform="translate(30.687831,46.031746)" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="20"/>
- </g>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4136" d="m 217,211 c -48.6,7.6 -97,13.9 -146,22 -14.3,8.6 -0.2,21.6 7.9,28.4 l 93,89 c -7.6,48.6 -16.4,97 -23,146 3.8,16.2 20.5,7 29.5,1.3 l 114,-61 c 43.7,22.4 87,46 131,68 16.6,1.5 13,-17.3 10.4,-27.6 L 410,349 c 34.8,-34.6 71,-68 105,-104 6.5,-15.3 -12.5,-17.6 -23,-18.3 L 364,209 c -22,-43 -43,-87 -66,-131 -2,-2.3 -5,-3.6 -8.4,-3.8 -13,1.7 -14,17.2 -19.8,26.55 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 217,211 c -48.6,7.6 -97,13.9 -146,22 -14.3,8.6 -0.2,21.6 7.9,28.4 l 93,89 c -7.6,48.6 -16.4,97 -23,146 3.8,16.2 20.5,7 29.5,1.3 l 114,-61 c 43.7,22.4 87,46 131,68 16.6,1.5 13,-17.3 10.4,-27.6 L 410,349 c 34.8,-34.6 71,-68 105,-104 6.5,-15.3 -12.5,-17.6 -23,-18.3 L 364,209 c -22,-43 -43,-87 -66,-131 -2,-2.3 -5,-3.6 -8.4,-3.8 -13,1.7 -14,17.2 -19.8,26.55 z" id="path4631-1" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/castle2.svg b/vtm-themes/resources/assets/symbols/tourist/castle2.svg
old mode 100755
new mode 100644
index 9699e3b0..2d60f741
--- a/vtm-themes/resources/assets/symbols/tourist/castle2.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/castle2.svg
@@ -1,76 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 49.302816,232.71463 0.353768,-96.69793 32.160709,0 0,32.16103 32.160707,0 0,-32.16103 32.16071,0 0,32.16103 32.16071,0 0,-32.16103 32.16071,0 0,96.48342 -32.16071,0 0,64.31916 32.16071,0 0,-32.15813 32.16071,0 0,32.15813 32.16071,0 0,-32.15813 32.16071,0 0,32.15813 0,32.16103 0,32.16104 3.83929,0 0,12.16103 -68.16071,0 0,84.32206 -160.803547,0 0,-225.12432 -32.516085,0.28944 0.0016,-0.0749 8e-6,-3e-5 z" id="path2958" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="6"/>
- <path d="m 532.24315,232.71463 -0.35056,-96.69793 -32.11665,0 0,32.16103 -32.11632,0 0,-32.16103 -32.11633,0 0,32.16103 -32.11633,0 0,-32.16103 -32.11633,0 0,96.48342 32.11633,0 0,64.32206 -32.11633,0 0,-32.16103 -32.11633,0 0,32.16103 -32.11632,0 0,-32.16103 -32.11633,0 0,32.16103 0,32.15813 0,32.16104 16.11633,0 0,12.16103 48.11632,0 0,84.32206 160.58164,0 0,-225.12432 32.47139,0.28944 -0.004,-0.0749 -1.8e-4,-3e-5 z" id="path2958-0" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="6"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4134" d="m 45.8,235 c 11.6,7 35,-4.3 32,7.2 0.2,72 -0.3,145 0.2,217 54.4169,2.45038 118.39279,2.19512 164.7,1.4 1,-24.9 1.6,-57 1.6,-84 l 91,0 c 0.3,27.5 -0.5,55 0.4,82 56.19333,0.77119 117.51588,2.01203 164.8,1.2 0.88757,-69.5981 1.6,-151.44225 1.6,-224.8 10.4,-0.5 21.3,1.4 31.4,-0.4 -0.77968,-32.73315 1.33146,-71.32739 0.3,-101 -13.14773,-1.34997 -34.10567,-1.80022 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -11.94657,0.94266 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.36136,-2.11414 -30.68532,-2.43142 -37,1.1 0,33 -0.5,66 0.3,99 12,6.9 35,-4 31.6,8.6 l 0,50.9 -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.41817,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.04179,-1.10111 -35.18591,-1.24022 -37.2,0.5 -0.8,10 -0.1,20.3 -0.3,30.4 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.92764,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 0,-58 c 10.2,-0.6 21,1.1 30.9,-0.7 -0.22337,-33.99478 1.65632,-70.31235 0.7,-100 -5.00387,-2.91205 -34.10863,-1.79879 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.87792,-2.24135 -34.7007,-2.30736 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 C 86.8,154.2 87.2,143.4 86.7,133.5 75.001626,131.08985 57.402405,132.45162 45.186381,132.40947 43.78629,162.39926 45.777688,202.35077 45.8,235 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 45.8,235 c 11.6,7 35,-4.3 32,7.2 0.2,72 -0.3,145 0.2,217 54.4169,2.45038 118.39279,2.19512 164.7,1.4 1,-24.9 1.6,-57 1.6,-84 l 91,0 c 0.3,27.5 -0.5,55 0.4,82 56.19333,0.77119 117.51588,2.01203 164.8,1.2 0.88757,-69.5981 1.6,-151.44225 1.6,-224.8 10.4,-0.5 21.3,1.4 31.4,-0.4 -0.77968,-32.73315 1.33146,-71.32739 0.3,-101 -13.14773,-1.34997 -34.10567,-1.80022 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -11.94657,0.94266 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.36136,-2.11414 -30.68532,-2.43142 -37,1.1 0,33 -0.5,66 0.3,99 12,6.9 35,-4 31.6,8.6 l 0,50.9 -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.41817,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.04179,-1.10111 -35.18591,-1.24022 -37.2,0.5 -0.8,10 -0.1,20.3 -0.3,30.4 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.92764,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 0,-58 c 10.2,-0.6 21,1.1 30.9,-0.7 -0.22337,-33.99478 1.65632,-70.31235 0.7,-100 -5.00387,-2.91205 -34.10863,-1.79879 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.87792,-2.24135 -34.7007,-2.30736 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 C 86.8,154.2 87.2,143.4 86.7,133.5 75.001626,131.08985 57.402405,132.45162 45.186381,132.40947 43.78629,162.39926 45.777688,202.35077 45.8,235 Z" id="path2958-0-6" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/cinema2.svg b/vtm-themes/resources/assets/symbols/tourist/cinema2.svg
old mode 100755
new mode 100644
index 66d40bab..ac2d4916
--- a/vtm-themes/resources/assets/symbols/tourist/cinema2.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/cinema2.svg
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <g id="g18718" transform="matrix(1.4438269,0,0,1.4438269,-128.87623,-121.85042)">
-  <path id="rect3391" d="M 317.40625,102 C 314.79389,103.87499 312.32864,105.97454 309.9375,108.1875 L 318.59375,126.1875 L 304.78125,132.84375 L 298.28125,119.3125 C 295.93663,121.42726 293.54702,123.41115 291,125.125 L 318.28125,181.84375 L 189.78125,243.6875 L 155.5,172.4375 C 154.90688,172.67767 154.33197,172.93925 153.75,173.21875 C 147.97758,176.0395 142.74849,180.76877 137.65625,185.8125 L 148.8125,180.4375 L 159.5625,202.71875 L 145.75,209.375 L 135.46875,188 C 133.63637,189.84312 131.80866,191.71473 129.96875,193.5 L 262.875,469.71875 C 265.63849,466.94085 268.41773,464.13055 271.25,461.53125 L 267.875,463.15625 L 257.125,440.875 L 270.9375,434.21875 L 280.59375,454.3125 C 281.42844,453.81363 282.29811,453.35684 283.15625,452.9375 C 285.16759,451.97154 287.24435,451.26566 289.375,450.71875 L 260.75,391.1875 L 389.25,329.375 L 424.1875,402 C 433.11182,394.8094 440.70356,384.96976 450.78125,379.15625 L 317.40625,102 z M 332.28125,154.6875 L 343,176.96875 L 329.21875,183.59375 L 318.5,161.3125 L 332.28125,154.6875 z M 324.125,194.03125 L 383.40625,317.21875 L 254.90625,379.03125 L 195.625,255.84375 L 324.125,194.03125 z M 356.71875,205.4375 L 367.4375,227.71875 L 353.625,234.34375 L 342.90625,212.0625 L 356.71875,205.4375 z M 173.25,231.1875 L 183.96875,253.46875 L 170.1875,260.125 L 159.4375,237.84375 L 173.25,231.1875 z M 381.125,256.1875 L 391.84375,278.46875 L 378.0625,285.125 L 367.34375,262.8125 L 381.125,256.1875 z M 197.65625,281.96875 L 208.40625,304.25 L 194.59375,310.875 L 183.875,288.59375 L 197.65625,281.96875 z M 405.5625,306.9375 L 416.28125,329.21875 L 402.46875,335.875 L 391.75,313.59375 L 405.5625,306.9375 z M 222.09375,332.71875 L 232.8125,355 L 219.03125,361.625 L 208.28125,339.34375 L 222.09375,332.71875 z M 429.96875,357.6875 L 440.6875,380 L 426.90625,386.625 L 416.1875,364.34375 L 429.96875,357.6875 z M 246.53125,383.46875 L 257.25,405.75 L 243.4375,412.40625 L 232.71875,390.09375 L 246.53125,383.46875 z" fill="#ffffff"/>
-  <path id="rect3445" d="M 291,125.125 C 289.30153,126.26787 287.53347,127.29214 285.6875,128.15625 C 270.70905,134.83823 251.35034,131.44609 236.5625,137.71875 C 221.4956,143.92126 211.46456,159.39816 197.5,165.4375 C 184.27142,170.97234 168.57887,167.14145 155.5,172.4375 L 189.78125,243.6875 L 318.28125,181.84375 L 291,125.125 z" opacity=".332" fill="#ffffff"/>
-  <rect transform="matrix(0.9011117,-0.433587,0.433587,0.9011117,0,0)" y="315.36" x="65.34" height="136.71" width="142.6" id="rect3447" opacity=".332" fill="#ffffff"/>
-  <path id="rect3449" d="M 389.25,329.375 L 260.75,391.1875 L 289.375,450.6875 C 301.4534,447.58953 315.12121,450.07405 326.875,445.15625 C 340.83956,439.11691 350.90186,423.64003 365.96875,417.4375 C 380.75659,411.16485 400.11531,414.55698 415.09375,407.875 C 418.35625,406.34781 421.3307,404.30181 424.1875,402 L 389.25,329.375 z" opacity=".332" fill="#ffffff"/>
- </g>
+ <path id="path4158" d="M 323 52 C 319 55 316 57 313 60 L 324 83 L 307 92 L 299 73.900391 C 296 77.000391 293 79 290 81 C 287 83 285 85 283 86 C 264 94 239 90 220 98 C 201 106 188 125 171 133 C 149 142 135 134 115 143 C 108 147 101 153 95 159 L 109 152 L 123 180 L 105 189 L 92 162 C 90 164 87 166 85 169 L 254 521 L 264 511 L 260 513 L 246 485 L 264 476 L 276 502 C 277 501 278 500 280 500 C 282 499 285 498 287 497 C 303 493 320 496 335 490 C 353 482 366 462 384 454 C 403 446 428 451 447 442 C 451 440 456 438 459 435 C 471 426 480 413 493 406 L 323 52 z M 342 119 L 355 148 L 338 156 L 324 128 L 342 119 z M 373 184 L 386 212 L 369 221 L 355 193 L 373 184 z M 139 217 L 153 245 L 135 254 L 122 225 L 139 217 z M 403 249 L 417 277 L 399 285 L 386 257 L 403 249 z M 170 281 L 184 310 L 166 318 L 152 290 L 170 281 z M 434 313 L 448 341 L 430 350 L 417 322 L 434 313 z M 201 346 L 214 374 L 197 383 L 183 354 L 201 346 z M 465 378 L 479 406 L 461 414 L 447 386 L 465 378 z M 232 410 L 245 439 L 228 447 L 214 419 L 232 410 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 323 52 C 319 55 316 57 313 60 L 324 83 L 307 92 L 299 73.900391 C 296 77.000391 293 79 290 81 C 287 83 285 85 283 86 C 264 94 239 90 220 98 C 201 106 188 125 171 133 C 149 142 135 134 115 143 C 108 147 101 153 95 159 L 109 152 L 123 180 L 105 189 L 92 162 C 90 164 87 166 85 169 L 254 521 L 264 511 L 260 513 L 246 485 L 264 476 L 276 502 C 277 501 278 500 280 500 C 282 499 285 498 287 497 C 303 493 320 496 335 490 C 353 482 366 462 384 454 C 403 446 428 451 447 442 C 451 440 456 438 459 435 C 471 426 480 413 493 406 L 323 52 z M 342 119 L 355 148 L 338 156 L 324 128 L 342 119 z M 373 184 L 386 212 L 369 221 L 355 193 L 373 184 z M 139 217 L 153 245 L 135 254 L 122 225 L 139 217 z M 403 249 L 417 277 L 399 285 L 386 257 L 403 249 z M 170 281 L 184 310 L 166 318 L 152 290 L 170 281 z M 434 313 L 448 341 L 430 350 L 417 322 L 434 313 z M 201 346 L 214 374 L 197 383 L 183 354 L 201 346 z M 465 378 L 479 406 L 461 414 L 447 386 L 465 378 z M 232 410 L 245 439 L 228 447 L 214 419 L 232 410 z " id="path4155" fill="#734a08"/>
+ <path d="m 221,98.2 c -19,8 -31.7,27.4 -49,35 -16.7,7 -36.5,1.9 -53,8.5 l 43,91 164,-78 -35,-73 c -2.1,1.4 -4.7,3.4 -7.5,4.4 -19.5,8.4 -44.2,4.1 -62.5,12.1 z" id="path4152" opacity="0.7" fill="#ffffff"/>
+ <path d="M 169,248 244,405 408,326 332,169 Z" id="path4150" opacity="0.7" fill="#ffffff"/>
+ <path d="m 251,421 36,76 c 15.3,-4 32.7,-1 47.7,-7.3 17.6,-7.7 30.6,-27.4 49,-35 18.8,-8 43,-3.7 62,-12.2 4.1,-1.9 8.8,-4.2 12.3,-7.1 l -44,-93 z" id="rect3445" opacity="0.7" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/information.svg b/vtm-themes/resources/assets/symbols/tourist/information.svg
old mode 100755
new mode 100644
index 992b873f..3e2d119b
--- a/vtm-themes/resources/assets/symbols/tourist/information.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/information.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path transform="matrix(12.872654,0,0,12.872654,4041.8845,-4307.9258)" d="M -293.96875,344.2415 C -293.96875,343.39778 -293.69532,342.70638 -293.14844,342.16728 C -292.60157,341.62825 -291.89844,341.35872 -291.03906,341.35869 C -290.1172,341.35872 -289.35157,341.64388 -288.74219,342.21416 C -288.13282,342.7845 -287.82814,343.42903 -287.82812,344.14775 C -287.82814,344.67903 -287.94923,345.21028 -288.19141,345.7415 C -288.4336,346.27278 -288.81642,346.69856 -289.33984,347.01885 C -289.86329,347.33918 -290.39845,347.49934 -290.94531,347.49932 C -291.69532,347.49934 -292.38672,347.17903 -293.01953,346.53838 C -293.65235,345.89778 -293.96875,345.13216 -293.96875,344.2415 L -293.96875,344.2415 z M -297.25,372.20244 L -297.29688,370.679 L -294.64844,370.32744 C -294.25782,370.21807 -293.98829,370.05791 -293.83984,369.84697 C -293.69141,369.63604 -293.61719,369.16338 -293.61719,368.429 L -293.61719,368.17119 C -293.61719,367.9837 -293.60547,367.64385 -293.58203,367.15166 C -293.5586,366.65948 -293.54688,366.22588 -293.54688,365.85088 C -293.54688,365.55401 -293.57032,364.9837 -293.61719,364.13994 L -293.59375,362.96807 L -293.61719,361.8665 L -293.57031,358.04619 C -293.57032,357.56183 -293.61719,357.06183 -293.71094,356.54619 C -293.88282,356.31183 -294.19532,356.10871 -294.64844,355.93682 C -295.10157,355.76496 -295.89063,355.63996 -297.01562,355.56182 L -297.01562,354.24932 C -295.40625,354.15558 -293.99219,353.81965 -292.77344,353.2415 C -291.94532,352.86652 -291.04688,352.20246 -290.07812,351.24932 L -288.50781,351.24932 C -288.44532,353.18683 -288.41407,355.70246 -288.41406,358.79619 L -288.57812,368.35869 C -288.57813,369.01494 -288.54688,369.60869 -288.48438,370.13994 C -288.00001,370.31182 -287.21095,370.48369 -286.11719,370.65557 C -285.69532,370.71807 -285.35939,370.79619 -285.10938,370.88994 L -285.13281,372.179 C -285.5547,372.19463 -285.8672,372.20244 -286.07031,372.20244 C -286.3047,372.20244 -286.66407,372.18682 -287.14844,372.15557 C -288.7422,372.07744 -290.87501,372.03838 -293.54688,372.03838 C -294.3125,372.03838 -295.05469,372.06572 -295.77344,372.12041 C -296.49219,372.1751 -296.98438,372.20244 -297.25,372.20244 L -297.25,372.20244 z" id="flowRoot6828" fill="#ffffff"/>
+ <path id="path4142" d="m 254.10725,119.9768 c 0,-10.96722 3.54497,-19.94041 10.63489,-27.030335 7.08993,-6.979144 16.28467,-10.524106 27.47346,-10.524106 11.96425,0 22.04523,3.655743 29.91061,11.078007 7.97617,7.422264 11.96425,15.841554 11.96425,25.147074 0,6.97914 -1.55092,13.84751 -4.76354,20.71588 -3.21263,6.97914 -8.19773,12.51814 -14.95531,16.617 -6.86837,4.20965 -13.73673,6.31447 -20.93744,6.31447 -9.74864,0 -18.72183,-4.20965 -27.03033,-12.51815 -8.19772,-8.3085 -12.40737,-18.27871 -12.40737,-29.91062 m -42.7611,364.46642 -0.66468,-19.82963 34.34182,-4.54198 c 5.09588,-1.44014 8.64084,-3.54496 10.52411,-6.20368 3.414,-57.82818 3.27073,-115.44176 1.77249,-173.14925 -2.21561,-3.10184 -6.31447,-5.64978 -12.18581,-7.97617 -5.87134,-2.2156 -16.1739,-3.87729 -30.79686,-4.87432 l 0,-17.06012 c 20.93744,-1.21859 39.4377,-5.64979 55.27925,-13.07206 10.74567,-4.87432 22.48835,-13.51516 35.11729,-25.92253 l 20.49431,0 c -0.11922,91.42073 -0.30199,173.04456 0.33234,246.92877 6.31446,2.2156 16.617,4.4312 30.79686,6.75758 5.539,0.77546 9.85942,1.77248 13.18282,3.10184 l -0.33233,16.83858 c -8.8696,0.6013 -18.88424,0.18016 -26.25488,-0.33234 -42.09237,-0.41331 -73.73309,-3.58566 -111.88788,-0.44312 -9.30552,0.66467 -15.73077,1.10779 -19.27573,1.10779 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 254.10725,119.9768 c 0,-10.96722 3.54497,-19.94041 10.63489,-27.030335 7.08993,-6.979144 16.28467,-10.524106 27.47346,-10.524106 11.96425,0 22.04523,3.655743 29.91061,11.078007 7.97617,7.422264 11.96425,15.841554 11.96425,25.147074 0,6.97914 -1.55092,13.84751 -4.76354,20.71588 -3.21263,6.97914 -8.19773,12.51814 -14.95531,16.617 -6.86837,4.20965 -13.73673,6.31447 -20.93744,6.31447 -9.74864,0 -18.72183,-4.20965 -27.03033,-12.51815 -8.19772,-8.3085 -12.40737,-18.27871 -12.40737,-29.91062 m -42.7611,364.46642 -0.66468,-19.82963 34.34182,-4.54198 c 5.09588,-1.44014 8.64084,-3.54496 10.52411,-6.20368 3.414,-57.82818 3.27073,-115.44176 1.77249,-173.14925 -2.21561,-3.10184 -6.31447,-5.64978 -12.18581,-7.97617 -5.87134,-2.2156 -16.1739,-3.87729 -30.79686,-4.87432 l 0,-17.06012 c 20.93744,-1.21859 39.4377,-5.64979 55.27925,-13.07206 10.74567,-4.87432 22.48835,-13.51516 35.11729,-25.92253 l 20.49431,0 c -0.11922,91.42073 -0.30199,173.04456 0.33234,246.92877 6.31446,2.2156 16.617,4.4312 30.79686,6.75758 5.539,0.77546 9.85942,1.77248 13.18282,3.10184 l -0.33233,16.83858 c -8.8696,0.6013 -18.88424,0.18016 -26.25488,-0.33234 -42.09237,-0.41331 -73.73309,-3.58566 -111.88788,-0.44312 -9.30552,0.66467 -15.73077,1.10779 -19.27573,1.10779 z" id="flowRoot6828-2" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/memorial.svg b/vtm-themes/resources/assets/symbols/tourist/memorial.svg
old mode 100755
new mode 100644
index 5203e57d..c7255729
--- a/vtm-themes/resources/assets/symbols/tourist/memorial.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/memorial.svg
@@ -1,77 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="m 159.4375,30.6875 c -15.32795,0 -28.34375,13.047045 -28.34375,28.375 l 0,372 c 0.0584,1.44453 327.64837,0.78554 327.59375,0 l 0,-372 c 0,-15.327955 -13.04705,-28.375 -28.375,-28.375 l -270.875,0 z m 55.875,26.625 c 1.14947,3.7e-5 2.13808,0.425865 2.9375,1.28125 0.7994,0.855456 1.18749,1.995811 1.1875,3.4375 -1e-5,1.441763 -0.3881,2.568239 -1.1875,3.40625 -0.79942,0.838044 -1.78803,1.281282 -2.9375,1.28125 -1.15033,3.2e-5 -2.10727,-0.443206 -2.90625,-1.28125 -0.79898,-0.838011 -1.21875,-1.964487 -1.21875,-3.40625 0,-1.441689 0.41977,-2.582044 1.21875,-3.4375 0.79898,-0.855385 1.75592,-1.281213 2.90625,-1.28125 z m 65.5,0.0625 c 1.14946,3.7e-5 2.10683,0.425865 2.90625,1.28125 0.79939,0.855456 1.21874,1.995801 1.21875,3.4375 -10e-6,1.441763 -0.41936,2.599489 -1.21875,3.4375 -0.79942,0.838044 -1.75679,1.250032 -2.90625,1.25 -1.15033,3.2e-5 -2.13853,-0.411956 -2.9375,-1.25 -0.5573,-0.584525 -0.89392,-1.340492 -1.0625,-2.21875 -0.0802,0.29446 -0.17561,0.590009 -0.3125,0.9375 -0.33681,0.854934 -0.78015,1.719461 -1.3125,2.625 -0.44851,-0.301836 -1.01736,-0.619244 -1.71875,-0.9375 -0.70143,-0.318192 -1.47117,-0.468718 -2.3125,-0.46875 -0.72924,3.2e-5 -1.33921,0.235256 -1.84375,0.6875 -0.50456,0.452292 -0.78125,1.151933 -0.78125,2.125 l 0,1.21875 6.25,0 0,7.5 -6.25,0 0,16.78125 -8.34375,0 0,-24.03125 c 0,-0.435871 -0.0138,-1.041466 0,-1.8125 0.0137,-0.770985 0.0684,-1.405316 0.125,-1.875 0.36461,-2.71563 1.31855,-4.762094 2.875,-6.1875 1.55645,-1.425326 3.72346,-2.156214 6.5,-2.15625 0.56146,3.6e-5 1.15045,0.04113 1.78125,0.125 0.63079,0.08395 1.25488,0.207225 1.84375,0.375 1.00994,0.301887 1.86451,0.771327 2.59375,1.375 0.42207,0.349448 0.69724,0.789561 0.875,1.3125 0.16527,-0.899079 0.52828,-1.644564 1.09375,-2.25 0.79897,-0.855385 1.78717,-1.281213 2.9375,-1.28125 z m -4.03125,3.53125 c -0.0682,0.371282 -0.0937,0.766142 -0.0937,1.1875 0,0.436114 0.0519,0.837882 0.125,1.21875 0.11715,-0.42996 0.18749,-0.826798 0.1875,-1.125 0,-0.480106 -0.0894,-0.9007 -0.21875,-1.28125 z m -43.875,-3.3125 c 0.56146,3.6e-5 1.18168,0.04113 1.8125,0.125 0.63078,0.08395 1.22362,0.207225 1.8125,0.375 1.00994,0.301887 1.89575,0.740077 2.625,1.34375 0.72921,0.603744 1.09374,1.485153 1.09375,2.625 -1e-5,0.502428 -0.16322,1.176365 -0.5,2.03125 -0.33681,0.854934 -0.78015,1.750711 -1.3125,2.65625 -0.44851,-0.301836 -1.01735,-0.619244 -1.71875,-0.9375 -0.70141,-0.318192 -1.47116,-0.468718 -2.3125,-0.46875 -0.72924,3.2e-5 -1.37047,0.204006 -1.875,0.65625 -0.50457,0.452292 -0.75001,1.183183 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.435871 0.0174,-1.010216 0.0312,-1.78125 0.0137,-0.770985 0.0373,-1.405316 0.0937,-1.875 0.36462,-2.71563 1.31854,-4.793351 2.875,-6.21875 1.55644,-1.425326 3.72346,-2.124964 6.5,-2.125 z m 10.65625,0.34375 c 0.67359,3.6e-5 1.33795,0.06786 1.96875,0.21875 0.63079,0.150958 1.1795,0.426776 1.65625,0.8125 0.47672,0.385792 0.86181,0.906161 1.15625,1.59375 0.29443,0.687626 0.43749,1.583947 0.4375,2.65625 l 0,30.15625 c -1.14947,0.435904 -2.16467,0.65625 -3.0625,0.65625 -1.28985,0 -2.2849,-0.193606 -3,-0.5625 -0.71511,-0.368845 -1.24326,-0.83378 -1.59375,-1.4375 -0.35049,-0.603703 -0.55481,-1.305858 -0.625,-2.09375 -0.0702,-0.787875 -0.125,-1.628209 -0.125,-2.5 l 0,-29.15625 c 0.33636,-0.03373 0.69788,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.72914,-0.03122 1.09375,-0.03125 z m -54.875,0.65625 c 0.67358,3.6e-5 1.3067,0.06786 1.9375,0.21875 0.63079,0.150958 1.1795,0.426776 1.65625,0.8125 0.47672,0.385792 0.89306,0.906153 1.1875,1.59375 0.29443,0.687618 0.43749,1.583947 0.4375,2.65625 l 0,16.1875 c 0.14036,-0.736736 0.3477,-1.466634 0.65625,-2.1875 0.30854,-0.720866 0.71075,-1.419989 1.1875,-2.125 l 2.28125,-3.46875 c 0.53235,-0.804248 1.10464,-1.506904 1.75,-2.09375 0.64534,-0.586813 1.535,-0.874984 2.65625,-0.875 0.64534,1.6e-5 1.28913,0.09463 1.90625,0.3125 0.61708,0.217984 1.14824,0.450694 1.625,0.71875 0.53234,0.301884 1.02324,0.661887 1.5,1.03125 l -5.75,9.65625 6.8125,12.40625 c -1.85132,0.904536 -3.55144,1.375 -5.09375,1.375 -1.3181,0 -2.3363,-0.30506 -3.09375,-0.875 -0.75749,-0.56994 -1.4394,-1.282964 -2,-2.1875 l -2.6875,-4.5 c -0.47675,-0.770484 -0.84428,-1.485504 -1.125,-2.15625 -0.28074,-0.670713 -0.48464,-1.411956 -0.625,-2.25 l 0,11.40625 -8.4375,0 0,-35.3125 c 0.33636,-0.03373 0.69788,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.0912 1.03125,-0.125 0.37872,-0.03373 0.76038,-0.06247 1.125,-0.0625 z m -12.53125,0.4375 c 0.67359,3.6e-5 1.3067,0.09911 1.9375,0.25 0.63079,0.150958 1.21075,0.395526 1.6875,0.78125 0.47672,0.385792 0.86181,0.937397 1.15625,1.625 0.29441,0.687619 0.43749,1.552697 0.4375,2.625 l 0,30.1875 c -1.14949,0.435904 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.193606 -3,-0.5625 -0.71511,-0.368845 -1.24327,-0.83378 -1.59375,-1.4375 -0.35049,-0.603703 -0.55482,-1.305858 -0.625,-2.09375 -0.0702,-0.787875 -0.0937,-1.628209 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.03373 0.66663,-0.08971 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.76038,-0.06247 1.125,-0.0625 z M 338.5,59.09375 c 0.56146,3.6e-5 1.15043,0.04113 1.78125,0.125 0.63078,0.08395 1.25487,0.207225 1.84375,0.375 1.00994,0.301887 1.86451,0.771327 2.59375,1.375 0.54691,0.452813 0.89451,1.026885 1.03125,1.78125 l 0,-2.84375 c 0.33636,-0.03373 0.69788,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.76038,-0.06247 1.125,-0.0625 0.67359,3.6e-5 1.30668,0.06786 1.9375,0.21875 0.63079,0.150958 1.17951,0.426776 1.65625,0.8125 0.47674,0.385792 0.86181,0.937413 1.15625,1.625 0.29441,0.687619 0.43749,1.552697 0.4375,2.625 l 0,30.1875 c -1.14949,0.435904 -2.16467,0.65625 -3.0625,0.65625 -1.28985,0 -2.2849,-0.193606 -3,-0.5625 -0.71511,-0.368845 -1.24327,-0.86503 -1.59375,-1.46875 -0.35049,-0.603703 -0.55482,-1.274608 -0.625,-2.0625 -0.0702,-0.787875 -0.125,-1.628209 -0.125,-2.5 l 0,-24.9375 c -0.0743,0.415204 -0.21129,0.894525 -0.4375,1.46875 -0.33682,0.854934 -0.78015,1.750711 -1.3125,2.65625 -0.44851,-0.301836 -1.01735,-0.619244 -1.71875,-0.9375 -0.70141,-0.318192 -1.47116,-0.468718 -2.3125,-0.46875 -0.72924,3.2e-5 -1.33922,0.235256 -1.84375,0.6875 -0.50457,0.452292 -0.75001,1.151933 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.46875 -6.21875,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.435871 -0.0138,-1.041466 0,-1.8125 0.0137,-0.770985 0.0684,-1.405316 0.125,-1.875 0.36462,-2.71563 1.31854,-4.793349 2.875,-6.21875 1.55644,-1.425326 3.72346,-2.124964 6.5,-2.125 z m 7.25,5.03125 c 0.0363,-0.202937 0.0625,-0.397552 0.0625,-0.5625 -10e-6,-0.284962 -0.0169,-0.561045 -0.0625,-0.8125 l 0,1.375 z m 46.40625,-5 c 0.56145,3.6e-5 1.15043,0.04113 1.78125,0.125 0.63078,0.08395 1.25487,0.207225 1.84375,0.375 1.00994,0.301887 1.86451,0.771327 2.59375,1.375 0.72921,0.60375 1.09372,1.485153 1.09375,2.625 -3e-5,0.502428 -0.16323,1.176365 -0.5,2.03125 -0.33681,0.854934 -0.78015,1.719461 -1.3125,2.625 -0.44851,-0.301836 -1.01736,-0.587994 -1.71875,-0.90625 -0.70143,-0.318192 -1.47116,-0.499968 -2.3125,-0.5 -0.72924,3.2e-5 -1.33921,0.235256 -1.84375,0.6875 -0.50456,0.452292 -0.75001,1.151933 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.5 -6.21875,0 0,16.78125 -8.375,0 0,-24.03125 c 0,-0.435871 -0.0138,-1.041466 0,-1.8125 0.0137,-0.770985 0.0684,-1.374066 0.125,-1.84375 0.36461,-2.71563 1.31855,-4.793349 2.875,-6.21875 1.55645,-1.425326 3.72345,-2.156214 6.5,-2.15625 z m -71.1875,0.0625 c 0.67271,3.6e-5 1.3375,0.06786 1.96875,0.21875 0.63121,0.150958 1.1795,0.426776 1.65625,0.8125 0.47672,0.385792 0.8618,0.906166 1.15625,1.59375 0.2944,0.687636 0.43749,1.583931 0.4375,2.65625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78865,-0.14019 -1.125,-0.375 -0.33639,-0.234826 -0.50001,-0.7295 -0.5,-1.5 -0.39286,0.602684 -1.01954,1.169709 -1.875,1.65625 -0.85548,0.486541 -1.92892,0.71875 -3.21875,0.71875 -0.95347,0 -1.88685,-0.193622 -2.8125,-0.5625 -0.92565,-0.368878 -1.75708,-1.015573 -2.5,-1.9375 -0.74292,-0.921927 -1.34946,-2.188593 -1.8125,-3.78125 -0.46304,-1.592657 -0.6875,-3.58517 -0.6875,-6 0,-2.413795 0.1902,-4.448411 0.625,-6.125 0.4348,-1.676541 1.02076,-3.054644 1.75,-4.09375 0.72922,-1.039073 1.57778,-1.780316 2.53125,-2.25 0.95347,-0.469635 1.96179,-0.718734 3,-0.71875 0.67273,1.6e-5 1.2797,0.113499 1.8125,0.28125 0.53279,0.167832 0.965,0.34458 1.34375,0.5625 0.37872,0.217968 0.69913,0.438314 0.9375,0.65625 0.23836,0.217968 0.38486,0.368494 0.46875,0.46875 l 0,-12.3125 c 0.33722,-0.03373 0.69873,-0.08971 1.0625,-0.15625 0.30897,-0.0675 0.63538,-0.122454 1,-0.15625 0.36461,-0.03373 0.72912,-0.03122 1.09375,-0.03125 z m 39.71875,0.34375 c 0.67359,3.6e-5 1.33795,0.06786 1.96875,0.21875 0.63079,0.150958 1.17951,0.426776 1.65625,0.8125 0.47674,0.385792 0.86181,0.937413 1.15625,1.625 0.29441,0.687619 0.4375,1.552697 0.4375,2.625 l 0,16.1875 c 0.14036,-0.736736 0.37893,-1.466634 0.6875,-2.1875 0.30854,-0.720866 0.71075,-1.419989 1.1875,-2.125 l 2.25,-3.46875 c 0.53235,-0.804248 1.13589,-1.506904 1.78125,-2.09375 0.64532,-0.586813 1.535,-0.874984 2.65625,-0.875 0.64532,1.6e-5 1.25788,0.125879 1.875,0.34375 0.61708,0.217984 1.1795,0.450694 1.65625,0.71875 0.53235,0.301884 1.02324,0.630637 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.904536 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75749,-0.56994 -1.40815,-1.314214 -1.96875,-2.21875 l -2.6875,-4.46875 c -0.47675,-0.770484 -0.84427,-1.516754 -1.125,-2.1875 -0.28074,-0.670713 -0.51589,-1.411956 -0.65625,-2.25 l 0,11.40625 -8.40625,0 0,-35.28125 c 0.33636,-0.03373 0.69789,-0.08971 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.122454 1.03125,-0.15625 0.37873,-0.03373 0.72913,-0.06247 1.09375,-0.0625 z m 53.8125,0 c 0.67271,3.6e-5 1.3375,0.06786 1.96875,0.21875 0.63119,0.150958 1.17949,0.426776 1.65625,0.8125 0.47671,0.385792 0.8618,0.937413 1.15625,1.625 0.29441,0.687636 0.43747,1.552681 0.4375,2.625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78864,-0.10894 -1.125,-0.34375 -0.33638,-0.234826 -0.50001,-0.7295 -0.5,-1.5 -0.39287,0.602684 -1.01954,1.138459 -1.875,1.625 -0.85548,0.486541 -1.92893,0.71875 -3.21875,0.71875 -0.95348,0 -1.88685,-0.162372 -2.8125,-0.53125 -0.92566,-0.368878 -1.75708,-1.015573 -2.5,-1.9375 -0.74292,-0.921927 -1.34946,-2.188593 -1.8125,-3.78125 -0.46304,-1.592657 -0.6875,-3.58517 -0.6875,-6 0,-2.413795 0.1902,-4.479661 0.625,-6.15625 0.4348,-1.676541 1.02078,-3.023394 1.75,-4.0625 0.72922,-1.039073 1.57778,-1.780316 2.53125,-2.25 0.95347,-0.469635 1.96179,-0.718734 3,-0.71875 0.67273,1.6e-5 1.2797,0.08225 1.8125,0.25 0.53279,0.167832 0.965,0.37583 1.34375,0.59375 0.37873,0.217968 0.69911,0.438314 0.9375,0.65625 0.23835,0.217968 0.38486,0.368494 0.46875,0.46875 l 0,-12.3125 c 0.33722,-0.03373 0.69873,-0.08971 1.0625,-0.15625 0.30896,-0.0675 0.63537,-0.122454 1,-0.15625 0.36459,-0.03373 0.72912,-0.06247 1.09375,-0.0625 z m -118.8125,9.8125 c 2.29979,1.6e-5 4.3203,0.411989 6.03125,1.25 0.7566,0.369395 1.38412,0.823979 1.875,1.34375 0.49084,0.51982 0.71872,1.139791 0.71875,1.84375 -3e-5,0.602717 -0.14651,1.317737 -0.46875,2.15625 -0.32226,0.838562 -0.74204,1.634747 -1.21875,2.40625 -0.84222,-0.771503 -1.69979,-1.388944 -2.625,-1.875 -0.92524,-0.486008 -1.89028,-0.718718 -2.84375,-0.71875 -1.20596,3.2e-5 -1.8125,0.412005 -1.8125,1.25 0,0.536192 0.23901,0.933788 0.6875,1.21875 0.44848,0.284978 1.01433,0.517704 1.6875,0.71875 0.67316,0.201078 1.4022,0.4358 2.1875,0.6875 0.78526,0.251716 1.51431,0.622103 2.1875,1.125 0.67315,0.50293 1.23856,1.190725 1.6875,2.0625 0.4489,0.871808 0.65624,2.029549 0.65625,3.4375 -10e-6,2.682918 -0.79032,4.813593 -2.375,6.40625 -1.58471,1.592657 -3.87724,2.40625 -6.90625,2.40625 -1.73919,0 -3.09491,-0.181258 -4.0625,-0.5 -0.9676,-0.318742 -1.75188,-0.633118 -2.3125,-0.96875 -0.72922,-0.435888 -1.21969,-0.917696 -1.5,-1.4375 -0.2803,-0.519787 -0.40625,-1.05506 -0.40625,-1.625 0,-0.871791 0.14951,-1.724456 0.5,-2.5625 0.35049,-0.838011 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.368376 0.72145,0.712524 1.15625,1.03125 0.43478,0.318742 0.90126,0.606912 1.40625,0.875 0.50498,0.268088 1.0297,0.474074 1.5625,0.625 0.53279,0.150942 1.02626,0.218766 1.53125,0.21875 0.72921,1.6e-5 1.25393,-0.121321 1.5625,-0.40625 0.30854,-0.284962 0.46874,-0.657846 0.46875,-1.09375 -10e-6,-0.503415 -0.22446,-0.916882 -0.6875,-1.21875 -0.46304,-0.301836 -1.04559,-0.546926 -1.71875,-0.78125 -0.67317,-0.234308 -1.40567,-0.510632 -2.21875,-0.8125 -0.81311,-0.301852 -1.54559,-0.73018 -2.21875,-1.25 -0.67317,-0.519787 -1.25614,-1.207582 -1.71875,-2.0625 -0.46261,-0.854901 -0.6875,-1.968511 -0.6875,-3.34375 0,-1.340407 0.24201,-2.49414 0.71875,-3.5 0.47672,-1.005811 1.10727,-1.846144 1.90625,-2.5 0.79897,-0.653823 1.71222,-1.149992 2.75,-1.46875 1.03778,-0.318709 2.13091,-0.468734 3.28125,-0.46875 z m -81.125,0.03125 c 0.67359,1.6e-5 1.33795,0.06792 1.96875,0.21875 0.63079,0.150942 1.17951,0.427282 1.65625,0.8125 0.47674,0.385266 0.86181,0.906163 1.15625,1.59375 0.29441,0.687636 0.4375,1.583931 0.4375,2.65625 l 0,17.8125 c 0,0.737756 -0.0377,1.629007 -0.0937,2.71875 -0.056,1.08974 -0.17901,2.06571 -0.375,2.9375 -0.30899,1.34144 -0.79258,2.46993 -1.4375,3.375 -0.64492,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.7994,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.8131,0.23431 -1.53613,0.34373 -2.125,0.34375 -1.20596,-2e-5 -2.06396,-0.25947 -2.625,-0.8125 -0.56104,-0.55307 -0.96025,-1.36413 -1.15625,-2.4375 -0.0847,-0.4359 -0.14556,-0.88898 -0.1875,-1.375 -0.042,-0.48604 -0.0998,-1.16197 -0.15625,-2 0.89784,-0.1003 1.62647,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30855,-0.46967 0.51288,-1.036174 0.625,-1.65625 0.11218,-0.620076 0.18749,-1.293494 0.1875,-2.03125 l 0,-23.4375 c 0.33636,-0.03381 0.66664,-0.08976 1.03125,-0.15625 0.30812,-0.06746 0.65252,-0.122923 1.03125,-0.15625 0.37873,-0.03316 0.76038,-0.03125 1.125,-0.03125 z m 65.5,0.0625 c 0.67358,1.6e-5 1.3067,0.06792 1.9375,0.21875 0.63079,0.150942 1.1795,0.427282 1.65625,0.8125 0.47672,0.385266 0.86181,0.937413 1.15625,1.625 0.29443,0.687636 0.46874,1.552681 0.46875,2.625 l 0,17.8125 c -10e-6,0.737756 -0.0377,1.660257 -0.0937,2.75 -0.056,1.08974 -0.17901,2.06571 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46993 -1.4375,3.375 -0.64493,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.6244,0.92193 -2.4375,1.15625 -0.81311,0.23431 -1.5049,0.37498 -2.09375,0.375 -1.20596,-2e-5 -2.09522,-0.29072 -2.65625,-0.84375 -0.56104,-0.55307 -0.92901,-1.36413 -1.125,-2.4375 -0.0847,-0.4359 -0.14556,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0998,-1.16197 -0.15625,-2 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30854,-0.46967 0.51287,-1.004924 0.625,-1.625 0.11205,-0.620076 0.15625,-1.324744 0.15625,-2.0625 l 0,-23.4375 c 0.33636,-0.03381 0.69788,-0.05851 1.0625,-0.125 0.30812,-0.06746 0.6525,-0.122923 1.03125,-0.15625 0.37872,-0.03316 0.76038,-0.0625 1.125,-0.0625 z m 36.34375,7.84375 c -0.95347,1.6e-5 -1.61826,0.494189 -1.96875,1.5 -0.35049,1.00586 -0.53125,2.381433 -0.53125,4.125 0,0.80428 0.0411,1.562397 0.125,2.25 0.0839,0.687619 0.22693,1.292696 0.4375,1.8125 0.21054,0.519804 0.50737,0.916898 0.84375,1.21875 0.33635,0.301852 0.745,0.46875 1.25,0.46875 0.33635,0 0.61606,-0.04295 0.8125,-0.09375 0.19642,-0.05064 0.32151,-0.09119 0.40625,-0.125 l 0,-10.8125 c -0.16861,-0.133955 -0.38965,-0.231098 -0.65625,-0.28125 -0.26662,-0.05015 -0.49452,-0.0625 -0.71875,-0.0625 z m 93.1875,0.375 c -0.76834,0.110026 -1.31833,0.619915 -1.625,1.5 -0.3505,1.00586 -0.53126,2.381433 -0.53125,4.125 -10e-6,0.80428 0.0411,1.531147 0.125,2.21875 0.0839,0.687619 0.22695,1.292696 0.4375,1.8125 0.21055,0.519804 0.50737,0.948148 0.84375,1.25 0.33636,0.301852 0.74501,0.4375 1.25,0.4375 0.33636,0 0.61605,-0.0117 0.8125,-0.0625 0.19641,-0.05064 0.32151,-0.09119 0.40625,-0.125 l 0,-10.8125 c -0.16863,-0.133955 -0.38965,-0.231098 -0.65625,-0.28125 -0.26663,-0.05015 -0.49452,-0.0625 -0.71875,-0.0625 -0.11919,2e-6 -0.23399,-0.01572 -0.34375,0 z M 233.8125,108.0625 c 0.67359,5e-5 1.3067,0.0992 1.9375,0.25 0.63079,0.15094 1.21075,0.39553 1.6875,0.78125 0.47672,0.3858 0.86181,0.93741 1.15625,1.625 0.29441,0.68764 0.43749,1.55268 0.4375,2.625 l 0,30.1875 c -1.14949,0.4359 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.19362 -3,-0.5625 -0.71511,-0.36886 -1.24326,-0.8338 -1.59375,-1.4375 -0.35049,-0.6037 -0.55481,-1.30586 -0.625,-2.09375 -0.0702,-0.78788 -0.125,-1.62821 -0.125,-2.5 l 0,-29.15625 c 0.33636,-0.0336 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.76038,-0.0625 1.125,-0.0625 z m 11.75,0 c 0.67359,5e-5 1.33795,0.0992 1.96875,0.25 0.63079,0.15094 1.1795,0.39553 1.65625,0.78125 0.47672,0.3858 0.86181,0.93741 1.15625,1.625 0.29443,0.68764 0.43749,1.55268 0.4375,2.625 l 0,16.1875 c 0.14036,-0.73672 0.37895,-1.43537 0.6875,-2.15625 0.30854,-0.72085 0.71075,-1.45122 1.1875,-2.15625 l 2.25,-3.46875 c 0.53235,-0.80423 1.13589,-1.50689 1.78125,-2.09375 0.64534,-0.5868 1.535,-0.87498 2.65625,-0.875 0.64534,2e-5 1.25788,0.12588 1.875,0.34375 0.61708,0.21798 1.17949,0.45069 1.65625,0.71875 0.53234,0.30188 1.02325,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85132,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75748,-0.56994 -1.40815,-1.31421 -1.96875,-2.21875 L 252.5625,136.75 c -0.47675,-0.77048 -0.84428,-1.51675 -1.125,-2.1875 -0.28074,-0.67071 -0.51589,-1.41196 -0.65625,-2.25 l 0,11.40625 -8.40625,0 0,-35.28125 c 0.33636,-0.0336 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.72914,-0.0625 1.09375,-0.0625 z m -23.9375,0.25 c 0.67271,5e-5 1.30625,0.0679 1.9375,0.21875 0.63121,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.8618,0.93741 1.15625,1.625 0.2944,0.68764 0.46874,1.55268 0.46875,2.625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.8199,-0.10896 -1.15625,-0.34375 -0.33638,-0.23483 -0.50001,-0.7295 -0.5,-1.5 -0.39286,0.60268 -1.01954,1.13846 -1.875,1.625 -0.85548,0.48654 -1.92892,0.71875 -3.21875,0.71875 -0.95347,0 -1.88685,-0.16237 -2.8125,-0.53125 -0.92566,-0.36888 -1.75708,-1.01557 -2.5,-1.9375 -0.74292,-0.92193 -1.34946,-2.18858 -1.8125,-3.78125 -0.46304,-1.59264 -0.6875,-3.58517 -0.6875,-6 0,-2.41379 0.22145,-4.47966 0.65625,-6.15625 0.4348,-1.67654 1.02078,-3.02339 1.75,-4.0625 0.72922,-1.03907 1.54653,-1.78032 2.5,-2.25 0.95347,-0.46965 1.96179,-0.71873 3,-0.71875 0.67273,2e-5 1.27969,0.0823 1.8125,0.25 0.53277,0.16783 0.99625,0.37583 1.375,0.59375 0.37872,0.21797 0.66788,0.40708 0.90625,0.625 0.23836,0.21798 0.41611,0.39974 0.5,0.5 l 0,-12.34375 c 0.33722,-0.0336 0.66748,-0.0584 1.03125,-0.125 0.30897,-0.0675 0.66663,-0.12244 1.03125,-0.15625 0.36461,-0.0336 0.72912,-0.0625 1.09375,-0.0625 z m -23.09375,0.0312 c 0.56146,3e-5 1.15045,0.0412 1.78125,0.125 0.63079,0.084 1.25488,0.20723 1.84375,0.375 1.00996,0.30188 1.8645,0.77133 2.59375,1.375 0.7292,0.60375 1.09374,1.4539 1.09375,2.59375 -1e-5,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.78015,1.75071 -1.3125,2.65625 -0.44851,-0.30184 -1.01736,-0.61924 -1.71875,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.23526 -1.84375,0.6875 -0.50456,0.45229 -0.75,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.46875 -6.21875,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 201.65625,0.625 c 1.14946,3e-5 2.13808,0.42586 2.9375,1.28125 0.79939,0.85545 1.18749,2.02704 1.1875,3.46875 -10e-6,1.44176 -0.38811,2.56824 -1.1875,3.40625 -0.79942,0.83804 -1.78804,1.25003 -2.9375,1.25 -1.15033,3e-5 -2.10728,-0.41196 -2.90625,-1.25 -0.79898,-0.83801 -1.1875,-1.96449 -1.1875,-3.40625 0,-1.44171 0.38852,-2.6133 1.1875,-3.46875 0.79897,-0.85539 1.75592,-1.28122 2.90625,-1.28125 z m -109,0.0312 c 0.67359,5e-5 1.33793,0.0679 1.96875,0.21875 0.63079,0.15094 1.17951,0.42678 1.65625,0.8125 0.47674,0.3858 0.86181,0.90616 1.15625,1.59375 0.29441,0.68764 0.43749,1.58393 0.4375,2.65625 l 0,16.1875 c 0.14036,-0.73672 0.34768,-1.46662 0.65625,-2.1875 0.30854,-0.72085 0.71075,-1.41997 1.1875,-2.125 l 2.28125,-3.46875 c 0.53235,-0.80423 1.10464,-1.50689 1.75,-2.09375 0.64532,-0.5868 1.535,-0.87498 2.65625,-0.875 0.64532,2e-5 1.28912,0.0946 1.90625,0.3125 0.61708,0.21798 1.14825,0.48194 1.625,0.75 0.53235,0.30188 1.05449,0.63064 1.53125,1 l -5.78125,9.65625 6.8125,12.40625 c -1.85134,0.90454 -3.52019,1.375 -5.0625,1.375 -1.3181,0 -2.36755,-0.30506 -3.125,-0.875 -0.75748,-0.56994 -1.40815,-1.28296 -1.96875,-2.1875 l -2.71875,-4.5 c -0.47675,-0.77048 -0.84427,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.48464,-1.41196 -0.625,-2.25 l 0,11.40625 -8.40625,0 0,-35.3125 c 0.33636,-0.0336 0.66663,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.0912 1.03125,-0.125 0.37873,-0.0336 0.76038,-0.0625 1.125,-0.0625 z m 30.5625,0.125 c 0.56146,3e-5 1.15045,0.0412 1.78125,0.125 0.63079,0.084 1.25488,0.20723 1.84375,0.375 1.00994,0.30188 1.86451,0.74008 2.59375,1.34375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -10e-6,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.7489,1.75071 -1.28125,2.65625 -0.44851,-0.30184 -1.04861,-0.61924 -1.75,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.20401 -1.84375,0.65625 -0.50456,0.45229 -0.75,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.37407 0.0937,-1.84375 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 40.78125,0.71875 c 0.67273,5e-5 1.33751,0.0679 1.96875,0.21875 0.63121,0.15094 1.17949,0.42678 1.65625,0.8125 0.47671,0.3858 0.8618,0.90616 1.15625,1.59375 0.29441,0.68764 0.43747,1.58393 0.4375,2.65625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78864,-0.14021 -1.125,-0.375 -0.33638,-0.23483 -0.50001,-0.7295 -0.5,-1.5 -0.39287,0.60268 -1.01953,1.13846 -1.875,1.625 -0.85548,0.48654 -1.92893,0.75 -3.21875,0.75 -0.95348,0 -1.88685,-0.19362 -2.8125,-0.5625 -0.92566,-0.36888 -1.75709,-1.01557 -2.5,-1.9375 -0.74293,-0.92193 -1.34946,-2.18858 -1.8125,-3.78125 -0.46304,-1.59264 -0.6875,-3.58517 -0.6875,-6 0,-2.41379 0.1902,-4.44841 0.625,-6.125 0.43478,-1.67654 1.02078,-3.05464 1.75,-4.09375 0.72922,-1.03907 1.57777,-1.78032 2.53125,-2.25 0.95346,-0.46965 1.96179,-0.71873 3,-0.71875 0.67273,2e-5 1.27969,0.1135 1.8125,0.28125 0.53279,0.16783 0.965,0.34458 1.34375,0.5625 0.37872,0.21797 0.69911,0.43833 0.9375,0.65625 0.23835,0.21798 0.38486,0.36849 0.46875,0.46875 l 0,-12.3125 c 0.3372,-0.0336 0.69872,-0.0896 1.0625,-0.15625 0.30896,-0.0675 0.63537,-0.12244 1,-0.15625 0.36459,-0.0336 0.72913,-0.0312 1.09375,-0.0312 z m 11.78125,0 c 0.67359,5e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.17951,0.42678 1.65625,0.8125 0.47674,0.3858 0.86181,0.90616 1.15625,1.59375 0.29441,0.68764 0.46875,1.58393 0.46875,2.65625 l 0,16.1875 c 0.14036,-0.73672 0.34768,-1.46662 0.65625,-2.1875 0.30854,-0.72085 0.71076,-1.45122 1.1875,-2.15625 L 383.65625,123.5 c 0.53235,-0.80423 1.10464,-1.47564 1.75,-2.0625 0.64532,-0.5868 1.535,-0.90623 2.65625,-0.90625 0.64532,2e-5 1.25788,0.12588 1.875,0.34375 0.61708,0.21798 1.1795,0.45069 1.65625,0.71875 0.53235,0.30188 1.02324,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.3363,-0.27381 -3.09375,-0.84375 -0.75749,-0.56994 -1.4394,-1.31421 -2,-2.21875 L 381.28125,138.5 c -0.47675,-0.77048 -0.84427,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.48464,-1.44321 -0.625,-2.28125 l 0,11.4375 -8.4375,0 0,-35.3125 c 0.33636,-0.0336 0.69789,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.76038,-0.0312 1.125,-0.0312 z m -97.96875,9.34375 c 3.2815,2e-5 5.61471,0.77 7.03125,2.3125 1.41648,1.54254 2.12499,3.99064 2.125,7.34375 l 0,9.8125 c -10e-6,0.83803 0.0753,1.76053 0.1875,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13412 -0.75439,0.22858 -1.0625,0.3125 -0.30813,0.084 -0.6114,0.16863 -0.90625,0.21875 -0.29487,0.0502 -0.61528,0.0769 -0.9375,0.0937 -0.32226,0.0168 -0.66967,0.0312 -1.0625,0.0312 -2.27157,0 -3.60416,-0.76946 -3.96875,-2.3125 -0.47675,0.56994 -1.16812,1.09283 -2.09375,1.5625 -0.92568,0.46965 -2.09805,0.6875 -3.5,0.6875 -0.8696,0 -1.7006,-0.13823 -2.5,-0.40625 -0.79942,-0.26809 -1.50791,-0.69442 -2.125,-1.28125 -0.61711,-0.58681 -1.10413,-1.35679 -1.46875,-2.3125 -0.36461,-0.95569 -0.53125,-2.12476 -0.53125,-3.5 0,-1.94413 0.42578,-3.49948 1.28125,-4.65625 0.85547,-1.15675 1.87366,-2.02128 3.09375,-2.625 1.22007,-0.60369 2.50854,-0.98894 3.8125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84001 -0.21875,-1.125 -0.14037,-0.28495 -0.32415,-0.50531 -0.5625,-0.65625 -0.23839,-0.15094 -0.52108,-0.23108 -0.84375,-0.28125 -0.32268,-0.0502 -0.66664,-0.0937 -1.03125,-0.0937 -0.98086,2e-5 -1.95236,0.15061 -2.90625,0.46875 -0.9539,0.31824 -2.00978,0.82877 -3.1875,1.5 -0.53322,-0.7715 -0.95257,-1.54348 -1.21875,-2.28125 -0.26618,-0.73774 -0.40625,-1.28787 -0.40625,-1.65625 0,-0.50342 0.1572,-0.98522 0.4375,-1.4375 0.28031,-0.45226 0.84915,-0.90279 1.71875,-1.40625 0.75745,-0.46964 1.77265,-0.8569 3.0625,-1.125 1.28982,-0.26806 2.62242,-0.40623 3.96875,-0.40625 z M 336.4375,120.5 c 2.29979,2e-5 4.28904,0.412 6,1.25 0.7566,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.74999,1.10854 0.75,1.8125 -10e-6,0.60272 -0.17778,1.31774 -0.5,2.15625 -0.32226,0.83856 -0.71078,1.666 -1.1875,2.4375 -0.84222,-0.7715 -1.73104,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85904,-0.71872 -2.8125,-0.71875 -1.20597,3e-5 -1.81251,0.41199 -1.8125,1.25 -10e-6,0.53619 0.20774,0.96504 0.65625,1.25 0.44848,0.28498 1.01433,0.5177 1.6875,0.71875 0.67315,0.20108 1.4022,0.43578 2.1875,0.6875 0.78528,0.25172 1.51433,0.6221 2.1875,1.125 0.67316,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.68749,1.9983 0.6875,3.40625 -10e-6,2.68292 -0.79032,4.84484 -2.375,6.4375 -1.58471,1.59266 -3.90849,2.375 -6.9375,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.72064,-0.66437 -2.28125,-1 -0.72922,-0.43589 -1.25095,-0.9177 -1.53125,-1.4375 -0.28031,-0.51979 -0.40625,-1.05506 -0.40625,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.73901,-1.66447 1.1875,-2.46875 0.33636,0.36838 0.72145,0.71252 1.15625,1.03125 0.4348,0.31874 0.90127,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.47407 1.5625,0.625 0.53279,0.15094 1.05751,0.25002 1.5625,0.25 0.72922,2e-5 1.25395,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.25572,-0.88563 -0.71875,-1.1875 -0.46305,-0.30184 -1.01435,-0.57818 -1.6875,-0.8125 -0.67317,-0.23432 -1.4369,-0.51063 -2.25,-0.8125 -0.81311,-0.30185 -1.54559,-0.69895 -2.21875,-1.21875 -0.67316,-0.51979 -1.22489,-1.20758 -1.6875,-2.0625 -0.46262,-0.8549 -0.71876,-1.96851 -0.71875,-3.34375 -10e-6,-1.34041 0.24201,-2.52539 0.71875,-3.53125 0.47674,-1.00581 1.10727,-1.81489 1.90625,-2.46875 0.79898,-0.65382 1.74346,-1.14999 2.78125,-1.46875 1.03776,-0.31871 2.13092,-0.46873 3.28125,-0.46875 z m 63,0.5625 c 0.67358,3e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.1795,0.42727 1.65625,0.8125 0.47672,0.38527 0.86181,0.90616 1.15625,1.59375 0.29443,0.68764 0.43749,1.58393 0.4375,2.65625 l 0,17.78125 c -10e-6,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08974 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.76135,2.46995 -1.40625,3.375 -0.64493,0.90505 -1.3881,1.63392 -2.1875,2.1875 -0.79942,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.81311,0.23431 -1.5049,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.29072 -2.65625,-0.84375 -0.56103,-0.55307 -0.96025,-1.36413 -1.15625,-2.4375 -0.0847,-0.4359 -0.14555,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0684,-1.13074 -0.125,-1.96875 0.89784,-0.1003 1.62646,-0.32315 2.1875,-0.625 0.56104,-0.30185 0.9727,-0.68658 1.28125,-1.15625 0.30854,-0.46967 0.54412,-1.00492 0.65625,-1.625 0.11218,-0.62008 0.15625,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69788,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.12308 1.03125,-0.15625 0.37872,-0.0332 0.72913,-0.0312 1.09375,-0.0312 z m -182.75,5.375 c -0.76834,0.11003 -1.31832,0.61992 -1.625,1.5 -0.35049,1.00586 -0.50001,2.38143 -0.5,4.125 -1e-5,0.80428 0.0411,1.53115 0.125,2.21875 0.0839,0.68762 0.22693,1.2927 0.4375,1.8125 0.21054,0.5198 0.47612,0.94815 0.8125,1.25 0.33635,0.30185 0.74501,0.4375 1.25,0.4375 0.33635,0 0.61606,-0.0117 0.8125,-0.0625 0.19642,-0.0506 0.3215,-0.0912 0.40625,-0.125 l 0,-10.8125 c -0.16863,-0.13395 -0.3584,-0.2311 -0.625,-0.28125 -0.26662,-0.0502 -0.52577,-0.0625 -0.75,-0.0625 -0.11918,0 -0.23399,-0.0157 -0.34375,0 z m 141.28125,1.5 c -0.95348,2e-5 -1.61827,0.49419 -1.96875,1.5 -0.3505,1.00586 -0.53126,2.38143 -0.53125,4.125 -10e-6,0.80428 0.0411,1.5624 0.125,2.25 0.0839,0.68762 0.22693,1.2927 0.4375,1.8125 0.21054,0.5198 0.50737,0.9169 0.84375,1.21875 0.33636,0.30185 0.74501,0.46875 1.25,0.46875 0.33635,0 0.61605,-0.0429 0.8125,-0.0937 0.19641,-0.0506 0.3215,-0.0912 0.40625,-0.125 l 0,-10.8125 c -0.16863,-0.13395 -0.38966,-0.2311 -0.65625,-0.28125 -0.26663,-0.0502 -0.49452,-0.0625 -0.71875,-0.0625 z m -80.3125,4.9375 c -0.53238,0.0676 -1.05411,0.17848 -1.53125,0.3125 -0.47718,0.13412 -0.89952,0.31132 -1.25,0.5625 -0.3505,0.25121 -0.60238,0.59737 -0.8125,1 -0.21013,0.40266 -0.34376,0.92605 -0.34375,1.5625 -10e-6,0.77152 0.18075,1.36224 0.53125,1.78125 0.35048,0.41901 0.85164,0.625 1.46875,0.625 0.50498,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59374,-0.68154 0.59375,-1.21875 l 0,-4.21875 z m 56.96875,76.6875 c 1.14946,3e-5 2.13808,0.42586 2.9375,1.28125 0.79939,0.85545 1.18749,1.9958 1.1875,3.4375 -10e-6,1.44176 -0.38811,2.5995 -1.1875,3.4375 -0.79942,0.83806 -1.78804,1.25003 -2.9375,1.25 -1.15033,3e-5 -2.10728,-0.41194 -2.90625,-1.25 -0.79898,-0.838 -1.21875,-1.99574 -1.21875,-3.4375 0,-1.4417 0.41977,-2.58205 1.21875,-3.4375 0.79897,-0.85539 1.75592,-1.28122 2.90625,-1.28125 z m -89.1875,0.46875 c 0.56145,3e-5 1.18168,0.041 1.8125,0.125 0.63079,0.084 1.22363,0.20723 1.8125,0.375 1.00994,0.30188 1.89576,0.74008 2.625,1.34375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -1e-5,0.50243 -0.19447,1.17636 -0.53125,2.03125 -0.33681,0.85493 -0.7489,1.71946 -1.28125,2.625 -0.44851,-0.30184 -1.01736,-0.58799 -1.71875,-0.90625 -0.70143,-0.31819 -1.50242,-0.49997 -2.34375,-0.5 -0.72924,3e-5 -1.33921,0.23526 -1.84375,0.6875 -0.50456,0.45229 -0.75,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0373,-1.37407 0.0937,-1.84375 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72345,-2.12497 6.5,-2.125 z m 106.5,0 c 0.56145,3e-5 1.15043,0.041 1.78125,0.125 0.63078,0.084 1.25487,0.20723 1.84375,0.375 1.00994,0.30188 1.86451,0.74008 2.59375,1.34375 0.72921,0.60375 1.09372,1.48515 1.09375,2.625 -3e-5,0.50243 -0.16323,1.17636 -0.5,2.03125 -0.33682,0.85493 -0.78016,1.71946 -1.3125,2.625 -0.44851,-0.30184 -1.01736,-0.58799 -1.71875,-0.90625 -0.70143,-0.31819 -1.47116,-0.49997 -2.3125,-0.5 -0.72924,3e-5 -1.33921,0.23526 -1.84375,0.6875 -0.50456,0.45229 -0.75001,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 -0.0138,-1.04148 0,-1.8125 0.0137,-0.77099 0.0684,-1.37407 0.125,-1.84375 0.36462,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55644,-1.42533 3.72345,-2.12497 6.5,-2.125 z m -76.96875,0.375 c 0.67359,5e-5 1.3067,0.0992 1.9375,0.25 0.6308,0.15094 1.21076,0.39553 1.6875,0.78125 0.47674,0.3858 0.86181,0.93741 1.15625,1.625 0.29441,0.68764 0.43749,1.55268 0.4375,2.625 l 0,30.1875 c -1.14949,0.4359 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.19362 -3,-0.5625 -0.71511,-0.36886 -1.24327,-0.8338 -1.59375,-1.4375 -0.3505,-0.6037 -0.55482,-1.30586 -0.625,-2.09375 -0.0702,-0.78788 -0.0937,-1.62821 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.0336 0.66663,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0336 0.76038,-0.0625 1.125,-0.0625 z m 11.75,0 c 0.67358,5e-5 1.3067,0.0992 1.9375,0.25 0.63079,0.15094 1.21075,0.39553 1.6875,0.78125 0.47672,0.3858 0.86181,0.93741 1.15625,1.625 0.29443,0.68764 0.43749,1.55268 0.4375,2.625 l 0,16.21875 c 0.14036,-0.73672 0.3477,-1.46662 0.65625,-2.1875 0.30854,-0.72085 0.71075,-1.45122 1.1875,-2.15625 l 2.28125,-3.46875 c 0.53235,-0.80423 1.10464,-1.5069 1.75,-2.09375 0.64534,-0.5868 1.535,-0.87498 2.65625,-0.875 0.64534,2e-5 1.28913,0.12588 1.90625,0.34375 0.61708,0.21797 1.14824,0.45069 1.625,0.71875 0.53234,0.30188 1.05449,0.63064 1.53125,1 l -5.78125,9.65625 6.8125,12.4375 c -1.85132,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.3363,-0.27381 -3.09375,-0.84375 -0.75749,-0.56994 -1.4394,-1.31421 -2,-2.21875 l -2.6875,-4.46875 c -0.47674,-0.77048 -0.84428,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.48464,-1.44321 -0.625,-2.28125 l 0,11.4375 -8.4375,0 0,-35.3125 c 0.33636,-0.0336 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.12244 1.03125,-0.15625 0.37872,-0.0336 0.76038,-0.0625 1.125,-0.0625 z M 260.5625,221.125 c 2.29979,2e-5 4.32029,0.412 6.03125,1.25 0.7566,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.71874,1.13979 0.71875,1.84375 -10e-6,0.60272 -0.14653,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.74203,1.63475 -1.21875,2.40625 -0.84222,-0.7715 -1.73104,-1.38894 -2.65625,-1.875 -0.92524,-0.48601 -1.85904,-0.71873 -2.8125,-0.71875 -1.20597,2e-5 -1.81251,0.41199 -1.8125,1.25 -10e-6,0.53619 0.23899,0.93379 0.6875,1.21875 0.44848,0.28498 1.01433,0.54895 1.6875,0.75 0.67315,0.20108 1.4022,0.40455 2.1875,0.65625 0.78528,0.25173 1.51433,0.65335 2.1875,1.15625 0.67316,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65624,1.9983 0.65625,3.40625 -10e-6,2.68292 -0.79032,4.81359 -2.375,6.40625 -1.58471,1.59266 -3.87724,2.40625 -6.90625,2.40625 -1.73919,0 -3.09491,-0.18126 -4.0625,-0.5 -0.9676,-0.31874 -1.75189,-0.63312 -2.3125,-0.96875 -0.72922,-0.43589 -1.2197,-0.9177 -1.5,-1.4375 -0.28031,-0.51979 -0.4375,-1.05506 -0.4375,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.36838 0.72145,0.71252 1.15625,1.03125 0.4348,0.31874 0.90127,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.47407 1.5625,0.625 0.53279,0.15094 1.02626,0.21875 1.53125,0.21875 0.72922,0 1.25393,-0.12132 1.5625,-0.40625 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.22447,-0.91688 -0.6875,-1.21875 -0.46305,-0.30184 -1.0456,-0.54693 -1.71875,-0.78125 -0.67317,-0.23432 -1.40565,-0.51063 -2.21875,-0.8125 -0.81311,-0.30185 -1.54559,-0.69895 -2.21875,-1.21875 -0.67316,-0.51979 -1.25614,-1.20758 -1.71875,-2.0625 -0.46262,-0.8549 -0.68751,-1.96851 -0.6875,-3.34375 -1e-5,-1.34041 0.24201,-2.52539 0.71875,-3.53125 0.47674,-1.00581 1.10727,-1.84614 1.90625,-2.5 0.79898,-0.65382 1.71221,-1.11874 2.75,-1.4375 1.03776,-0.31871 2.13092,-0.49998 3.28125,-0.5 z m 57.59375,0 c 3.2815,2e-5 5.64598,0.77 7.0625,2.3125 1.4165,1.54254 2.12499,3.99064 2.125,7.34375 l 0,9.8125 c -10e-6,0.83803 0.0441,1.76053 0.15625,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13395 -0.75439,0.22858 -1.0625,0.3125 -0.30815,0.084 -0.61142,0.16863 -0.90625,0.21875 -0.29487,0.0502 -0.58403,0.0769 -0.90625,0.0937 -0.32226,0.0168 -0.7009,0.0312 -1.09375,0.0312 -2.27156,0 -3.57291,-0.76946 -3.9375,-2.3125 -0.47675,0.56994 -1.1681,1.0616 -2.09375,1.53125 -0.92566,0.46967 -2.09805,0.71875 -3.5,0.71875 -0.8696,0 -1.7006,-0.13823 -2.5,-0.40625 -0.7994,-0.26809 -1.50791,-0.69442 -2.125,-1.28125 -0.61711,-0.58683 -1.10414,-1.35681 -1.46875,-2.3125 -0.36462,-0.95569 -0.5625,-2.12476 -0.5625,-3.5 0,-1.94413 0.42578,-3.49948 1.28125,-4.65625 0.85547,-1.15675 1.90491,-2.02128 3.125,-2.625 1.22007,-0.60369 2.47729,-0.98894 3.78125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84002 -0.21875,-1.125 -0.14037,-0.28496 -0.32415,-0.50531 -0.5625,-0.65625 -0.23839,-0.15094 -0.52108,-0.26233 -0.84375,-0.3125 -0.32268,-0.0502 -0.66664,-0.0625 -1.03125,-0.0625 -0.98086,2e-5 -1.95236,0.15061 -2.90625,0.46875 -0.9539,0.31824 -2.00978,0.82877 -3.1875,1.5 -0.53323,-0.7715 -0.92132,-1.54348 -1.1875,-2.28125 C 309.14007,226.41851 309,225.86838 309,225.5 c 0,-0.50342 0.12594,-0.98521 0.40625,-1.4375 0.28031,-0.45224 0.84915,-0.90279 1.71875,-1.40625 0.75747,-0.46964 1.8039,-0.8569 3.09375,-1.125 1.28983,-0.26806 2.59117,-0.40623 3.9375,-0.40625 z m 15.71875,0.5 c 0.67358,3e-5 1.33795,0.0992 1.96875,0.25 0.63079,0.15094 1.1795,0.39602 1.65625,0.78125 0.47672,0.38527 0.86181,0.93741 1.15625,1.625 0.29443,0.68762 0.43749,1.55266 0.4375,2.625 l 0,17.8125 c -10e-6,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46995 -1.4375,3.375 -0.64493,0.90505 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.81311,0.23431 -1.53615,0.34373 -2.125,0.34375 -1.20596,-2e-5 -2.06396,-0.29072 -2.625,-0.84375 -0.56104,-0.55307 -0.96026,-1.36415 -1.15625,-2.4375 -0.0847,-0.4359 -0.14556,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0998,-1.16199 -0.15625,-2 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30854,-0.46967 0.51288,-1.00492 0.625,-1.625 0.11218,-0.62008 0.1875,-1.29349 0.1875,-2.03125 l 0,-23.4375 c 0.33638,-0.0338 0.66663,-0.0898 1.03125,-0.15625 0.30812,-0.0675 0.6525,-0.12308 1.03125,-0.15625 0.37872,-0.0332 0.76038,-0.0625 1.125,-0.0625 z m -14.40625,13.1875 c -0.53238,0.0676 -1.02285,0.17846 -1.5,0.3125 -0.47717,0.13412 -0.89952,0.31132 -1.25,0.5625 -0.3505,0.25121 -0.63364,0.59737 -0.84375,1 -0.21013,0.40266 -0.31251,0.8948 -0.3125,1.53125 -10e-6,0.77152 0.18075,1.39349 0.53125,1.8125 0.35048,0.41901 0.82039,0.625 1.4375,0.625 0.50496,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59374,-0.68154 0.59375,-1.21875 l 0,-4.21875 z M 253.125,259.84375 c 1.14946,3e-5 2.13808,0.45711 2.9375,1.3125 0.7994,0.85545 1.18749,1.9958 1.1875,3.4375 -10e-6,1.44176 -0.3881,2.56825 -1.1875,3.40625 -0.79942,0.83806 -1.78804,1.25003 -2.9375,1.25 -1.15033,3e-5 -2.13852,-0.41194 -2.9375,-1.25 -0.79898,-0.838 -1.1875,-1.96449 -1.1875,-3.40625 0,-1.4417 0.38852,-2.58205 1.1875,-3.4375 0.79898,-0.85539 1.78717,-1.31247 2.9375,-1.3125 z m 91.875,0 c 1.14946,3e-5 2.10683,0.45711 2.90625,1.3125 0.7994,0.85545 1.18749,1.9958 1.1875,3.4375 -10e-6,1.44176 -0.3881,2.56825 -1.1875,3.40625 -0.79942,0.83806 -1.75679,1.25003 -2.90625,1.25 -1.15034,3e-5 -2.13852,-0.41194 -2.9375,-1.25 -0.64144,-0.67277 -0.99853,-1.53182 -1.125,-2.59375 -0.0775,0.40337 -0.22146,0.85783 -0.4375,1.40625 -0.33681,0.85493 -0.74891,1.75071 -1.28125,2.65625 -0.44851,-0.30184 -1.04861,-0.61924 -1.75,-0.9375 -0.70143,-0.31819 -1.47116,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.23527 -1.84375,0.6875 -0.50456,0.45231 -0.75001,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.46875 -6.21875,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72345,-2.12497 6.5,-2.125 0.56145,3e-5 1.15043,0.0412 1.78125,0.125 0.63078,0.084 1.25487,0.20722 1.84375,0.375 1.00994,0.30188 1.86451,0.77133 2.59375,1.375 0.52938,0.4383 0.85492,0.99792 1,1.71875 0.11089,-1.12027 0.49032,-2.03699 1.15625,-2.75 0.79898,-0.85539 1.78716,-1.31247 2.9375,-1.3125 z m -4.09375,4.0625 c -0.0222,0.22381 -0.0312,0.44744 -0.0312,0.6875 0,0.28426 0.0314,0.55171 0.0625,0.8125 0.0433,-0.22541 0.0625,-0.44488 0.0625,-0.625 -10e-6,-0.31236 -0.039,-0.6029 -0.0937,-0.875 z m 40.375,-3.59375 c 0.56146,3e-5 1.15045,0.0412 1.78125,0.125 0.63079,0.084 1.22363,0.20722 1.8125,0.375 1.00994,0.30188 1.89576,0.77133 2.625,1.375 0.72921,0.60375 1.09374,1.4539 1.09375,2.59375 -10e-6,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.78015,1.75071 -1.3125,2.65625 -0.44851,-0.30184 -1.01736,-0.61924 -1.71875,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.23527 -1.84375,0.6875 -0.50456,0.45231 -0.78125,1.15193 -0.78125,2.125 l 0,1.21875 6.25,0 0,7.46875 -6.25,0 0,16.8125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.3498,-4.79336 2.90625,-6.21875 1.55645,-1.42533 3.72345,-2.12497 6.5,-2.125 z M 221.625,260.71875 c 0.67273,5e-5 1.33751,0.0679 1.96875,0.21875 0.63121,0.15094 1.17949,0.42678 1.65625,0.8125 0.47671,0.3858 0.8618,0.90618 1.15625,1.59375 0.29441,0.68765 0.43747,1.58393 0.4375,2.65625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78864,-0.10896 -1.125,-0.34375 -0.33638,-0.23483 -0.50001,-0.76075 -0.5,-1.53125 -0.39287,0.60268 -1.01953,1.16971 -1.875,1.65625 -0.85548,0.48654 -1.92893,0.71875 -3.21875,0.71875 -0.95348,0 -1.9181,-0.19362 -2.84375,-0.5625 -0.92566,-0.36888 -1.75709,-1.01556 -2.5,-1.9375 -0.74293,-0.92193 -1.34947,-2.15733 -1.8125,-3.75 -0.46305,-1.59264 -0.6875,-3.61642 -0.6875,-6.03125 0,-2.41379 0.22145,-4.44841 0.65625,-6.125 0.43478,-1.67654 1.02078,-3.02339 1.75,-4.0625 0.72922,-1.03907 1.57777,-1.81157 2.53125,-2.28125 0.95346,-0.46965 1.93054,-0.68747 2.96875,-0.6875 0.67273,3e-5 1.27969,0.0822 1.8125,0.25 0.53279,0.16785 0.99625,0.34458 1.375,0.5625 0.37872,0.21797 0.69911,0.43833 0.9375,0.65625 0.23835,0.21798 0.38486,0.36851 0.46875,0.46875 l 0,-12.3125 c 0.3372,-0.0338 0.69872,-0.0896 1.0625,-0.15625 0.30896,-0.0675 0.63537,-0.12244 1,-0.15625 0.36459,-0.0337 0.72913,-0.0312 1.09375,-0.0312 z m 16.34375,10.71875 c 2.29979,3e-5 4.32029,0.412 6.03125,1.25 0.75659,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.71874,1.10854 0.71875,1.8125 -1e-5,0.6027 -0.14653,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.74203,1.666 -1.21875,2.4375 -0.84222,-0.7715 -1.73104,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85904,-0.71873 -2.8125,-0.71875 -1.20597,2e-5 -1.81251,0.41199 -1.8125,1.25 -1e-5,0.53619 0.23901,0.96504 0.6875,1.25 0.44849,0.28498 1.01433,0.51769 1.6875,0.71875 0.67315,0.20108 1.4022,0.4358 2.1875,0.6875 0.78528,0.25173 1.51433,0.6221 2.1875,1.125 0.67315,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65624,1.9983 0.65625,3.40625 -1e-5,2.68292 -0.79032,4.84484 -2.375,6.4375 -1.58471,1.59266 -3.87724,2.375 -6.90625,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.75189,-0.66437 -2.3125,-1 -0.72922,-0.43589 -1.2197,-0.88645 -1.5,-1.40625 -0.28031,-0.5198 -0.4375,-1.08631 -0.4375,-1.65625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.4348,0.31874 0.90127,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.50532 1.5625,0.65625 0.53279,0.15094 1.02626,0.21875 1.53125,0.21875 0.72922,0 1.25393,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.6266 0.46875,-1.0625 -1e-5,-0.50342 -0.22447,-0.91688 -0.6875,-1.21875 -0.46305,-0.30184 -1.0456,-0.57818 -1.71875,-0.8125 -0.67317,-0.23432 -1.40565,-0.51065 -2.21875,-0.8125 -0.81311,-0.30185 -1.54559,-0.69895 -2.21875,-1.21875 -0.67316,-0.51979 -1.25614,-1.20758 -1.71875,-2.0625 -0.46262,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.24201,-2.52539 0.71875,-3.53125 0.47674,-1.00581 1.10727,-1.81489 1.90625,-2.46875 0.79898,-0.65382 1.71221,-1.14999 2.75,-1.46875 1.03776,-0.31871 2.13091,-0.46872 3.28125,-0.46875 z m 32.65625,0 c 1.71092,3e-5 3.16903,0.30256 4.375,0.90625 1.20595,0.60372 2.19413,1.40044 2.9375,2.40625 0.74334,1.00586 1.28861,2.19032 1.625,3.53125 0.33635,1.34096 0.49999,2.74327 0.5,4.21875 l 0,0.65625 c -10e-6,0.28498 -0.0169,0.6044 -0.0312,0.90625 -0.0141,0.30187 -0.0176,0.57568 -0.0312,0.84375 -0.0137,0.2681 -0.0342,0.45971 -0.0625,0.59375 l -11.25,0 c 0.14036,1.27393 0.54257,2.36133 1.1875,3.25 0.6449,0.88868 1.69478,1.34377 3.125,1.34375 1.12207,2e-5 2.05544,-0.22288 2.8125,-0.625 0.75702,-0.40212 1.52377,-0.9225 2.28125,-1.59375 0.36459,0.67125 0.72912,1.44071 1.09375,2.3125 0.36459,0.87179 0.53124,1.64229 0.53125,2.3125 -10e-6,0.56994 -0.12252,1.12209 -0.375,1.625 -0.25252,0.50293 -0.69927,0.96783 -1.34375,1.4375 -0.61712,0.43589 -1.44812,0.82315 -2.5,1.125 -1.05192,0.30185 -2.36694,0.4375 -3.9375,0.4375 -1.14949,0 -2.369,-0.16437 -3.6875,-0.5 -1.31852,-0.33562 -2.56586,-0.99667 -3.6875,-1.96875 -1.12167,-0.97206 -2.0379,-2.33328 -2.78125,-4.09375 -0.74335,-1.76047 -1.125,-4.05654 -1.125,-6.90625 0,-2.11295 0.30327,-3.95798 0.90625,-5.5 0.60298,-1.54199 1.4074,-2.80664 2.375,-3.8125 0.96759,-1.00581 2.06417,-1.74907 3.3125,-2.21875 1.24833,-0.46965 2.48839,-0.68747 3.75,-0.6875 z m 22.21875,0 c 1.93517,3e-5 3.55992,0.32929 4.90625,1 1.34632,0.67075 2.43988,1.5789 3.28125,2.71875 0.84133,1.1399 1.46499,2.47439 1.84375,4 0.37871,1.52565 0.56247,3.13395 0.5625,4.84375 -3e-5,1.70984 -0.20092,3.37611 -0.59375,4.96875 -0.39289,1.59267 -1.01998,2.98061 -1.875,4.1875 -0.85506,1.20691 -1.95207,2.15362 -3.3125,2.875 -1.36046,0.72137 -3.03657,1.09375 -5,1.09375 -1.9352,0 -3.56036,-0.35801 -4.90625,-1.0625 -1.34591,-0.70449 -2.45703,-1.65372 -3.3125,-2.84375 -0.85547,-1.19002 -1.48215,-2.56559 -1.875,-4.125 -0.39286,-1.55939 -0.59375,-3.1939 -0.59375,-4.9375 0,-1.74357 0.23857,-3.40984 0.6875,-4.96875 0.44891,-1.55888 1.11972,-2.89135 2.03125,-4.03125 0.91153,-1.13985 2.06035,-2.048 3.40625,-2.71875 1.3459,-0.67071 2.92692,-0.99997 4.75,-1 z m 25.96875,0 c 0.42109,3e-5 0.84343,0.0244 1.25,0.125 0.40654,0.10079 0.75736,0.28208 1.09375,0.5 0.33635,0.21797 0.63318,0.50614 0.84375,0.875 0.21052,0.36889 0.31249,0.80759 0.3125,1.34375 -10e-6,0.53619 -0.0753,1.14432 -0.1875,1.78125 -0.11218,0.63698 -0.2552,1.26679 -0.4375,1.9375 -0.18232,0.67075 -0.3691,1.3318 -0.59375,1.96875 -0.22469,0.63698 -0.46328,1.21533 -0.6875,1.71875 -0.58888,-0.56992 -1.1406,-0.99626 -1.6875,-1.28125 -0.54693,-0.28495 -1.16803,-0.43748 -1.8125,-0.4375 -0.72924,2e-5 -1.2634,0.22036 -1.65625,0.65625 -0.39287,0.4359 -0.59376,1.01477 -0.59375,1.71875 l 0,14.03125 -8.46875,0 0,-24.03125 c 0.25249,-0.0675 0.53862,-0.15229 0.875,-0.21875 0.30812,-0.0675 0.66964,-0.12308 1.0625,-0.15625 0.39285,-0.0332 0.83876,-0.0312 1.34375,-0.0312 2.52404,3e-5 4.10164,0.82398 4.71875,2.5 0.13951,-0.30184 0.36139,-0.61673 0.65625,-0.96875 0.29485,-0.35197 0.63881,-0.69812 1.03125,-1 0.39241,-0.30182 0.83876,-0.54892 1.34375,-0.75 0.50496,-0.20105 1.03313,-0.28122 1.59375,-0.28125 z m 41.75,0 c 2.29979,3e-5 4.3203,0.412 6.03125,1.25 0.7566,0.36941 1.35287,0.82396 1.84375,1.34375 0.49084,0.51982 0.74997,1.10854 0.75,1.8125 -3e-5,0.6027 -0.14651,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.74204,1.666 -1.21875,2.4375 -0.84222,-0.7715 -1.73105,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85903,-0.71873 -2.8125,-0.71875 -1.20596,2e-5 -1.8125,0.41199 -1.8125,1.25 0,0.53619 0.23901,0.96504 0.6875,1.25 0.44848,0.28498 1.01433,0.51769 1.6875,0.71875 0.67316,0.20108 1.4022,0.4358 2.1875,0.6875 0.78526,0.25173 1.51431,0.6221 2.1875,1.125 0.67315,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65622,1.9983 0.65625,3.40625 -3e-5,2.68292 -0.79032,4.84484 -2.375,6.4375 -1.58471,1.59266 -3.87724,2.375 -6.90625,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.75188,-0.66437 -2.3125,-1 -0.72922,-0.43589 -1.21969,-0.88645 -1.5,-1.40625 -0.2803,-0.5198 -0.4375,-1.08631 -0.4375,-1.65625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.77026,-1.66447 1.21875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.43478,0.31874 0.90126,0.60691 1.40625,0.875 0.50498,0.26809 0.99845,0.50532 1.53125,0.65625 0.53279,0.15094 1.05751,0.21875 1.5625,0.21875 0.72921,0 1.25393,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.6266 0.46875,-1.0625 -10e-6,-0.50342 -0.22446,-0.91688 -0.6875,-1.21875 -0.46304,-0.30184 -1.04559,-0.57818 -1.71875,-0.8125 -0.67317,-0.23432 -1.40565,-0.51065 -2.21875,-0.8125 -0.8131,-0.30185 -1.57684,-0.69895 -2.25,-1.21875 -0.67317,-0.51979 -1.22489,-1.20758 -1.6875,-2.0625 -0.46261,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.242,-2.52539 0.71875,-3.53125 0.47672,-1.00581 1.10727,-1.81489 1.90625,-2.46875 0.79897,-0.65382 1.71222,-1.14999 2.75,-1.46875 1.03778,-0.31871 2.13091,-0.46872 3.28125,-0.46875 z m -108.1875,0.5 c 0.67359,3e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.21076,0.42727 1.6875,0.8125 0.47674,0.38527 0.86181,0.90616 1.15625,1.59375 0.29441,0.68762 0.4375,1.58391 0.4375,2.65625 l 0,17.78125 c 0,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.79258,2.46995 -1.4375,3.375 -0.64493,0.90505 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.6244,0.95318 -2.4375,1.1875 -0.8131,0.23431 -1.50488,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.25947 -2.65625,-0.8125 -0.56104,-0.55307 -0.929,-1.36415 -1.125,-2.4375 -0.0847,-0.4359 -0.14556,-0.92023 -0.1875,-1.40625 -0.042,-0.48604 -0.0998,-1.13074 -0.15625,-1.96875 0.89784,-0.1003 1.62647,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.71783 1.3125,-1.1875 0.30855,-0.46967 0.51288,-1.00492 0.625,-1.625 0.11218,-0.62008 0.15624,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69789,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12308 1.03125,-0.15625 0.37873,-0.0332 0.76038,-0.0312 1.125,-0.0312 z m 91.84375,0 c 0.67359,3e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.1795,0.42727 1.65625,0.8125 0.47672,0.38527 0.86181,0.90616 1.15625,1.59375 0.29443,0.68762 0.43749,1.58391 0.4375,2.65625 l 0,17.78125 c -10e-6,0.73776 -0.006,1.66026 -0.0625,2.75 -0.056,1.08973 -0.21026,2.06569 -0.40625,2.9375 -0.30899,1.34144 -0.76135,2.46995 -1.40625,3.375 -0.64493,0.90505 -1.3881,1.63392 -2.1875,2.1875 -0.79942,0.55355 -1.59315,0.95318 -2.40625,1.1875 -0.81311,0.23431 -1.5049,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.25947 -2.65625,-0.8125 -0.56103,-0.55307 -0.96025,-1.36415 -1.15625,-2.4375 -0.0847,-0.4359 -0.14555,-0.92023 -0.1875,-1.40625 -0.0419,-0.48604 -0.0684,-1.13074 -0.125,-1.96875 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 0.97271,-0.71783 1.28125,-1.1875 0.30855,-0.46967 0.54412,-1.00492 0.65625,-1.625 0.11218,-0.62008 0.15625,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69788,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12308 1.03125,-0.15625 0.37873,-0.0332 0.72914,-0.0312 1.09375,-0.0312 z m -73.65625,5.78125 c -1.31896,2e-5 -2.00001,1.21122 -2,3.625 l 4.0625,0 c -10e-6,-1.37419 -0.17776,-2.32395 -0.5,-2.84375 -0.32226,-0.51979 -0.83329,-0.78123 -1.5625,-0.78125 z m -53.53125,1.09375 c -0.95348,2e-5 -1.58702,0.52544 -1.9375,1.53125 -0.3505,1.00586 -0.53126,2.35018 -0.53125,4.09375 l 0,0.0312 c -1e-5,0.80428 0.0411,1.53115 0.125,2.21875 0.0839,0.68762 0.22695,1.2927 0.4375,1.8125 0.21054,0.5198 0.47612,0.94815 0.8125,1.25 0.33636,0.30185 0.77626,0.4375 1.28125,0.4375 0.33635,0 0.5848,-0.0119 0.78125,-0.0625 0.19641,-0.0506 0.35275,-0.0912 0.4375,-0.125 l 0,-10.84375 c -0.16863,-0.13412 -0.38966,-0.19985 -0.65625,-0.25 -0.26663,-0.0501 -0.52577,-0.0937 -0.75,-0.0937 z M 292.75,278.875 c -0.47675,2e-5 -0.87896,0.13566 -1.1875,0.4375 -0.30855,0.30187 -0.55358,0.71584 -0.75,1.21875 -0.19644,0.50293 -0.33607,1.0818 -0.40625,1.71875 -0.0702,0.63697 -0.0937,1.2673 -0.0937,1.9375 -10e-6,0.73777 0.0235,1.45429 0.0937,2.125 0.0702,0.67075 0.20981,1.26146 0.40625,1.78125 0.19642,0.51982 0.45556,0.94867 0.75,1.25 0.29441,0.30135 0.6795,0.43752 1.15625,0.4375 0.47672,2e-5 0.84768,-0.15045 1.15625,-0.46875 0.30854,-0.31821 0.55055,-0.73018 0.71875,-1.25 0.16818,-0.51979 0.30481,-1.14175 0.375,-1.8125 0.0702,-0.67071 0.0937,-1.35598 0.0937,-2.09375 -1e-5,-1.47446 -0.16365,-2.72727 -0.5,-3.75 -0.33638,-1.0227 -0.94292,-1.53123 -1.8125,-1.53125 z m -69.90625,31.28125 c 1.14946,3e-5 2.13808,0.42586 2.9375,1.28125 0.7994,0.85545 1.1875,1.9958 1.1875,3.4375 0,1.44176 -0.3881,2.5995 -1.1875,3.4375 -0.79942,0.83806 -1.78804,1.25003 -2.9375,1.25 -1.15034,3e-5 -2.10727,-0.41194 -2.90625,-1.25 -0.79898,-0.838 -1.21875,-1.99574 -1.21875,-3.4375 0,-1.4417 0.41977,-2.58205 1.21875,-3.4375 0.79898,-0.85539 1.75591,-1.28122 2.90625,-1.28125 z m -36.4375,0.4375 c 0.56146,3e-5 1.15045,0.041 1.78125,0.125 0.63079,0.084 1.25488,0.20722 1.84375,0.375 1.00994,0.30188 1.86451,0.77133 2.59375,1.375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -1e-5,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.7489,1.71948 -1.28125,2.625 -0.44851,-0.30182 -1.04861,-0.58799 -1.75,-0.90625 -0.70143,-0.31819 -1.47117,-0.49997 -2.3125,-0.5 -0.72924,3e-5 -1.33921,0.23527 -1.84375,0.6875 -0.50456,0.45231 -0.75,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.5 -6.21875,0 0,16.78125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0373,-1.37407 0.0937,-1.84375 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.15622 6.5,-2.15625 z m 89.0625,0 c 0.56146,3e-5 1.1817,0.041 1.8125,0.125 0.63079,0.084 1.22362,0.20722 1.8125,0.375 1.00994,0.30188 1.89575,0.77133 2.625,1.375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -10e-6,0.50243 -0.19447,1.17636 -0.53125,2.03125 -0.33681,0.85493 -0.7489,1.71948 -1.28125,2.625 -0.44851,-0.30182 -1.01735,-0.58799 -1.71875,-0.90625 -0.70141,-0.31819 -1.50241,-0.49997 -2.34375,-0.5 -0.72924,3e-5 -1.33922,0.23527 -1.84375,0.6875 -0.50457,0.45231 -0.75001,1.15193 -0.75,2.125 l 0,1.21875 6.21875,0 0,7.5 -6.21875,0 0,16.78125 -8.375,0 0,-24.03125 c 0,-0.43587 0.0174,-1.04148 0.0312,-1.8125 0.0137,-0.77099 0.0373,-1.37407 0.0937,-1.84375 0.36462,-2.71563 1.31854,-4.79336 2.875,-6.21875 1.55644,-1.42533 3.72346,-2.15622 6.5,-2.15625 z M 196.9375,311 c 0.67358,5e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.86181,0.93743 1.15625,1.625 0.29443,0.68765 0.4375,1.55268 0.4375,2.625 l 0,16.1875 c 0.14036,-0.7367 0.37895,-1.46662 0.6875,-2.1875 0.30854,-0.72085 0.6795,-1.41997 1.15625,-2.125 l 2.28125,-3.46875 c 0.53235,-0.80423 1.13589,-1.5069 1.78125,-2.09375 0.64534,-0.5868 1.50377,-0.87497 2.625,-0.875 0.64534,3e-5 1.28913,0.12586 1.90625,0.34375 0.61708,0.21797 1.1795,0.45069 1.65625,0.71875 0.53235,0.30188 1.02324,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.31809,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75749,-0.56994 -1.40814,-1.31421 -1.96875,-2.21875 l -2.6875,-4.46875 c -0.47675,-0.77048 -0.87552,-1.51675 -1.15625,-2.1875 -0.28074,-0.67071 -0.48464,-1.41196 -0.625,-2.25 l 0,11.40625 -8.40625,0 0,-35.28125 c 0.33638,-0.0337 0.69789,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.6525,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.72913,-0.0625 1.09375,-0.0625 z m 36.90625,0 c 0.67359,5e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.21075,0.42678 1.6875,0.8125 0.47672,0.3858 0.86181,0.93743 1.15625,1.625 0.29443,0.68765 0.43749,1.55268 0.4375,2.625 l 0,30.1875 c -1.14947,0.4359 -2.19592,0.65625 -3.09375,0.65625 -1.28985,0 -2.2849,-0.19362 -3,-0.5625 -0.71511,-0.36888 -1.24326,-0.86505 -1.59375,-1.46875 -0.35049,-0.6037 -0.55482,-1.27461 -0.625,-2.0625 -0.0702,-0.78788 -0.0937,-1.62821 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.0337 0.66663,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.76039,-0.0625 1.125,-0.0625 z m 23.5625,0 c 0.67273,5e-5 1.3375,0.0679 1.96875,0.21875 0.63121,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.8618,0.93743 1.15625,1.625 0.2944,0.68765 0.43747,1.55268 0.4375,2.625 l 0,30.375 -6.3125,0 c -0.42112,0 -0.78865,-0.10896 -1.125,-0.34375 -0.33638,-0.23483 -0.50001,-0.7295 -0.5,-1.5 -0.39286,0.60268 -1.01954,1.13846 -1.875,1.625 -0.85548,0.48654 -1.92892,0.71875 -3.21875,0.71875 -0.95347,0 -1.88685,-0.16237 -2.8125,-0.53125 -0.92566,-0.36888 -1.78833,-1.01556 -2.53125,-1.9375 -0.74292,-0.92193 -1.31821,-2.18858 -1.78125,-3.78125 -0.46304,-1.59264 -0.71875,-3.58517 -0.71875,-6 0,-2.41379 0.22145,-4.47966 0.65625,-6.15625 0.43478,-1.67654 1.02078,-3.02339 1.75,-4.0625 0.72922,-1.03907 1.57777,-1.78032 2.53125,-2.25 0.95346,-0.46965 1.93054,-0.71872 2.96875,-0.71875 0.67273,3e-5 1.27969,0.0822 1.8125,0.25 0.53279,0.16785 0.99625,0.37583 1.375,0.59375 0.37872,0.21797 0.69913,0.43833 0.9375,0.65625 0.23836,0.21798 0.38485,0.36851 0.46875,0.46875 l 0,-12.3125 c 0.3372,-0.0337 0.69873,-0.0896 1.0625,-0.15625 0.30897,-0.0675 0.63538,-0.12244 1,-0.15625 0.36461,-0.0337 0.72912,-0.0625 1.09375,-0.0625 z m 109.53125,1.90625 c 1.96256,5e-5 3.62884,0.38528 5.03125,1.15625 1.40237,0.77103 2.54007,1.91442 3.4375,3.40625 0.89739,1.4919 1.56175,3.30818 1.96875,5.4375 0.40696,2.12937 0.62497,4.53437 0.625,7.25 -3e-5,5.53262 -0.90984,9.797 -2.71875,12.78125 -1.80897,2.98425 -4.65704,4.46875 -8.5,4.46875 -3.87038,0 -6.6945,-1.42852 -8.53125,-4.3125 -1.83676,-2.88396 -2.78125,-7.20432 -2.78125,-12.9375 0,-2.64912 0.23901,-5.0274 0.6875,-7.15625 0.44848,-2.12882 1.13684,-3.9456 2.0625,-5.4375 0.92565,-1.49183 2.11817,-2.6327 3.5625,-3.4375 1.44432,-0.80473 3.16457,-1.2187 5.15625,-1.21875 z m 24.40625,0 c 1.82305,5e-5 3.45547,0.35856 4.84375,1.0625 1.38826,0.70402 2.54349,1.72359 3.46875,3.03125 0.9252,1.30771 1.59945,2.90365 2.0625,4.78125 0.46303,1.87765 0.71872,3.96523 0.71875,6.3125 -3e-5,3.45342 -0.42237,6.42744 -1.25,8.875 -0.82767,2.44757 -1.91781,4.42675 -3.25,5.96875 -1.33222,1.542 -2.84857,2.68487 -4.53125,3.40625 -1.68271,0.72137 -3.35158,1.0625 -5.0625,1.0625 -0.98087,0 -1.77203,-0.0822 -2.375,-0.25 -0.60299,-0.1678 -1.10414,-0.41437 -1.46875,-0.75 -0.36462,-0.33562 -0.62377,-0.73271 -0.75,-1.21875 -0.12626,-0.48602 -0.1875,-1.07979 -0.1875,-1.75 0,-0.50343 0.0553,-1.09415 0.125,-1.78125 0.0698,-0.68709 0.13102,-1.27782 0.1875,-1.78125 0.56061,0.13412 1.01038,0.21624 1.375,0.25 0.36461,0.0338 0.8045,0.0625 1.28125,0.0625 0.64534,0 1.27846,-0.099 1.9375,-0.25 0.65903,-0.15094 1.28613,-0.38112 1.875,-0.75 0.58885,-0.36888 1.15126,-0.87991 1.65625,-1.5 0.50496,-0.62006 0.91361,-1.40441 1.25,-2.34375 -0.61712,0.46967 -1.32603,0.81583 -2.125,1 -0.799,0.18419 -1.51091,0.25 -2.15625,0.25 -1.34635,0 -2.52173,-0.30305 -3.53125,-0.90625 -1.00955,-0.60319 -1.85809,-1.38553 -2.53125,-2.375 -0.67317,-0.98946 -1.19445,-2.13031 -1.53125,-3.4375 -0.3368,-1.30716 -0.5,-2.68475 -0.5,-4.09375 0,-2.17945 0.27928,-4.0472 0.8125,-5.65625 0.53323,-1.60901 1.26528,-2.95786 2.21875,-4.03125 0.95347,-1.07334 2.08171,-1.88693 3.34375,-2.40625 1.26201,-0.51925 2.60705,-0.7812 4.09375,-0.78125 z m -24.5,7.71875 c -0.50499,3e-5 -0.9449,0.14999 -1.28125,0.46875 -0.33639,0.31876 -0.60196,0.83965 -0.8125,1.59375 -0.21057,0.75414 -0.35364,1.74499 -0.4375,2.96875 -0.0839,1.22381 -0.125,2.72267 -0.125,4.5 0,3.52095 0.20131,6.01266 0.59375,7.4375 0.39241,1.42486 1.08077,2.125 2.0625,2.125 0.47672,0 0.8648,-0.14999 1.1875,-0.46875 0.32265,-0.31873 0.60237,-0.87087 0.8125,-1.625 0.21011,-0.75411 0.37031,-1.74495 0.46875,-2.96875 0.0984,-1.22376 0.12499,-2.72264 0.125,-4.5 -10e-6,-1.77733 -0.0266,-3.27619 -0.125,-4.5 -0.0984,-1.22376 -0.25864,-2.21461 -0.46875,-2.96875 -0.21013,-0.7541 -0.48985,-1.27499 -0.8125,-1.59375 -0.3227,-0.31873 -0.71078,-0.46872 -1.1875,-0.46875 z m 24.5625,0.0312 c -0.56062,2e-5 -1.02752,0.41402 -1.40625,1.21875 -0.37875,0.8048 -0.56251,2.01549 -0.5625,3.625 -10e-6,1.64231 0.20732,2.83914 0.65625,3.59375 0.4489,0.75465 1.09314,1.12502 1.90625,1.125 0.64534,2e-5 1.21375,-0.0822 1.71875,-0.25 0.0556,-0.5024 0.0967,-1.01143 0.125,-1.53125 0.0283,-0.51979 0.0312,-1.05504 0.0312,-1.625 -1e-5,-0.80527 -0.0236,-1.57473 -0.0937,-2.3125 -0.0702,-0.73772 -0.20984,-1.39878 -0.40625,-1.96875 -0.19645,-0.56991 -0.44146,-1.03987 -0.75,-1.375 -0.30855,-0.33508 -0.71379,-0.49998 -1.21875,-0.5 z m -92.4375,1.0625 c 2.29979,3e-5 4.3203,0.412 6.03125,1.25 0.7566,0.36941 1.38412,0.82396 1.875,1.34375 0.49084,0.51982 0.71872,1.13979 0.71875,1.84375 -3e-5,0.6027 -0.14651,1.31774 -0.46875,2.15625 -0.32226,0.83856 -0.71079,1.63475 -1.1875,2.40625 -0.84222,-0.7715 -1.73104,-1.38894 -2.65625,-1.875 -0.92524,-0.48601 -1.85904,-0.74998 -2.8125,-0.75 -1.20597,2e-5 -1.8125,0.44324 -1.8125,1.28125 0,0.53619 0.20776,0.93379 0.65625,1.21875 0.44848,0.28498 1.01433,0.51769 1.6875,0.71875 0.67316,0.20108 1.4022,0.4358 2.1875,0.6875 0.78526,0.25173 1.51431,0.6221 2.1875,1.125 0.67315,0.50293 1.23856,1.19072 1.6875,2.0625 0.4489,0.87181 0.65624,2.02955 0.65625,3.4375 -10e-6,2.68292 -0.79032,4.81361 -2.375,6.40625 -1.58471,1.59267 -3.87724,2.375 -6.90625,2.375 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.72064,-0.63312 -2.28125,-0.96875 -0.72924,-0.43589 -1.25094,-0.9177 -1.53125,-1.4375 -0.2803,-0.5198 -0.40625,-1.05506 -0.40625,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.73901,-1.66447 1.1875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.43478,0.31874 0.90126,0.60691 1.40625,0.875 0.50498,0.26809 1.0297,0.47409 1.5625,0.625 0.53279,0.15094 1.05751,0.21875 1.5625,0.21875 0.72921,0 1.22268,-0.12132 1.53125,-0.40625 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.22446,-0.91688 -0.6875,-1.21875 -0.46304,-0.30184 -1.04559,-0.54691 -1.71875,-0.78125 -0.67317,-0.23431 -1.40567,-0.51065 -2.21875,-0.8125 -0.81311,-0.30185 -1.54559,-0.7302 -2.21875,-1.25 C 292.04558,334.54271 291.46262,333.85492 291,333 c -0.46261,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.24201,-2.49414 0.71875,-3.5 0.47672,-1.00581 1.10727,-1.84613 1.90625,-2.5 0.79897,-0.65381 1.71222,-1.14999 2.75,-1.46875 1.03778,-0.31871 2.13091,-0.46872 3.28125,-0.46875 z m 20.71875,0 c 3.2815,3e-5 5.61473,0.77001 7.03125,2.3125 1.4165,1.54255 2.12497,3.99064 2.125,7.34375 l 0,9.8125 c -3e-5,0.83803 0.0753,1.76053 0.1875,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13412 -0.75439,0.22858 -1.0625,0.3125 -0.30815,0.084 -0.61142,0.13738 -0.90625,0.1875 -0.29487,0.0501 -0.61528,0.10817 -0.9375,0.125 -0.32228,0.0168 -0.66965,0 -1.0625,0 -2.27156,0 -3.57291,-0.76948 -3.9375,-2.3125 -0.47675,0.56994 -1.19935,1.09285 -2.125,1.5625 -0.92566,0.46967 -2.09805,0.71875 -3.5,0.71875 -0.8696,0 -1.7006,-0.13824 -2.5,-0.40625 -0.7994,-0.26809 -1.50791,-0.69444 -2.125,-1.28125 -0.61711,-0.58683 -1.10414,-1.35681 -1.46875,-2.3125 -0.36462,-0.95569 -0.53126,-2.12476 -0.53125,-3.5 -10e-6,-1.94413 0.42578,-3.49948 1.28125,-4.65625 0.85547,-1.15675 1.87366,-2.02128 3.09375,-2.625 1.22007,-0.60369 2.50852,-0.98894 3.8125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84002 -0.21875,-1.125 -0.14037,-0.28496 -0.32414,-0.50529 -0.5625,-0.65625 -0.23837,-0.15094 -0.52108,-0.26235 -0.84375,-0.3125 -0.32268,-0.0501 -0.66664,-0.0625 -1.03125,-0.0625 -0.98086,3e-5 -1.95236,0.15059 -2.90625,0.46875 -0.9539,0.31824 -2.00978,0.82879 -3.1875,1.5 -0.53323,-0.77149 -0.95257,-1.54348 -1.21875,-2.28125 -0.26618,-0.73774 -0.40625,-1.28787 -0.40625,-1.65625 0,-0.50342 0.15719,-0.98521 0.4375,-1.4375 0.28031,-0.45224 0.84915,-0.93404 1.71875,-1.4375 0.75747,-0.46964 1.77265,-0.82565 3.0625,-1.09375 1.28983,-0.26807 2.6224,-0.40622 3.96875,-0.40625 z m 25.9375,0 c 0.86958,3e-5 1.74512,0.20801 2.65625,0.59375 0.91107,0.38578 1.75662,1.01559 2.5,1.9375 0.74332,0.92196 1.34987,2.15989 1.8125,3.71875 0.46258,1.55891 0.68747,3.49899 0.6875,5.8125 -3e-5,2.7167 -0.24203,4.94443 -0.71875,6.6875 -0.47675,1.74308 -1.12099,3.13353 -1.90625,4.15625 -0.7853,1.02272 -1.65743,1.73925 -2.625,2.125 -0.96761,0.38575 -1.92455,0.5625 -2.90625,0.5625 -0.75663,0 -1.42184,-0.097 -1.96875,-0.28125 -0.54693,-0.18419 -0.99628,-0.40453 -1.375,-0.65625 -0.37875,-0.2517 -0.69614,-0.46955 -0.90625,-0.6875 -0.21013,-0.21794 -0.31551,-0.36846 -0.34375,-0.46875 l 0,12.40625 -8.34375,0 0,-35 c 0.25249,-0.0675 0.56987,-0.12104 0.90625,-0.1875 0.30811,-0.0675 0.63839,-0.12292 1.03125,-0.15625 0.39286,-0.0332 0.83876,-0.0625 1.34375,-0.0625 2.55228,3e-5 4.12988,0.79674 4.71875,2.40625 0.47672,-0.77149 1.14452,-1.4444 2,-2.03125 0.85547,-0.5868 2.00728,-0.87497 3.4375,-0.875 z m -123.53125,0.5 c 0.67359,3e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.21075,0.42727 1.6875,0.8125 0.47672,0.38527 0.86181,0.9374 1.15625,1.625 0.29441,0.68762 0.43749,1.55266 0.4375,2.625 l 0,17.8125 c -1e-5,0.73776 -0.0377,1.66026 -0.0937,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46995 -1.4375,3.375 -0.64493,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.62439,0.92193 -2.4375,1.15625 -0.8131,0.23431 -1.5049,0.37498 -2.09375,0.375 -1.20596,-2e-5 -2.09521,-0.29072 -2.65625,-0.84375 -0.56104,-0.55307 -0.929,-1.36415 -1.125,-2.4375 -0.0847,-0.4359 -0.14555,-0.88898 -0.1875,-1.375 -0.042,-0.48604 -0.0998,-1.16199 -0.15625,-2 0.89784,-0.1003 1.62646,-0.2919 2.1875,-0.59375 0.56104,-0.30185 1.00395,-0.68658 1.3125,-1.15625 0.30855,-0.46967 0.51287,-1.00492 0.625,-1.625 0.11218,-0.62008 0.1875,-1.32474 0.1875,-2.0625 l 0,-23.4375 c 0.33636,-0.0338 0.66663,-0.0585 1.03125,-0.125 0.30812,-0.0675 0.65252,-0.12292 1.03125,-0.15625 0.37873,-0.0332 0.76038,-0.0625 1.125,-0.0625 z m 119.75,6.6875 c -0.33724,2e-5 -0.61651,0.0436 -0.8125,0.0937 -0.19602,0.0501 -0.32152,0.0912 -0.40625,0.125 l 0,10.15625 c 0.1686,0.13412 0.35838,0.23111 0.625,0.28125 0.2666,0.0501 0.52574,0.0625 0.75,0.0625 0.95346,2e-5 1.61825,-0.53576 1.96875,-1.625 0.35048,-1.08921 0.49999,-2.5064 0.5,-4.25 -10e-6,-1.50924 -0.18378,-2.70757 -0.5625,-3.5625 -0.37875,-0.85489 -1.05341,-1.28123 -2.0625,-1.28125 z m -89.375,0.21875 c -0.76834,0.11003 -1.28708,0.61992 -1.59375,1.5 -0.3505,1.00586 -0.53126,2.38143 -0.53125,4.125 -1e-5,0.80428 0.0411,1.5624 0.125,2.25 0.0839,0.68762 0.22693,1.26145 0.4375,1.78125 0.21054,0.5198 0.47612,0.94816 0.8125,1.25 0.33635,0.30187 0.77626,0.4375 1.28125,0.4375 0.33635,0 0.58481,-0.0117 0.78125,-0.0625 0.19642,-0.0506 0.35275,-0.0912 0.4375,-0.125 l 0,-10.8125 c -0.16863,-0.13412 -0.38965,-0.2311 -0.65625,-0.28125 -0.26662,-0.0501 -0.52577,-0.0625 -0.75,-0.0625 -0.11919,0 -0.23399,-0.0157 -0.34375,0 z M 321,335.40625 c -0.53238,0.0676 -1.0541,0.17846 -1.53125,0.3125 -0.47717,0.13412 -0.89952,0.31132 -1.25,0.5625 -0.3505,0.25121 -0.60239,0.56612 -0.8125,0.96875 -0.21013,0.40266 -0.34376,0.92607 -0.34375,1.5625 -10e-6,0.77154 0.18075,1.36224 0.53125,1.78125 0.35048,0.41901 0.85164,0.65625 1.46875,0.65625 0.50496,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59374,-0.68154 0.59375,-1.21875 l 0,-4.21875 z m 89.28125,2.65625 c 1.1777,0 2.13163,0.42635 2.875,1.28125 0.74332,0.85492 1.12499,1.96955 1.125,3.34375 -10e-6,1.37522 -0.36153,2.51758 -1.0625,3.40625 -0.701,0.88868 -1.67506,1.3125 -2.9375,1.3125 -1.23422,0 -2.2224,-0.42382 -2.9375,-1.3125 -0.71511,-0.88867 -1.0625,-2.03103 -1.0625,-3.40625 0,-1.3742 0.39878,-2.48883 1.15625,-3.34375 0.75747,-0.8549 1.69428,-1.28125 2.84375,-1.28125 z m -142.6875,22.375 c 1.14946,3e-5 2.10683,0.42586 2.90625,1.28125 0.7994,0.85545 1.21875,2.02705 1.21875,3.46875 0,1.44176 -0.41935,2.56825 -1.21875,3.40625 -0.79942,0.83806 -1.75679,1.25003 -2.90625,1.25 -1.15034,3e-5 -2.13852,-0.41194 -2.9375,-1.25 -0.79898,-0.838 -1.1875,-1.96449 -1.1875,-3.40625 0,-1.4417 0.38852,-2.6133 1.1875,-3.46875 0.79898,-0.85539 1.78716,-1.28122 2.9375,-1.28125 z m -33,0.46875 c 0.56146,3e-5 1.1817,0.041 1.8125,0.125 0.63079,0.084 1.22363,0.20722 1.8125,0.375 1.00996,0.30188 1.89575,0.74008 2.625,1.34375 0.7292,0.60375 1.09374,1.48515 1.09375,2.625 -1e-5,0.50243 -0.19447,1.17636 -0.53125,2.03125 -0.33681,0.85493 -0.7489,1.75073 -1.28125,2.65625 -0.44851,-0.30182 -1.04861,-0.61924 -1.75,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.33921,0.20402 -1.84375,0.65625 -0.50456,0.45231 -0.75001,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c -1e-5,-0.43587 0.0174,-1.01023 0.0312,-1.78125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 50.28125,0 c 0.56146,3e-5 1.1817,0.041 1.8125,0.125 0.63079,0.084 1.22363,0.20722 1.8125,0.375 1.00994,0.30188 1.89576,0.74008 2.625,1.34375 0.72921,0.60375 1.09374,1.48515 1.09375,2.625 -10e-6,0.50243 -0.16322,1.17636 -0.5,2.03125 -0.33681,0.85493 -0.78015,1.75073 -1.3125,2.65625 -0.44851,-0.30182 -1.01736,-0.61924 -1.71875,-0.9375 -0.70143,-0.31819 -1.47117,-0.46872 -2.3125,-0.46875 -0.72924,3e-5 -1.37046,0.20402 -1.875,0.65625 -0.50456,0.45231 -0.75,1.18318 -0.75,2.15625 l 0,1.1875 6.21875,0 0,7.5 -6.21875,0 0,16.8125 -8.375,0 0,-24.0625 c 0,-0.43587 0.0174,-1.01023 0.0312,-1.78125 0.0137,-0.77099 0.0372,-1.40532 0.0937,-1.875 0.36461,-2.71563 1.31855,-4.79336 2.875,-6.21875 1.55645,-1.42533 3.72346,-2.12497 6.5,-2.125 z m 51.5625,0.40625 c 0.67359,5e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.1795,0.42678 1.65625,0.8125 0.47672,0.3858 0.86181,0.90618 1.15625,1.59375 0.29441,0.68765 0.43749,1.58393 0.4375,2.65625 l 0,16.1875 c 0.14036,-0.7367 0.37893,-1.46662 0.6875,-2.1875 0.30854,-0.72085 0.71075,-1.45122 1.1875,-2.15625 l 2.25,-3.46875 c 0.53235,-0.80423 1.13589,-1.47565 1.78125,-2.0625 0.64534,-0.5868 1.535,-0.90622 2.65625,-0.90625 0.64532,3e-5 1.25788,0.12586 1.875,0.34375 0.61708,0.21797 1.17949,0.45069 1.65625,0.71875 0.53234,0.30188 1.02325,0.63064 1.5,1 l -5.75,9.65625 6.8125,12.4375 c -1.85134,0.90454 -3.55144,1.34375 -5.09375,1.34375 -1.3181,0 -2.36755,-0.27381 -3.125,-0.84375 -0.75748,-0.56994 -1.40815,-1.31421 -1.96875,-2.21875 l -2.6875,-4.46875 c -0.47675,-0.77048 -0.84428,-1.4855 -1.125,-2.15625 -0.28074,-0.67071 -0.51589,-1.44321 -0.65625,-2.28125 l 0,11.4375 -8.40625,0 0,-35.3125 c 0.33636,-0.0337 0.69788,-0.0896 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.76038,-0.0312 1.125,-0.0312 z m 25.125,0 c 0.67359,5e-5 1.33795,0.0679 1.96875,0.21875 0.63079,0.15094 1.17951,0.42678 1.65625,0.8125 0.47674,0.3858 0.86181,0.90618 1.15625,1.59375 0.29441,0.68765 0.4375,1.58393 0.4375,2.65625 l 0,30.15625 c -1.14947,0.4359 -2.16466,0.65625 -3.0625,0.65625 -1.28983,0 -2.2849,-0.16237 -3,-0.53125 -0.71511,-0.36888 -1.27451,-0.86505 -1.625,-1.46875 -0.35049,-0.6037 -0.55482,-1.30586 -0.625,-2.09375 -0.0702,-0.78788 -0.0937,-1.62819 -0.0937,-2.5 l 0,-29.15625 c 0.33636,-0.0337 0.66664,-0.0896 1.03125,-0.15625 0.30812,-0.0675 0.65252,-0.12244 1.03125,-0.15625 0.37873,-0.0337 0.76038,-0.0312 1.125,-0.0312 z M 251.65625,372 c 1.71092,3e-5 3.16901,0.30256 4.375,0.90625 1.20593,0.60372 2.19413,1.43169 2.9375,2.4375 0.74332,1.00586 1.25737,2.15907 1.59375,3.5 0.33635,1.34096 0.53122,2.77452 0.53125,4.25 -3e-5,0.16783 -3e-5,0.37129 0,0.65625 -3e-5,0.28498 -0.0168,0.57315 -0.0312,0.875 -0.0142,0.30187 -0.0176,0.60693 -0.0312,0.875 -0.0137,0.2681 -0.0342,0.45971 -0.0625,0.59375 l -11.25,0 c 0.14036,1.27393 0.54257,2.36133 1.1875,3.25 0.64492,0.88868 1.66353,1.34375 3.09375,1.34375 1.12206,0 2.08669,-0.22286 2.84375,-0.625 0.75703,-0.40211 1.49251,-0.9225 2.25,-1.59375 0.36459,0.67125 0.72912,1.44071 1.09375,2.3125 0.36459,0.87179 0.56247,1.64229 0.5625,2.3125 -3e-5,0.56994 -0.12251,1.09084 -0.375,1.59375 -0.2525,0.50291 -0.69928,0.99908 -1.34375,1.46875 -0.61712,0.43589 -1.44812,0.7919 -2.5,1.09375 -1.05191,0.30185 -2.36694,0.46875 -3.9375,0.46875 -1.14947,0 -2.40024,-0.16437 -3.71875,-0.5 -1.31852,-0.33562 -2.5346,-0.99667 -3.65625,-1.96875 -1.12165,-0.97206 -2.03791,-2.33328 -2.78125,-4.09375 -0.74335,-1.76047 -1.125,-4.05654 -1.125,-6.90625 0,-2.11295 0.30327,-3.95798 0.90625,-5.5 0.60298,-1.54199 1.37615,-2.80664 2.34375,-3.8125 0.96759,-1.00581 2.09542,-1.74907 3.34375,-2.21875 1.24832,-0.46965 2.48839,-0.71872 3.75,-0.71875 z m 50.0625,0 c 3.2815,3e-5 5.64598,0.80126 7.0625,2.34375 1.4165,1.54255 2.12497,3.95939 2.125,7.3125 l 0,9.8125 c -3e-5,0.83803 0.0441,1.76053 0.15625,2.75 0.11205,0.98946 0.27273,1.85599 0.46875,2.59375 -0.39287,0.13412 -0.75439,0.22858 -1.0625,0.3125 -0.30815,0.084 -0.58017,0.16863 -0.875,0.21875 -0.29487,0.0501 -0.61526,0.0769 -0.9375,0.0937 -0.32226,0.0168 -0.66965,0.0312 -1.0625,0.0312 -2.27156,0 -3.60416,-0.76948 -3.96875,-2.3125 -0.47675,0.56994 -1.1681,1.09285 -2.09375,1.5625 -0.92566,0.46967 -2.09805,0.6875 -3.5,0.6875 -0.8696,0 -1.7006,-0.13824 -2.5,-0.40625 -0.79942,-0.26809 -1.50791,-0.69444 -2.125,-1.28125 -0.61711,-0.58683 -1.10414,-1.35681 -1.46875,-2.3125 -0.36462,-0.95569 -0.5625,-2.12476 -0.5625,-3.5 0,-1.94413 0.42577,-3.46823 1.28125,-4.625 0.85547,-1.15675 1.90491,-2.05253 3.125,-2.65625 1.22009,-0.60369 2.47727,-0.98894 3.78125,-1.15625 1.30395,-0.16728 2.41766,-0.24998 3.34375,-0.25 l 0,-0.71875 c -10e-6,-0.46965 -0.0784,-0.84002 -0.21875,-1.125 -0.14037,-0.28496 -0.32414,-0.50529 -0.5625,-0.65625 -0.23837,-0.15094 -0.52108,-0.2311 -0.84375,-0.28125 -0.32268,-0.0501 -0.66664,-0.0937 -1.03125,-0.0937 -0.98087,3e-5 -1.95236,0.18184 -2.90625,0.5 -0.9539,0.31824 -2.0098,0.79754 -3.1875,1.46875 -0.53323,-0.77149 -0.92132,-1.51223 -1.1875,-2.25 -0.26618,-0.73774 -0.40625,-1.31911 -0.40625,-1.6875 0,-0.5034 0.12594,-0.95396 0.40625,-1.40625 0.28031,-0.45224 0.8804,-0.93404 1.75,-1.4375 0.75747,-0.46964 1.77265,-0.8569 3.0625,-1.125 1.28983,-0.26807 2.59115,-0.40622 3.9375,-0.40625 z m 20.3125,0 c 2.29979,3e-5 4.28904,0.44325 6,1.28125 0.75659,0.36941 1.38412,0.79271 1.875,1.3125 0.49084,0.51982 0.74999,1.13979 0.75,1.84375 -10e-6,0.6027 -0.17778,1.31774 -0.5,2.15625 -0.32226,0.83856 -0.71078,1.666 -1.1875,2.4375 -0.84222,-0.7715 -1.73104,-1.42019 -2.65625,-1.90625 -0.92524,-0.48601 -1.85904,-0.71873 -2.8125,-0.71875 -1.20597,2e-5 -1.81251,0.41199 -1.8125,1.25 -10e-6,0.53619 0.23901,0.96504 0.6875,1.25 0.44849,0.28498 1.01433,0.51769 1.6875,0.71875 0.67315,0.20108 1.4022,0.4358 2.1875,0.6875 0.78528,0.25173 1.51433,0.6221 2.1875,1.125 0.67315,0.50293 1.20731,1.19072 1.65625,2.0625 0.4489,0.87181 0.68749,1.9983 0.6875,3.40625 -10e-6,2.68292 -0.79032,4.81361 -2.375,6.40625 -1.58471,1.59267 -3.90849,2.40625 -6.9375,2.40625 -1.73919,0 -3.09491,-0.15001 -4.0625,-0.46875 -0.9676,-0.31874 -1.72064,-0.66437 -2.28125,-1 -0.72922,-0.43589 -1.2197,-0.9177 -1.5,-1.4375 -0.28031,-0.5198 -0.4375,-1.05506 -0.4375,-1.625 0,-0.87179 0.18076,-1.72446 0.53125,-2.5625 0.35049,-0.83801 0.73901,-1.66447 1.1875,-2.46875 0.33636,0.36838 0.72145,0.71251 1.15625,1.03125 0.4348,0.31874 0.93252,0.60693 1.4375,0.875 0.50498,0.2681 0.99845,0.47409 1.53125,0.625 0.53279,0.15094 1.05751,0.25 1.5625,0.25 0.72921,0 1.25393,-0.15257 1.5625,-0.4375 0.30854,-0.28496 0.46874,-0.65785 0.46875,-1.09375 -10e-6,-0.50342 -0.22447,-0.88563 -0.6875,-1.1875 -0.46305,-0.30184 -1.04559,-0.57816 -1.71875,-0.8125 -0.67316,-0.23431 -1.40565,-0.51065 -2.21875,-0.8125 -0.81311,-0.30185 -1.57684,-0.69895 -2.25,-1.21875 -0.67316,-0.51979 -1.22489,-1.20758 -1.6875,-2.0625 -0.46262,-0.8549 -0.6875,-1.96851 -0.6875,-3.34375 0,-1.34041 0.21076,-2.52539 0.6875,-3.53125 0.47674,-1.00581 1.13852,-1.84613 1.9375,-2.5 0.79898,-0.65381 1.71221,-1.11874 2.75,-1.4375 1.03776,-0.31871 2.13091,-0.49997 3.28125,-0.5 z m -55.1875,0.53125 c 0.67359,3e-5 1.3067,0.0679 1.9375,0.21875 0.63079,0.15094 1.1795,0.42727 1.65625,0.8125 0.47672,0.38527 0.86181,0.90615 1.15625,1.59375 0.29441,0.68762 0.43749,1.58391 0.4375,2.65625 l 0,17.78125 c -10e-6,0.73776 -0.006,1.66026 -0.0625,2.75 -0.056,1.08973 -0.17901,2.06569 -0.375,2.9375 -0.30899,1.34144 -0.7926,2.46995 -1.4375,3.375 -0.64493,0.90504 -1.35685,1.63392 -2.15625,2.1875 -0.79942,0.55355 -1.6244,0.95318 -2.4375,1.1875 -0.8131,0.23431 -1.5049,0.34373 -2.09375,0.34375 -1.20596,-2e-5 -2.09521,-0.25947 -2.65625,-0.8125 -0.56104,-0.55308 -0.929,-1.3954 -1.125,-2.46875 -0.0847,-0.4359 -0.14555,-0.88898 -0.1875,-1.375 -0.0419,-0.48604 -0.0998,-1.13074 -0.15625,-1.96875 0.89784,-0.1003 1.62646,-0.32315 2.1875,-0.625 0.56104,-0.30185 1.00395,-0.6866 1.3125,-1.15625 0.30855,-0.46967 0.51287,-1.00492 0.625,-1.625 0.11218,-0.62009 0.15625,-1.29349 0.15625,-2.03125 l 0,-23.4375 c 0.33636,-0.0338 0.69788,-0.0898 1.0625,-0.15625 0.30812,-0.0675 0.65252,-0.12292 1.03125,-0.15625 0.37873,-0.0332 0.76038,-0.0312 1.125,-0.0312 z m -15.28125,5.78125 c -1.31894,2e-5 -1.96876,1.21122 -1.96875,3.625 l 4.03125,0 c -1e-5,-1.37419 -0.14651,-2.32393 -0.46875,-2.84375 -0.32226,-0.51977 -0.86453,-0.78123 -1.59375,-0.78125 z m 51.46875,7.375 c -0.53238,0.0675 -1.02285,0.17846 -1.5,0.3125 -0.47717,0.13412 -0.89951,0.31132 -1.25,0.5625 -0.35049,0.25121 -0.63364,0.59737 -0.84375,1 -0.21013,0.40266 -0.31251,0.92607 -0.3125,1.5625 -10e-6,0.77154 0.18076,1.36224 0.53125,1.78125 0.35049,0.41901 0.82038,0.625 1.4375,0.625 0.50496,0 0.95131,-0.13823 1.34375,-0.40625 0.39241,-0.26807 0.59375,-0.68154 0.59375,-1.21875 l 0,-4.21875 z" id="rect3812" opacity=".75" color="#000000" stroke-width="35" fill="#ffffff"/>
- <path d="M 129.86624,448.6745 L 457.10717,448.6745 L 475.36526,473.95491 L 111.82816,473.95491 L 129.86624,448.6745 z" id="path4453" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="12.945"/>
- <path sodipodi:nodetypes="ccccc" id="path4457" d="M 107.60816,542.20485 L 479.36524,542.20485 L 479.36526,498.66636 L 107.82816,498.66636 L 107.60816,542.20485 z" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="12.945"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
+ <metadata id="metadata18"/>
+ <path id="path4141" d="m 164.3,115.9 0,284 c 0,1.8 252,0.9 252,0 l 0,-284 C 416.3,104.5 406.7,94 394.6,94 l -208.8,0 c -11.1,0 -21.5,10.5 -21.5,21.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4143" d="m 148.65,432.9 280.9,0 c 0.9,0 -13.9,-20.9 -13.9,-20.9 l -252.95,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4145" d="m 144.9,451.4 0,33 c 0,0.9 0.9,1.8 1.7,1.8 l 285,0 c 0.9,0 1.7,-0.9 1.7,-1.8 l 0,-33 c 0,-0.9 -0.9,-0.9 -1.7,-0.9 l -285,0 c -0.9,0 -1.7,0 -1.7,0.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4138" d="m 164.3,115.9 0,284 c 0,1.8 252,0.9 252,0 l 0,-284 C 416.3,104.5 406.7,94 394.6,94 l -208.8,0 c -11.1,0 -21.5,10.5 -21.5,21.9 z m -15.65,317 280.9,0 c 0.9,0 -13.9,-20.9 -13.9,-20.9 l -252.95,0 z m -3.75,18.5 0,33 c 0,0.9 0.9,1.8 1.7,1.8 l 285,0 c 0.9,0 1.7,-0.9 1.7,-1.8 l 0,-33 c 0,-0.9 -0.9,-0.9 -1.7,-0.9 l -285,0 c -0.9,0 -1.7,0 -1.7,0.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 164.3,115.9 0,284 c 0,1.8 252,0.9 252,0 l 0,-284 C 416.3,104.5 406.7,94 394.6,94 l -208.8,0 c -11.1,0 -21.5,10.5 -21.5,21.9 z" id="path4139" fill="#734a08"/>
+ <path d="m 148.65,432.9 280.9,0 c 0.9,0 -13.9,-20.9 -13.9,-20.9 l -252.95,0 z" id="path4137" fill="#734a08"/>
+ <path d="m 144.9,451.4 0,33 c 0,0.9 0.9,1.8 1.7,1.8 l 285,0 c 0.9,0 1.7,-0.9 1.7,-1.8 l 0,-33 c 0,-0.9 -0.9,-0.9 -1.7,-0.9 l -285,0 c -0.9,0 -1.7,0 -1.7,0.9 z" id="path4329" fill="#734a08"/>
+ <path d="m 262.7,129.5 c -2.5,11.6 9.6,12.2 10.6,1.6 -6.83586,-10.24365 18.99558,-15.65807 3.7,-17 -7.8,0 -14.4,7.5 -14.3,15.4 z m -32.5,-14.9 c -13.9,7.8 15.7,8.8 0,0 z m 7.5,24.3 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 12.4,-2.4 c 9,5 8.9,-17.5 1.6,-21.3 -4.8,6 -3.6,14.4 -1.6,21.3 z m 67.1,-8 c 0,1 -0.1,1.9 -0.2,2.9 0.45043,16.41851 16.47947,3.65889 9.2,-6.7 9.8,-5.1 -1.1,17 8.9,14.7 2,-1.6 3.07263,-3.1358 3.57263,-5.9358 0.0417,-7.55687 -2.78566,-17.22435 -9.92263,-17.7642 -6.17508,-0.13412 -10.8155,7.87548 -11.55,12.8 z m 29,10.3 c 9,12 11.7,-8 5.7,-13.5 -5.3,8.8 -4.8,-7.7 -9.5,-8.8 l -0.1,0.1 c -2.3,1.1 -1.9,4.2 -2.4,6.2 -3.48773,6.6667 1.53284,22.05094 6.3,16 z m -34.4,-22.5 c -3.3,5.4 -17.4,15 -9,24.9 15.26591,3.39866 18.11045,-18.63447 9,-24.9 z m -98.9,21.8 c 9,12 11.7,-8 5.8,-13.5 -5.3,8.8 -5,-7.7 -9.65,-8.7 -4.78532,8.57773 -3.8301,32.18156 3.85,22.2 z m -15,-0.6 c 9,5 8.9,-17.5 1.6,-21.3 -4.8,6 -3.6,14.4 -1.6,21.3 z m 161.9,2.8 c 6.8,-0.8 13,-19 5.7,-24 -9.5,2.4 -10.3,17.3 -5.7,24 z m 13.7,1.3 c 13.9,8.6 19.6,-18 9,-24.9 -3.3,5.4 -17.4,15 -9,24.9 z m -84,-6.3 c -8.7,12.6 15.7,4.1 7.4,-3.7 -3.9,1.5 3.7,-11 -4.8,-7.5 -10.61122,-3.35778 -6.02262,5.77505 -2.6,11.2 z m -62.4,6.1 c 5.1,12.9 14.2,-16.2 2.4,-17.4 -4.4,4.8 -2.4,11.6 -2.4,17.4 z m 52.4,-17.2 c -4.5,4.6 -2.6,11.4 -2.4,17.3 5.1,12.9 13.9,-16 2.4,-17.4 z m 27.8,5.9 c 8.1,12 -5.9,4.3 0,0 z m 72,0.4 c 8,8.4 -7.8,8.6 0,0 z m -135.7,44.3 c 9,5 9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m 10.7,-21.2 c -4.3,2 -5.7,27.7 3.8,22 8.9,12 11.7,-8 5.7,-13.5 -7.60942,8.49881 -4.14637,-6.82613 -9.5,-8.5 z m -27.5,24.9 c 13.9,8.6 19.5,-17.9 9.1,-24.9 -3.3,5.4 -17.4,15.2 -9.1,24.9 z m -14.4,-0.8 c 6.9,-0.8 13,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 80.6,-1.6 c 9,12 11.7,-8 5.7,-13.5 -5.3,8.8 -4.8,-7.8 -9.55,-8.65 -4.15,2.25 -5.65,27.75 3.85,22.15 z m 80.1,-22.3 c -13.9,7.7 15.5,9.1 0,0 z M 306.4,178 c 7,-0.8 13,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 28.2,1.4 c 13.9,8.5 19,-18.3 8.6,-24.9 -2.8,5.9 -17.6,14.8 -8.6,24.9 z m 21.4,-2.9 c 9,12 11.7,-8 5.7,-13.5 -5.2,8.8 -4.9,-7.5 -9.5,-8.7 l -0.05,0.1 c -4.15,2.2 -5.55,27.7 3.85,22.1 z m -85.6,-13.7 c 0.3,1.5 5.1,6.6 -0.4,10.7 -0.7,21 27,-11 6.1,-12.2 z m 49.1,11.9 c -8.1,12.4 16.3,1.9 7.3,-4.9 -4,1.8 2.4,-7.9 -2,-8 -10.99917,0.79971 -8.71615,4.44271 -5.3,12.9 z m 48.5,8 c 7.7,7.3 12.5,-17.5 2.6,-19.9 -4,5.9 -2.8,13 -2.6,19.9 z M 229.6,166.9 c 8,8.4 -7.8,8.6 0,0 z m 109.1,1.1 c 7.5,8.9 -8.3,8.2 -0.1,0 z m -62.1,3.9 c 4.4,7.9 -9.2,0.3 0,0 z m 43.5,58.6 c -13.9,7.8 15.5,8.9 0,0 z m -74.8,24.4 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 82,0 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m -54.9,-2.3 c 9,4.9 8.9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m 10.7,-21.2 c -4.3,2 -5.7,27.6 3.7,22 8.9,12 11.7,-8 5.7,-13.5 -7.65946,8.54395 -4.00545,-6.92559 -9.4,-8.5 z m -22.8,19.1 c -8.8,12.7 15.7,4.5 7.4,-3.5 -3.9,1.4 3.7,-11.2 -4.8,-7.6 -2,-0.6 -3.5,-0.9 -4.6,-0.9 -6,-0.1 -0.5,7.6 2,12 z m 40.5,1.7 c -0.8,18.7 26.9,-11.2 6.2,-12.9 -10.56774,0.63007 -0.79545,10.06181 -6.2,12.9 z m 15.7,4.8 c 5.1,12.9 14.2,-16.2 2.4,-17.4 -4.4,4.8 -2.4,11.6 -2.4,17.4 z m -8.7,-7.4 c 4.6,8.6 -9.5,0.4 0,0 z m 2.8,37.3 c -0.1,11 9.3,6.3 9.8,-1.5 -4.7,-8.4 10.6,-9.5 7.5,-16.9 -10.36835,-2.61581 -18.48004,10.75529 -17.3,18.4 z M 257,268.5 c -13.9,7.8 15.7,8.9 0,0 z m 93.2,24.4 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m -125.8,1.3 c 13.9,8.5 19,-18.2 8.6,-24.9 -2.8,5.9 -17.6,14.8 -8.6,24.9 z m 71.9,-7.9 c -0.8,16.5 15.2,-1 10.8,-8.9 -5.53597,-3.29329 -10.35891,4.47355 -10.8,8.9 z m -46.3,6.6 c -0.84532,-9.11568 1.10162,-15.31652 -6.9,-16.05 -6.9,0.15 -4.6,23.05 6.9,16.05 z m 83.3,0.4 c 11.6,10.8 16,-13.6 5.7,-16 -16.09756,-0.31103 2.41286,12.10484 -5.7,16 z M 278.8,289 c 3.6,19 27.4,-11.2 8.3,-11.6 -5.88693,0.5538 -9.06811,7.02073 -8.3,11.6 z m -8.7,-11.6 c -13.4269,2.29804 -8.64968,17.7486 -0.2,18.3 2.99929,-9.26864 10.97565,-18.86714 0.2,-18.3 z m -14.3,0.3 c -4.5,4.7 -2.6,11.6 -2.4,17.4 7.26511,10.16186 11.07916,-15.7283 2.4,-17.4 z M 324,295 c 5.1,12.9 14.2,-16 2.4,-17.4 -4.5,4.7 -2.6,11.6 -2.4,17.4 z m -53.6,-12.9 c 6.7,3.6 -7.7,3.8 0,0 z m -40.9,0.9 c 7.7,8.8 -8.2,8.1 0,0 z m 58,0.1 c 8.8,7.7 -8.6,8.4 0,0 z m -53.9,23.6 c -13.9,7.8 15.7,8.8 0,0 z M 200,331.1 c 6.9,-0.7 13.2,-18.9 5.8,-24 -9.5,2.3 -10.3,17.3 -5.8,24 z m 66.4,-8.5 c 0.2,3.2 1.1,6.4 2.6,8.6 7,-0.8 13.2,-18.9 5.8,-24.05 -7.95828,3.26042 -7.54105,9.20289 -8.4,15.45 z m -5.3,-15 c -3.3,5.4 -17.4,15.2 -9,24.9 16.64087,5.66269 16.92187,-19.07448 9,-24.9 z m -46.7,0.1 c -4.3,2 -5.7,27.7 3.8,22 8.9,12 11.7,-8 5.7,-13.5 -5.3,8.8 -5,-7.6 -9.55,-8.7 z m 26.6,21.1 c 9,5.1 9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m 119.1,-18.6 c -11.2,6.5 1.9,12.2 1.1,20 9.2,10.9 18.6,-21.4 10.65,-21.35 z M 344,333.6 c 12.5,0 14.4,-23.6 1.2,-24.9 -11.6,1.6 -13,22.6 -1.2,24.9 z m 3.1,-15.3 c 4.5,13 -11,-0.1 -2,-3.6 1.3,0.7 1.7,2.2 2,3.6 z m 16.9,-3.5 c 9.2,6.6 -7.7,8.2 0,0 z m -73,13.1 c -8.2,5.3 6.1,8 8.5,2.7 -4.37298,-9.49845 1.1334,-14.66406 -8.45,-15.4 -6.65,-0.1 -3.05,9 -0.05,12.7 z m 31.7,11.7 c 9.24314,-8.13213 18.38939,-22.42215 4.05,-24.4 -10.85,-0.3 -12.65,20.6 -4.05,24.4 z M 303.6,317 c 0.3,1.5 5.1,6.6 -0.4,10.8 -0.7,21 27,-11 6.1,-12.2 z m -71.9,18.9 c 7.7,7.3 12.5,-17.5 2.6,-19.9 -4,5.9 -2.7,13 -2.6,19.9 z m 94.6,-14.7 c 7.7,8.6 -6.7,7.4 0,0 z m -69,0.2 c 8.1,8.2 -7.7,8.7 0,0 z m 52,4.7 c 4.4,7.8 -9.1,0.4 0,0 z m 69,2 c -13.9,7.8 15.2,8.6 0,0 z m -110,17 c -13.9,7.8 15.5,9.1 0,0 z m -30.8,24.4 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.5,2.4 -10.4,17.3 -5.8,24 z m 40,0.5 c 5.9,-5.2 10.3,-20 3.8,-24.5 -8.2,2.2 -10.3,17.2 -3.8,24.5 z m 42.8,-24 c -4.3,2 -8.4,35.8 3.8,22 9,12 11.7,-8 5.7,-13.5 -7.4866,8.49767 -4.11165,-6.82247 -9.5,-8.5 z m 17.3,21.1 c 9,4.9 8.9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m -32.1,-1.7 c -7.5,5.9 5.9,9.5 8.7,3.9 -3.72811,-9.74841 1.38268,-14.28369 -7.75,-15.65 -5.75,-0.25 -4.25,8.35 -0.95,11.75 z m -52.4,-11.2 c -8.4,0.8 -7.9,23.6 3.9,18.3 0.39262,-2.35569 12.02208,-20.74955 -3.9,-18.3 z m 33.5,1.4 c 0.3,1.4 5.1,6.6 -0.4,10.8 -0.7,21 27,-11 6.1,-12.25 z M 263.1,372 c 5.1,13 14.2,-16 2.4,-17.3 -4.5,4.6 -2.6,11.6 -2.4,17.3 z m -9.4,-12.8 c 6.8,2.8 -7.4,3.9 0,0 z m 39,5.6 c 4.3,8.1 -8.8,0.1 0,0 z" id="path4304" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/monument.svg b/vtm-themes/resources/assets/symbols/tourist/monument.svg
old mode 100755
new mode 100644
index 804d79df..fc25d36f
--- a/vtm-themes/resources/assets/symbols/tourist/monument.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/monument.svg
@@ -1,77 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 35.844853,509.62169 L 540.74919,509.62892 M 53.553541,473.50382 L 522.78718,473.53056 M 71.615504,437.55222 L 504.7284,437.49148" id="path2161" fill-rule="evenodd" stroke-width="18.02" fill="#ffffff" stroke="#ffffff"/>
- <path d="M 71.756306,212.26887 L 504.86921,212.20813 M 108.42188,217.53947 L 108.45313,440.35593 M 180.51255,217.53947 L 180.5438,440.35593 M 252.60322,217.53947 L 252.63447,440.35593 M 324.69389,217.53947 L 324.72515,440.35593 M 396.78457,217.53947 L 396.81582,440.35593 M 468.87524,217.53947 L 468.90649,440.35593" id="path3157" fill-rule="evenodd" stroke-width="36.05" fill="#ffffff" stroke="#ffffff"/>
- <path d="M 71.974325,176.86692 L 71.974325,143.90333 L 286.16213,53.07543 L 502.5664,141.90804 L 502.5664,174.87293 L 284.19038,90.539858 L 71.974325,176.86692 z M 130.54849,175.34844 L 287.82283,112.43779 L 440.79415,177.03805 L 378.83496,176.75646 L 287.30556,144.35008 L 196.03681,174.70177 L 130.54849,175.34844 z" id="polygon6239" fill="#ffffff" fill-rule="evenodd" stroke-width="18.02"/>
+ <path id="path4156" d="m 72,144 0,33 212,-86 218,84 0,-33 -216,-89 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4158" d="m 131,175 65,-1 91,-30 92,32 62,1 -153,-65 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4160" d="M 72 194 L 72 230 L 90 230 L 90 428 L 72 428 L 72 446 L 505 446 L 505 428 L 487 428 L 487 230 L 505 230 L 505 194 L 72 194 z M 127 230 L 163 230 L 163 428 L 127 428 L 127 230 z M 199 230 L 235 230 L 235 428 L 199 428 L 199 230 z M 271 230 L 307 230 L 307 428 L 271 428 L 271 230 z M 343 230 L 379 230 L 379 428 L 343 428 L 343 230 z M 415 230 L 451 230 L 451 428 L 415 428 L 415 230 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4162" d="m 53.7,482 469.3,0 0,-18 -469.3,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4164" d="m 36,518 505,0 0,-18 -505,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 72,144 0,33 212,-86 218,84 0,-33 -216,-89 z" id="path4153" fill="#734a08"/>
+ <path d="m 131,175 65,-1 91,-30 92,32 62,1 -153,-65 z" id="path4150" fill="#734a08"/>
+ <path d="M 72 194 L 72 230 L 90 230 L 90 428 L 72 428 L 72 446 L 505 446 L 505 428 L 487 428 L 487 230 L 505 230 L 505 194 L 72 194 z M 127 230 L 163 230 L 163 428 L 127 428 L 127 230 z M 199 230 L 235 230 L 235 428 L 199 428 L 199 230 z M 271 230 L 307 230 L 307 428 L 271 428 L 271 230 z M 343 230 L 379 230 L 379 428 L 343 428 L 343 230 z M 415 230 L 451 230 L 451 428 L 415 428 L 415 230 z " id="path4148" fill="#734a08"/>
+ <path d="m 53.7,482 469.3,0 0,-18 -469.3,0 z" id="path4136" fill="#734a08"/>
+ <path d="m 36,518 505,0 0,-18 -505,0 z" id="path4152" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/museum.svg b/vtm-themes/resources/assets/symbols/tourist/museum.svg
old mode 100755
new mode 100644
index c4501bb2..5f43bedc
--- a/vtm-themes/resources/assets/symbols/tourist/museum.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/museum.svg
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 23.159867,470.46638 L 557.64236,469.5373 L 528.55835,419.16233 L 54.205081,419.16233 L 23.159867,470.46638 z" id="path828" sodipodi:nodetypes="ccccc" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" stroke-opacity=".581" fill="#ffffff" fill-rule="evenodd" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.615"/>
- <path d="M 101.35121,425.11637 L 101.35121,205.47952" id="path829" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
- <path d="M 223.95544,425.11637 L 223.95544,205.47952" id="path830" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
- <path d="M 354.92482,425.11637 L 354.92482,205.47952" id="path832" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
- <path d="M 477.52906,425.11637 L 477.52906,205.47952" id="path833" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="48.49"/>
- <path d="M 24.452984,148.9176 L 557.89553,148.9176 L 293.67923,59.311399 L 24.452984,148.9176 z" id="path837" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" stroke-opacity=".581" fill="#ffffff" fill-rule="evenodd" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.615"/>
- <rect id="rect3475" width="496.41" height="44.07" x="42.874" y="148.99" rx="0" fill="#ffffff" stroke="#ffffff" stroke-linecap="square" stroke-width="29.523"/>
+ <path id="path4193" d="M 293.31641 95.164062 L 74.449219 166.09961 L 41.287109 166.09961 L 41.287109 236.08984 L 87.712891 236.08984 L 87.712891 435.6543 L 65.921875 435.6543 L 36.548828 484.83594 L 543.45117 483.88867 L 515.97266 435.6543 L 490.39062 435.6543 L 490.39062 236.08984 L 539.66016 236.08984 L 539.66016 166.09961 L 507.44531 166.09961 L 293.31641 95.164062 z M 134.14062 236.08984 L 204.25391 236.08984 L 204.25391 435.6543 L 134.14062 435.6543 L 134.14062 236.08984 z M 249.73242 236.08984 L 328.37305 236.08984 L 328.37305 435.6543 L 249.73242 435.6543 L 249.73242 236.08984 z M 373.85156 236.08984 L 443.96484 236.08984 L 443.96484 435.6543 L 373.85156 435.6543 L 373.85156 236.08984 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 293.31641 95.164062 L 74.449219 166.09961 L 41.287109 166.09961 L 41.287109 236.08984 L 87.712891 236.08984 L 87.712891 435.6543 L 65.921875 435.6543 L 36.548828 484.83594 L 543.45117 483.88867 L 515.97266 435.6543 L 490.39062 435.6543 L 490.39062 236.08984 L 539.66016 236.08984 L 539.66016 166.09961 L 507.44531 166.09961 L 293.31641 95.164062 z M 134.14062 236.08984 L 204.25391 236.08984 L 204.25391 435.6543 L 134.14062 435.6543 L 134.14062 236.08984 z M 249.73242 236.08984 L 328.37305 236.08984 L 328.37305 435.6543 L 249.73242 435.6543 L 249.73242 236.08984 z M 373.85156 236.08984 L 443.96484 236.08984 L 443.96484 435.6543 L 373.85156 435.6543 L 373.85156 236.08984 z " id="path4181" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/picnic.svg b/vtm-themes/resources/assets/symbols/tourist/picnic.svg
old mode 100755
new mode 100644
index 381a645a..a366ff40
--- a/vtm-themes/resources/assets/symbols/tourist/picnic.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/picnic.svg
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path transform="matrix(14.685839,0,0,14.685839,569.76584,1146.0639)" d="M -24.382324,-58.667969 L -21.142578,-66.628174 L -17.822266,-66.628174 L -14.58252,-58.667969 L -24.382324,-58.667969 z M -13.822021,-66.628174 L -8.4228516,-66.628174 L -8.4228516,-69.588379 L -29.822998,-69.588379 L -29.822998,-66.628174 L -24.462891,-66.628174 L -27.702637,-58.667969 L -35.622559,-58.667969 L -35.622559,-55.708984 L -28.902588,-55.708984 L -32.62207,-46.427979 L -28.981934,-46.427979 L -25.222168,-55.708984 L -13.062744,-55.708984 L -9.3029785,-46.427979 L -5.6225586,-46.427979 L -9.3823242,-55.708984 L -2.6220703,-55.708984 L -2.6220703,-58.667969 L -10.582275,-58.667969 L -13.822021,-66.628174 z" id="flowRoot3192" fill="#ffffff"/>
+ <path id="path4133" d="M 144 145 L 144 194 L 212 194 L 174 289 L 67 289 L 67 339 L 154 339 L 105 461 L 163 461 L 213 339 L 367 339 L 417 461 L 476 461 L 427 339 L 513 339 L 513 289 L 407 289 L 368 194 L 437 194 L 437 145 L 144 145 z M 267 194 L 304 194 L 343 289 L 228 289 L 267 194 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 144 145 L 144 194 L 212 194 L 174 289 L 67 289 L 67 339 L 154 339 L 105 461 L 163 461 L 213 339 L 367 339 L 417 461 L 476 461 L 427 339 L 513 339 L 513 289 L 407 289 L 368 194 L 437 194 L 437 145 L 144 145 z M 267 194 L 304 194 L 343 289 L 228 289 L 267 194 z " id="path4136" fill="#734a08" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/ruin.svg b/vtm-themes/resources/assets/symbols/tourist/ruin.svg
old mode 100755
new mode 100644
index 98f0afc6..f319f171
--- a/vtm-themes/resources/assets/symbols/tourist/ruin.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/ruin.svg
@@ -1,76 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 35.844853,459.62169 L 540.74919,459.62892 M 53.553541,423.50382 L 502.78718,423.53056 M 71.615504,387.55222 L 444.7284,387.49148" id="path2161" sodipodi:nodetypes="cccccc" fill-rule="evenodd" stroke-width="18.02" fill="#ffffff" stroke="#ffffff"/>
- <path d="M 71.756306,162.26887 L 324.86921,182.20813 M 108.42188,167.53947 L 108.45313,390.35593 M 180.51255,167.53947 L 180.5438,390.35593 M 232.60322,167.53947 L 252.63447,390.35593 M 244.69389,247.53947 L 344.72515,390.35593" id="path3157" sodipodi:nodetypes="cccccccccc" fill-rule="evenodd" stroke-width="36.05" fill="#ffffff" stroke="#ffffff"/>
+ <path id="path4148" d="M 73 144 L 70 180 L 90 182 L 90 379 L 72 379 L 72 397 L 327 397 L 330 401 L 336 397 L 445 397 L 445 379 L 358 379 L 260 237 L 257 239 L 253 195 L 324 200 L 326 164 L 73 144 z M 126 185 L 163 188 L 163 379 L 127 379 L 126 185 z M 199 190 L 217 192 L 234 379 L 199 379 L 199 190 z M 263 305 L 314 379 L 270 379 L 263 305 z " mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4150" d="m 53.6,433 449.4,0 0,-18 -449.4,0 z" mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4152" d="m 35.8,469 505.2,0 0,-18 -505.1,0 z" mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 73 144 L 70 180 L 90 182 L 90 379 L 72 379 L 72 397 L 327 397 L 330 401 L 336 397 L 445 397 L 445 379 L 358 379 L 260 237 L 257 239 L 253 195 L 324 200 L 326 164 L 73 144 z M 126 185 L 163 188 L 163 379 L 127 379 L 126 185 z M 199 190 L 217 192 L 234 379 L 199 379 L 199 190 z M 263 305 L 314 379 L 270 379 L 263 305 z " id="path4145" fill="#734a08" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 53.6,433 449.4,0 0,-18 -449.4,0 z" id="path4137" fill="#734a08" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 35.8,469 505.2,0 0,-18 -505.1,0 z" id="path2161" fill="#734a08" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/theatre.svg b/vtm-themes/resources/assets/symbols/tourist/theatre.svg
old mode 100755
new mode 100644
index 092abf31..24ab2ea7
--- a/vtm-themes/resources/assets/symbols/tourist/theatre.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/theatre.svg
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 265.09375,130.96875 C 255.42724,130.9898 244.66623,138.72369 237.8125,145.1875 C 208.50923,167.68706 187.06659,183.80534 138.09375,197 C 119.4875,202.62024 81.59984,195.77961 44.4375,193.15625 C 20.710459,189.45796 41.04585,231.83122 44.21875,249.0625 C 65.317009,315.13731 89.59352,382.01479 132.46875,437.40625 C 156.92036,464.61897 190.73799,488.33878 228.65625,487.90625 C 259.99019,485.29355 285.85191,460.13326 293.1875,430.15625 C 293.82111,428.13286 294.40659,426.08395 294.9375,424.03125 C 295.77829,420.88845 296.58975,417.75226 297.34375,414.59375 C 292.71932,407.3835 289.22716,399.42884 287.1875,391.09375 C 286.5539,389.07037 285.99966,387.02145 285.46875,384.96875 C 268.42501,321.26082 269.47522,254.21513 276.875,189.1875 C 279.03002,178.75105 281.64627,168.41917 284.46875,158.15625 C 282.50748,151.63598 280.56372,145.10346 278.6875,138.5625 C 274.92537,133.03828 270.15716,130.95773 265.09375,130.96875 z" id="path3327" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="20"/>
- <path d="M 313.84375,100 C 306.0853,101.99335 307.19159,112.10518 304.625,118 C 293.17914,154.58947 281.68076,191.82114 281.21875,230.5 C 277.69848,288.6076 279.95274,348.63291 300.1875,403.59375 C 312.13002,428.38634 340.74171,446.28915 368.5,439.28125 C 407.63884,431.21039 438.8371,401.76392 459.15625,368.4375 C 497.25023,308.91718 518.75291,241.0346 538.25,173.625 C 538.62298,170.04023 540.08659,164.52452 537.90625,161.9375 C 519.11724,163.2403 500.19726,165.72219 481.3125,167.375 C 460.73266,169.33247 439.6763,167.40834 420.40625,159.875 C 386.01924,148.48422 355.72538,127.97556 328.15625,104.84375 C 323.94185,102.02441 319.0055,99.810649 313.84375,100 z M 375.34375,191.3125 C 391.64916,190.78972 399.09826,214.0955 388,224.75 C 373.05082,240.8641 349.58523,251.68637 327.5,245.96875 C 313.93662,241.09335 306.2658,221.54176 316.59375,210.09375 C 332.86073,195.96494 356.22327,198.35442 375.34375,191.3125 z M 441.3125,205.8125 C 458.42952,205.30332 470.90253,221.48377 473.125,237.15625 C 477.59536,247.94464 485.50373,260.07269 479.90625,271.96875 C 475.79828,280.92895 464.15597,282.57854 455.75,279.28125 C 435.64093,274.60965 422.23914,254.70832 421.84375,234.5 C 420.01567,222.90797 425.46195,208.04215 438.34375,206.125 C 439.32108,205.93479 440.31259,205.83211 441.3125,205.8125 z M 374.90625,311.375 C 396.03164,311.71968 415.34217,324.59963 427.71875,341.03125 C 435.58384,354.52488 431.83651,376.16924 415.875,381.6875 C 404.91236,384.10357 397.65903,373.60088 388.9375,369.09375 C 374.97247,360.14985 357.13266,360.03363 341.875,365.375 C 334.36799,367.72716 324.19438,366.01843 321.34375,357.75 C 316.46519,346.24714 323.41564,332.93355 333.46875,326.8125 C 345.31853,317.6737 359.78464,311.42355 374.90625,311.375 z" id="path3331" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="20"/>
- <path sodipodi:nodetypes="ccccccccccc" id="path3354" d="M 285.4541,384.97852 C 268.41036,321.27059 269.48954,254.20095 276.88932,189.17332 C 283.16816,158.7657 293.16738,129.32182 301.7164,99.51794 C 312.66079,83.447494 332.12672,96.27889 342.5705,106.1285 C 371.87377,128.62806 393.33157,144.76096 442.30441,157.95562 C 460.91065,163.57586 498.78475,156.72276 535.94709,154.0994 C 559.67413,150.40111 539.36072,192.77824 536.18782,210.00952 C 515.08956,276.08434 490.78524,342.94327 447.91,398.33473 C 423.45839,425.54744 389.65637,449.2867 351.73811,448.85417 C 320.40417,446.24146 294.53511,421.07144 287.19952,391.09443 C 286.56592,389.07104 285.98501,387.03122 285.4541,384.97852 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="20"/>
- <path d="M 186.12241,419.27686 C 170.53493,417.11172 155.64536,407.86822 148.14943,393.82511 C 156.45018,384.60253 168.30406,393.94518 177.99545,394.82651 C 200.59927,397.6843 221.72402,382.82159 232.73498,363.94829 C 239.87297,357.1071 240.80305,338.44975 253.21729,341.18549 C 262.17061,346.14062 260.48348,357.54208 258.29637,365.82526 C 256.88071,376.8697 251.51326,386.79943 244.41837,395.21953 C 238.82911,402.70552 233.279,411.2716 223.61206,413.75083 C 211.24992,416.05078 198.94862,421.89348 186.12241,419.27686 z M 130.89478,298.43387 C 118.97928,291.40044 104.61665,287.07557 96.170165,275.40016 C 94.286275,262.11694 111.04341,253.45542 122.18996,258.6432 C 135.31628,262.75007 147.72927,270.26671 156.03614,281.40001 C 161.54984,291.41743 151.97952,307.23533 140.07175,302.07563 C 136.9139,301.12126 133.97122,299.60336 130.89478,298.43387 z M 206.89207,273.8418 C 198.55822,262.89704 198.48009,243.84556 211.43127,236.33629 C 219.93732,230.71704 232.14405,226.85491 241.18494,233.48717 C 245.93063,243.2669 237.57259,252.23031 233.80123,260.69155 C 231.52257,269.23785 225.9191,278.83487 216.1538,279.68611 C 212.22197,279.78353 208.73096,277.17207 206.89207,273.8418 z" id="path3360" fill="#ffffff"/>
+ <path id="path4158" d="m 307.4653,92.583851 c -16.70287,6.8723 -20.19148,27.854419 -24.71286,43.255829 -4.86624,-4.47803 -11.16373,-6.85996 -16.88872,-6.85996 -13.9308,0 -24.61744,8.7655 -31.96451,15.62546 -34.32963,24.16992 -62.73449,39.56857 -91.79063,47.54329 -27.89693,3.37971 -55.720645,-1.6269 -78.527723,-3.66817 -10.877476,-0.90513 -14.980383,-0.6193 -18.701625,1.19097 -3.912075,1.90554 -6.774569,5.62135 -8.110399,9.14661 -2.576244,6.95523 -1.431247,13.3388 -0.09542,19.81764 2.67166,13.05297 8.396648,27.63038 19.083293,62.78765 10.686645,35.15727 34.25451,99.94573 67.841104,140.96254 33.58659,41.01682 68.82765,66.20406 105.89694,64.72726 37.0693,-1.47679 63.37185,-27.61681 72.9135,-58.4866 12.40414,12.00492 28.62493,20.0082 58.06091,21.10388 29.43598,1.09569 65.58714,-19.61836 99.22144,-60.58753 33.6343,-40.96918 55.68718,-109.72037 66.42153,-144.73473 4.27419,-20.94741 25.61136,-63.78806 18.94017,-82.7482 -16.99367,-23.78452 -73.73972,2.55448 -105.24435,-6.6694 -37.41788,-6.77882 -68.28451,-27.96167 -93.69893,-47.82914 C 335.32424,98.932831 320.21495,89.443079 307.4653,92.583851 Z m -37.21236,58.119059 c 1.33583,4.76386 2.76708,9.43244 4.19832,14.10102 -2.85091,9.81303 -4.3498,18.35645 -6.77456,27.5351 -2.28526,30.78106 -5.30236,62.53478 -4.65492,95.38891 0.64743,32.85414 4.5595,64.6767 11.33409,89.02002 6.77458,24.34331 9.06457,29.58355 11.92707,34.53796 -2.09165,8.33732 -4.54415,17.92733 -5.58191,22.05666 -5.4252,12.71752 -25.04687,34.34742 -49.85515,36.44352 -31.67826,-0.57167 -62.21152,-20.57987 -84.15731,-45.35193 C 107.56782,372.98451 84.667874,311.05436 64.439585,248.17144 59.69995,233.1379 53.791383,207.68718 53.791383,207.68718 c 28.309601,0.12741 68.598327,9.91709 93.660517,2.65923 47.70823,-12.86241 70.60818,-29.53592 98.27895,-50.49689 12.09986,-8.48444 18.91032,-14.41186 24.52209,-9.14661 z m 100.71201,75.98353 c -7.29936,7.76509 -26.38265,16.14948 -42.79428,12.14784 -3.05333,-1.2386 -6.29749,-4.66858 -7.63332,-8.67022 -3.95785,-13.21798 14.79158,-16.776 22.99537,-18.48377 8.58748,-1.71499 18.41538,-2.85831 28.29098,-6.14538 12.38355,3.26402 2.01177,18.04605 -0.85875,21.15153 z m 76.09462,-1.28624 c 7.2702,10.39836 10.50798,21.45234 14.59872,33.15645 1.33583,4.38275 1.52666,7.14579 0.0954,10.09938 l 0,0 0,0 c -4.36289,5.37153 -14.08475,1.45424 -17.65205,0.52402 -8.87373,-2.33429 -19.27412,-17.38808 -19.65578,-27.24927 -0.60891,-9.66762 0.45872,-21.86481 10.06644,-22.34248 4.91396,-0.19054 8.92145,2.00081 12.54727,5.8119 z M 209.4726,274.56321 c 1.71749,3.14415 5.05707,5.62135 8.87373,5.52608 9.35081,-0.8575 14.69413,-9.90883 16.88871,-18.10266 3.62583,-8.09856 11.44998,-16.57823 7.06082,-25.72483 -3.24416,-2.38193 -6.86999,-3.3347 -10.63894,-3.38234 -22.51923,-0.002 -35.24181,23.00456 -22.18432,41.68375 z m -104.09936,1.52444 c 10.21308,10.77525 28.8501,21.58097 41.88783,25.34372 11.35456,4.95441 20.51454,-10.19466 15.26663,-19.72237 -10.86401,-10.12439 -24.44238,-23.28089 -38.69137,-23.10471 -9.58935,-0.23819 -19.89433,7.19342 -18.46309,17.48336 z m 307.62266,67.26566 c 5.89298,9.92719 3.94103,28.0707 -5.72499,24.2004 -36.62794,-29.99872 -37.13376,-25.01618 -78.14608,-16.57822 -2.40005,-7.29886 3.33563,-15.51521 8.39668,-18.7696 10.01873,-7.71745 21.85037,-12.67186 33.44345,-12.7195 16.17308,0.33347 32.01221,10.52812 42.03094,23.86692 z m -177.85624,16.57823 c -10.49582,18.00738 -30.53327,32.1084 -52.19281,29.44064 -9.25539,-0.8575 -20.51453,-9.71827 -28.4341,-0.95277 7.15623,13.3388 21.37329,22.19957 36.25825,24.20039 23.63755,1.78684 42.34528,-5.03936 55.6278,-22.86651 6.77457,-8.00328 11.92705,-17.531 13.26288,-28.01148 2.09917,-7.90801 3.72125,-18.7696 -6.63144,-21.34209 -10.35268,-2.57248 -11.49768,13.43408 -17.89058,19.53182 z" mix-blend-mode="normal" isolation="auto" white-space="normal" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4144" d="m 265.95914,138.60272 c -9.2554,0 -19.46496,7.43161 -26.04869,13.52935 -27.67077,21.43736 -48.47156,36.77698 -95.41646,49.35357 -17.74746,5.33552 -53.433213,-1.14333 -89.691467,-3.62054 -22.6137,-3.52525 -3.244159,36.87226 -0.190833,53.25993 20.037456,62.88292 42.937406,126.71861 83.96648,179.12105 23.28162,25.72483 55.34155,48.49607 91.5998,48.59134 39.89169,-10.30241 57.60841,-37.14834 66.02819,-69.83815 -5.69579,-9.59843 -8.90756,-18.48259 -11.35456,-28.20203 -16.2208,-60.69155 -15.26663,-124.81307 -8.20582,-186.74322 2.09917,-9.90883 4.57999,-19.81765 7.25165,-29.53592 -1.90832,-6.19301 -3.72124,-12.38603 -5.53415,-18.67432 -3.09704,-4.39703 -10.16912,-7.19881 -12.40414,-7.24106 z" fill="#ffffff"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 307.4653,92.583851 c -16.70287,6.8723 -20.19148,27.854419 -24.71286,43.255829 -4.86624,-4.47803 -11.16373,-6.85996 -16.88872,-6.85996 -13.9308,0 -24.61744,8.7655 -31.96451,15.62546 -34.32963,24.16992 -62.73449,39.56857 -91.79063,47.54329 -27.89693,3.37971 -55.720645,-1.6269 -78.527723,-3.66817 -10.877476,-0.90513 -14.980383,-0.6193 -18.701625,1.19097 -3.912075,1.90554 -6.774569,5.62135 -8.110399,9.14661 -2.576244,6.95523 -1.431247,13.3388 -0.09542,19.81764 2.67166,13.05297 8.396648,27.63038 19.083293,62.78765 10.686645,35.15727 34.25451,99.94573 67.841104,140.96254 33.58659,41.01682 68.82765,66.20406 105.89694,64.72726 37.0693,-1.47679 63.37185,-27.61681 72.9135,-58.4866 12.40414,12.00492 28.62493,20.0082 58.06091,21.10388 29.43598,1.09569 65.58714,-19.61836 99.22144,-60.58753 33.6343,-40.96918 55.68718,-109.72037 66.42153,-144.73473 4.27419,-20.94741 25.61136,-63.78806 18.94017,-82.7482 -16.99367,-23.78452 -73.73972,2.55448 -105.24435,-6.6694 -37.41788,-6.77882 -68.28451,-27.96167 -93.69893,-47.82914 C 335.32424,98.932831 320.21495,89.443079 307.4653,92.583851 Z m -37.21236,58.119059 c 1.33583,4.76386 2.76708,9.43244 4.19832,14.10102 -2.85091,9.81303 -4.3498,18.35645 -6.77456,27.5351 -2.28526,30.78106 -5.30236,62.53478 -4.65492,95.38891 0.64743,32.85414 4.5595,64.6767 11.33409,89.02002 6.77458,24.34331 9.06457,29.58355 11.92707,34.53796 -2.09165,8.33732 -4.54415,17.92733 -5.58191,22.05666 -5.4252,12.71752 -25.04687,34.34742 -49.85515,36.44352 -31.67826,-0.57167 -62.21152,-20.57987 -84.15731,-45.35193 C 107.56782,372.98451 84.667874,311.05436 64.439585,248.17144 59.69995,233.1379 53.791383,207.68718 53.791383,207.68718 c 28.309601,0.12741 68.598327,9.91709 93.660517,2.65923 47.70823,-12.86241 70.60818,-29.53592 98.27895,-50.49689 12.09986,-8.48444 18.91032,-14.41186 24.52209,-9.14661 z m 100.71201,75.98353 c -7.29936,7.76509 -26.38265,16.14948 -42.79428,12.14784 -3.05333,-1.2386 -6.29749,-4.66858 -7.63332,-8.67022 -3.95785,-13.21798 14.79158,-16.776 22.99537,-18.48377 8.58748,-1.71499 18.41538,-2.85831 28.29098,-6.14538 12.38355,3.26402 2.01177,18.04605 -0.85875,21.15153 z m 76.09462,-1.28624 c 7.2702,10.39836 10.50798,21.45234 14.59872,33.15645 1.33583,4.38275 1.52666,7.14579 0.0954,10.09938 l 0,0 0,0 c -4.36289,5.37153 -14.08475,1.45424 -17.65205,0.52402 -8.87373,-2.33429 -19.27412,-17.38808 -19.65578,-27.24927 -0.60891,-9.66762 0.45872,-21.86481 10.06644,-22.34248 4.91396,-0.19054 8.92145,2.00081 12.54727,5.8119 z M 209.4726,274.56321 c 1.71749,3.14415 5.05707,5.62135 8.87373,5.52608 9.35081,-0.8575 14.69413,-9.90883 16.88871,-18.10266 3.62583,-8.09856 11.44998,-16.57823 7.06082,-25.72483 -3.24416,-2.38193 -6.86999,-3.3347 -10.63894,-3.38234 -22.51923,-0.002 -35.24181,23.00456 -22.18432,41.68375 z m -104.09936,1.52444 c 10.21308,10.77525 28.8501,21.58097 41.88783,25.34372 11.35456,4.95441 20.51454,-10.19466 15.26663,-19.72237 -10.86401,-10.12439 -24.44238,-23.28089 -38.69137,-23.10471 -9.58935,-0.23819 -19.89433,7.19342 -18.46309,17.48336 z m 307.62266,67.26566 c 5.89298,9.92719 3.94103,28.0707 -5.72499,24.2004 -36.62794,-29.99872 -37.13376,-25.01618 -78.14608,-16.57822 -2.40005,-7.29886 3.33563,-15.51521 8.39668,-18.7696 10.01873,-7.71745 21.85037,-12.67186 33.44345,-12.7195 16.17308,0.33347 32.01221,10.52812 42.03094,23.86692 z m -177.85624,16.57823 c -10.49582,18.00738 -30.53327,32.1084 -52.19281,29.44064 -9.25539,-0.8575 -20.51453,-9.71827 -28.4341,-0.95277 7.15623,13.3388 21.37329,22.19957 36.25825,24.20039 23.63755,1.78684 42.34528,-5.03936 55.6278,-22.86651 6.77457,-8.00328 11.92705,-17.531 13.26288,-28.01148 2.09917,-7.90801 3.72125,-18.7696 -6.63144,-21.34209 -10.35268,-2.57248 -11.49768,13.43408 -17.89058,19.53182 z" id="path3354" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 265.95914,138.60272 c -9.2554,0 -19.46496,7.43161 -26.04869,13.52935 -27.67077,21.43736 -48.47156,36.77698 -95.41646,49.35357 -17.74746,5.33552 -53.433213,-1.14333 -89.691467,-3.62054 -22.6137,-3.52525 -3.244159,36.87226 -0.190833,53.25993 20.037456,62.88292 42.937406,126.71861 83.96648,179.12105 23.28162,25.72483 55.34155,48.49607 91.5998,48.59134 39.89169,-10.30241 57.60841,-37.14834 66.02819,-69.83815 -5.69579,-9.59843 -8.90756,-18.48259 -11.35456,-28.20203 -16.2208,-60.69155 -15.26663,-124.81307 -8.20582,-186.74322 2.09917,-9.90883 4.57999,-19.81765 7.25165,-29.53592 -1.90832,-6.19301 -3.72124,-12.38603 -5.53415,-18.67432 -3.09704,-4.39703 -10.16912,-7.19881 -12.40414,-7.24106 z" id="path3327-8" opacity="0.1" fill="#734a08"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/view_point.svg b/vtm-themes/resources/assets/symbols/tourist/view_point.svg
old mode 100755
new mode 100644
index 22641ca1..b73327a8
--- a/vtm-themes/resources/assets/symbols/tourist/view_point.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/view_point.svg
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734a08" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path sodipodi:nodetypes="cszss" id="use6027" d="m 264.50523,235.49926 c -0.16658,0.78886 -42.10316,-33.79044 -85.91597,-79.79102 -9.98712,-10.48582 -67.67963,-60.980315 -14.46661,-91.66394 54.45289,-31.398539 69.60929,44.6705 73.90403,61.46637 15.13669,59.19661 26.64513,109.19973 26.47855,109.98859 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
- <path sodipodi:nodetypes="cszss" id="use6039" d="m 323.1887,233.94211 c -0.76647,0.25017 8.2118,-53.35763 26.14307,-114.30092 4.08742,-13.89201 18.9707,-89.10244 72.15,-58.360413 54.41838,31.458315 -3.88114,82.618663 -16.27943,94.735943 -43.69743,42.70707 -81.24718,77.67522 -82.01364,77.92539 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
- <path sodipodi:nodetypes="cszss" id="use6039-1" d="m 319.7866,336.12097 c 0.14256,-0.79356 43.1095,32.49679 88.29851,77.14619 10.30082,10.17782 69.49954,58.89775 17.24246,91.18255 -53.47465,33.03704 -70.93322,-42.53685 -75.73582,-59.19461 -16.92668,-58.70986 -29.9477,-108.34057 -29.80515,-109.13413 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
- <path sodipodi:nodetypes="cszss" id="use6039-1-7" d="m 266.29377,332.92737 c -0.14256,-0.79356 -43.1095,32.49679 -88.29851,77.14619 -10.30082,10.17782 -69.49954,58.89775 -17.24246,91.18255 53.47465,33.03704 70.93322,-42.53685 75.73582,-59.19461 16.92668,-58.70986 29.9477,-108.34057 29.80515,-109.13413 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
- <path sodipodi:nodetypes="cszss" id="use6039-1-7-4" d="m 346.34706,286.69224 c -0.60652,-0.53121 50.06828,-20.19002 111.62218,-35.89777 14.03119,-3.58057 86.2947,-29.19516 87.02319,32.22617 0.74548,62.85244 -73.01387,38.85718 -89.76365,34.38608 -59.03422,-15.75823 -108.27519,-30.18327 -108.88172,-30.71448 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
- <path sodipodi:nodetypes="cszss" id="use6039-1-7-4-9" d="m 236.05283,287.13694 c 0.60652,-0.53121 -50.06828,-20.19002 -111.62218,-35.89777 -14.03119,-3.58057 -86.294699,-29.19516 -87.023189,32.22617 -0.74548,62.85244 73.013869,38.85718 89.763649,34.38608 59.03422,-15.75823 108.27519,-30.18327 108.88172,-30.71448 z" inkscape:connector-curvature="0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="13.06"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4136" d="m 341,125 c -3,5 -5,10 -7,15 -9,33 -17,67 -25,101 -2,8 0,18 8,14 19,-15 36,-31 53,-48 13,-13 28,-26 39,-42 8,-11 13,-26 7,-40 -8,-14 -24,-24 -40.5,-24.5 C 359,100 347,112 341,125 Z m -173,2 c -6,14 -1,29 7,40 11,16 25,29 38,43 17,16 34,33 53,47 9,4 10,-6 8,-14 -8,-34 -16,-68 -25,-101 l -6,-15 c -6,-13 -18,-25 -35,-24 -17,1 -33,10 -40,24 z M 86,270 c -7.1,14 -7,32 2,46 9,12 24,15 38,14 19,-1 38,-8 56,-13 23,-6 46,-13 68,-21 7,-6 -1,-12 -8,-14 -34,-11 -67,-21 -101,-29 -5,-1 -10,-2 -21.5,-2 C 108,251 92,256 86,270 Z m 353,-17 c -34,8 -67,18 -100,29 -8,2 -16,8 -8,14 22,8 44,15 67,21 19,5 37,12 56,13 14,1 29,-2 38,-14 9,-14 9,-32 2,-46 -6,-14 -22,-19 -33,-19 -11,0 -17,1 -22,2 z m -174,70 c -18,15 -35,31 -52,48 -13,14 -28,26 -39,42 -8,11 -13,27 -7,40 8,14 23,24 39,25 16,2 29,-11 36,-25 2,-4 4,-9 6,-14 10,-34 18,-68 25,-102 0.88149,-11.07469 0.84813,-19.09468 -8,-14 z m 43,16 c 8,34 16,68 26,102 1,5 3,10 6,15 7,13 20,26 36,24 16,-1 31,-10 39,-25 6,-13 1,-28 -7,-40 -11,-16 -26,-28 -39,-42 -17,-16 -34,-33 -52,-47 -12.69071,-6.57256 -9.76024,7.99545 -9,13 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 341,125 c -3,5 -5,10 -7,15 -9,33 -17,67 -25,101 -2,8 0,18 8,14 19,-15 36,-31 53,-48 13,-13 28,-26 39,-42 8,-11 13,-26 7,-40 -8,-14 -24,-24 -40.5,-24.5 C 359,100 347,112 341,125 Z m -173,2 c -6,14 -1,29 7,40 11,16 25,29 38,43 17,16 34,33 53,47 9,4 10,-6 8,-14 -8,-34 -16,-68 -25,-101 l -6,-15 c -6,-13 -18,-25 -35,-24 -17,1 -33,10 -40,24 z M 86,270 c -7.1,14 -7,32 2,46 9,12 24,15 38,14 19,-1 38,-8 56,-13 23,-6 46,-13 68,-21 7,-6 -1,-12 -8,-14 -34,-11 -67,-21 -101,-29 -5,-1 -10,-2 -21.5,-2 C 108,251 92,256 86,270 Z m 353,-17 c -34,8 -67,18 -100,29 -8,2 -16,8 -8,14 22,8 44,15 67,21 19,5 37,12 56,13 14,1 29,-2 38,-14 9,-14 9,-32 2,-46 -6,-14 -22,-19 -33,-19 -11,0 -17,1 -22,2 z m -174,70 c -18,15 -35,31 -52,48 -13,14 -28,26 -39,42 -8,11 -13,27 -7,40 8,14 23,24 39,25 16,2 29,-11 36,-25 2,-4 4,-9 6,-14 10,-34 18,-68 25,-102 0.88149,-11.07469 0.84813,-19.09468 -8,-14 z m 43,16 c 8,34 16,68 26,102 1,5 3,10 6,15 7,13 20,26 36,24 16,-1 31,-10 39,-25 6,-13 1,-28 -7,-40 -11,-16 -26,-28 -39,-42 -17,-16 -34,-33 -52,-47 -12.69071,-6.57256 -9.76024,7.99545 -9,13 z" id="path4166" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/windmill.svg b/vtm-themes/resources/assets/symbols/tourist/windmill.svg
old mode 100755
new mode 100644
index e7ad1ff6..51417601
--- a/vtm-themes/resources/assets/symbols/tourist/windmill.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/windmill.svg
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#734A08" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 184.78155,542.01606 L 240.33221,215.29258 L 292.63713,183.97397 L 343.80161,216.12787 C 343.80161,216.12787 390.64574,547.32866 385.19959,544.67234 C 379.75344,542.01606 185.87079,546.00051 184.78155,542.01606 z" id="path3457" sodipodi:nodetypes="ccccsc" opacity=".5" fill="#ffffff" fill-rule="evenodd" stroke-width="14.07"/>
- <path d="M 78.35819,96.82824 L 139.07109,40.013241 L 286.19495,240.60115 L 267.45324,258.73256 L 78.35819,96.82824 z" id="path4180" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
- <path id="path4188" d="M 506.19495,96.82824 L 445.48205,40.013241 L 298.35819,240.60115 L 317.0999,258.73256 L 506.19495,96.82824 z" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
- <path id="path4194" d="M 506.19495,421.91756 L 445.48205,478.73256 L 298.35819,278.14465 L 317.0999,260.01324 L 506.19495,421.91756 z" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
- <path d="M 78.35819,421.91756 L 139.07109,478.73256 L 286.19495,278.14465 L 267.45324,260.01324 L 78.35819,421.91756 z" id="path4196" sodipodi:nodetypes="ccccc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="24.6"/>
+ <path fill="none" opacity="0.8" d="m240 220l50.9-30.4 50 31.4c0 0 45.9 324 40 322l-196-.2z" id="path4147" mix-blend-mode="normal" solid-color="#000000" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4149" d="M 440.07812 36.986328 C 436.34211 37.034888 432.70664 38.717969 430.40039 41.699219 L 290 233 L 150 41.699219 C 145.2 35.999219 137.1 35.500781 132 40.050781 L 72 96 C 66.8 100.9 66.900391 109.3 72.400391 114 L 248 263 L 72 414 C 66.5 418.7 66.399609 427 71.599609 432 L 130.59961 487.69922 C 135.89961 492.59922 144.29961 491.9 148.59961 486 L 288.59961 294 L 429.59961 485 C 433.89961 490.8 442.29961 491.59922 447.59961 486.69922 L 506.59961 431 C 511.79961 426.1 511.69922 417.7 506.19922 413 L 332 263 L 507 114 C 512.5 109.3 512.60039 101 507.40039 96 L 448.40039 40 C 445.95039 37.9 442.98391 36.94856 440.07812 36.986328 z M 290.40039 256.69922 L 298 264.09961 L 290.40039 271.5 L 282.80078 264.09961 L 290.40039 256.69922 z " mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path fill="none" id="path4139" d="m185 541l54.9-320 50.9-30.4 50 31.4c0 0 45.9 324 40 322-5.3-2.6-195 1.3-196-2.6" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4141" d="m 239.9,221 50.9,-30.4 50,31.4 c 0,0 45.9,324 40,322 -5.3,-2.6 -195,1.3 -195.9,-2.8 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m185 541l54.9-320 50.9-30.4 50 31.4c0 0 45.9 324 40 322-5.3-2.6-195 1.3-196-2.6" id="path3457-1" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 239.9,221 50.9,-30.4 50,31.4 c 0,0 45.9,324 40,322 -5.3,-2.6 -195,1.3 -195.9,-2.8 z" id="path3457" opacity="0.5" fill="#734a08" fill-rule="evenodd"/>
+ <path id="path4148" d="m185 541l54.9-320 50.9-30.4 50 31.4c0 0 45.9 324 40 322-5.3-2.6-195 1.3-196-2.6" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4162" d="m240 220l50.9-30.4 50 31.4c0 0 45.9 324 40 322l-196-.2z" opacity="0.5" fill="#734a08" fill-rule="evenodd"/>
+ <path d="M 440.07812 36.986328 C 436.34211 37.034888 432.70664 38.717969 430.40039 41.699219 L 290 233 L 150 41.699219 C 145.2 35.999219 137.1 35.500781 132 40.050781 L 72 96 C 66.8 100.9 66.900391 109.3 72.400391 114 L 248 263 L 72 414 C 66.5 418.7 66.399609 427 71.599609 432 L 130.59961 487.69922 C 135.89961 492.59922 144.29961 491.9 148.59961 486 L 288.59961 294 L 429.59961 485 C 433.89961 490.8 442.29961 491.59922 447.59961 486.69922 L 506.59961 431 C 511.79961 426.1 511.69922 417.7 506.19922 413 L 332 263 L 507 114 C 512.5 109.3 512.60039 101 507.40039 96 L 448.40039 40 C 445.95039 37.9 442.98391 36.94856 440.07812 36.986328 z M 290.40039 256.69922 L 298 264.09961 L 290.40039 271.5 L 282.80078 264.09961 L 290.40039 256.69922 z " id="path4144" fill="#734a08" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/tourist/zoo.svg b/vtm-themes/resources/assets/symbols/tourist/zoo.svg
old mode 100755
new mode 100644
index 16e9158c..20148186
--- a/vtm-themes/resources/assets/symbols/tourist/zoo.svg
+++ b/vtm-themes/resources/assets/symbols/tourist/zoo.svg
@@ -1,75 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#734A08" stroke="#eee" stroke-width="3.408"/>
+ <g id="g4143">
+  <path id="path4151" d="m 112,362 c -3,-5 -15,-12 -21,-14 -8,-2 -22,8 -11,15 l -3,7 c -9,-5 -11.2,-18 -10,-27 0,-6 6,-13 8,-19 7,-17 12,-34 17,-51 2,-7 3,-20 9,-25 5,-4 14,-5 20,-8 5,-2 8,-7 13,-8 11,-4 21,-3 26,-14 11,16 20,31 22,51 1,15 -8,29 -12,43 -2,10 -1,19 -4,29 -3,12 -9,23 -12,34 -2,8 0,16 -2,22 -4,12 -27,20 -24,35 1,7 9,8 15,10 14,2 28,1 42,-1 4,-1 9,0 13,-4 8,-8 -2,-24 1,-34 2,-7 9,-13 12,-19 8,-14 14,-29 18,-44 l 2,0 c 0,13 3,30 8,42 4,8 12,19 12,28 -1,15 -23,24 -12,42 10,17 36,-1 49,-4 8,-1 18,1 21,-8 5,-12 -5,-24 -7,-36 -2,-13 1,-27 -2,-40 -1,-10 -9,-21 -9,-31 0,-7 5,-15 6,-22 l 44,20 19,11 c 0,10 0,22 1,31 1,5 5,9 4,14 -2,9 -25,19 -20,29 3,5 11,7 16,8 14,4 49,9 59,-4 5,-5 4,-15 4,-21 0,-18 2,-36 -2,-52 15,9 18,27 26,42 2,6 8,14 6,20 -3,9 -31,24 -18,36 4,4 10,4 15,5 13,4 53,11 60,-7 5,-16 4,-45 0,-62 -3,-10 -8,-18 -9,-29 -1,-9 6,-19 6,-28 1,-14 -3,-26 -3,-38 0,-9 2,-17 2,-26 13,34 0,70 9,104 1,5 2,33 12,30 3,-1 5,-7 4,-10 -3,-14 -9,-26 -9,-41 0,-7 3,-14 4,-22 4,-42 11,-102 -25,-133 -17,-14 -34,-24 -52,-36 -14,-9 -29,-19 -45,-23 -13,-2 -26,1 -38,1 -27,-1 -54,-7 -81,-9 -12,-1 -25,1 -37,-1 -27,-5 -46,-25 -73,-32 -8,-2 -22,-1 -31,1 -8,1 -12,7 -18,11 -18,13 -42,34 -52,54 -6.2,13 -7,29 -11,43 -5,19 -16.4,36 -20,56 -3.1,22 2,44 2,66 0,16 -9,36 -3.2,52 8.1,22 51.2,29 54.2,0 6,2 19,0 15,-9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+  <path d="m 112,362 c -3,-5 -15,-12 -21,-14 -8,-2 -22,8 -11,15 l -3,7 c -9,-5 -11.2,-18 -10,-27 0,-6 6,-13 8,-19 7,-17 12,-34 17,-51 2,-7 3,-20 9,-25 5,-4 14,-5 20,-8 5,-2 8,-7 13,-8 11,-4 21,-3 26,-14 11,16 20,31 22,51 1,15 -8,29 -12,43 -2,10 -1,19 -4,29 -3,12 -9,23 -12,34 -2,8 0,16 -2,22 -4,12 -27,20 -24,35 1,7 9,8 15,10 14,2 28,1 42,-1 4,-1 9,0 13,-4 8,-8 -2,-24 1,-34 2,-7 9,-13 12,-19 8,-14 14,-29 18,-44 l 2,0 c 0,13 3,30 8,42 4,8 12,19 12,28 -1,15 -23,24 -12,42 10,17 36,-1 49,-4 8,-1 18,1 21,-8 5,-12 -5,-24 -7,-36 -2,-13 1,-27 -2,-40 -1,-10 -9,-21 -9,-31 0,-7 5,-15 6,-22 l 44,20 19,11 c 0,10 0,22 1,31 1,5 5,9 4,14 -2,9 -25,19 -20,29 3,5 11,7 16,8 14,4 49,9 59,-4 5,-5 4,-15 4,-21 0,-18 2,-36 -2,-52 15,9 18,27 26,42 2,6 8,14 6,20 -3,9 -31,24 -18,36 4,4 10,4 15,5 13,4 53,11 60,-7 5,-16 4,-45 0,-62 -3,-10 -8,-18 -9,-29 -1,-9 6,-19 6,-28 1,-14 -3,-26 -3,-38 0,-9 2,-17 2,-26 13,34 0,70 9,104 1,5 2,33 12,30 3,-1 5,-7 4,-10 -3,-14 -9,-26 -9,-41 0,-7 3,-14 4,-22 4,-42 11,-102 -25,-133 -17,-14 -34,-24 -52,-36 -14,-9 -29,-19 -45,-23 -13,-2 -26,1 -38,1 -27,-1 -54,-7 -81,-9 -12,-1 -25,1 -37,-1 -27,-5 -46,-25 -73,-32 -8,-2 -22,-1 -31,1 -8,1 -12,7 -18,11 -18,13 -42,34 -52,54 -6.2,13 -7,29 -11,43 -5,19 -16.4,36 -20,56 -3.1,22 2,44 2,66 0,16 -9,36 -3.2,52 8.1,22 51.2,29 54.2,0 6,2 19,0 15,-9 z" id="path6" fill="#734a08"/>
  </g>
- <path id="path6" d="M 96.846181,370.80896 C 102.4913,372.47363 116.35648,371.07296 111.60422,361.70746 C 108.96749,356.51055 96.561781,349.96831 91.082089,348.41661 C 82.825026,346.07754 68.952006,356.22926 79.553903,362.73923 L 77.248266,369.65614 C 68.369948,365.41377 65.839627,352.43073 66.562444,343.14131 C 67.070722,336.60829 72.969579,329.71905 75.306458,323.5434 C 81.690537,306.6719 86.934133,290.09091 91.899553,272.81938 C 93.884361,265.91515 94.472298,252.8491 100.47456,248.29662 C 106.09859,244.03004 114.73562,243.40867 121.05076,240.26608 C 125.70584,237.94892 128.74698,233.18201 133.75367,231.63378 C 144.50371,228.3102 155.09465,229.16675 160.25121,217.48408 C 171.13843,233.91982 180.22725,249.23501 182.03372,269.36092 C 183.31796,283.66855 173.55128,298.33817 170.25422,312.01521 C 167.94973,321.57554 168.65987,331.31339 166.14903,340.83568 C 163.01682,352.70971 156.90804,363.68454 153.928,375.42024 C 152.1296,382.49969 153.74124,390.55444 151.53129,397.32264 C 147.57597,409.43761 124.99571,416.67731 127.68062,431.90258 C 128.92106,438.93824 137.12452,440.32162 142.95893,441.51594 C 156.50686,444.28847 171.09116,442.57769 184.4604,440.48417 C 188.91259,439.78671 194.31815,440.64787 197.7939,437.17212 C 206.18527,428.7819 196.27103,412.92719 198.98938,403.08788 C 200.93649,396.03609 207.6067,389.89157 211.09051,383.48997 C 218.66453,369.56853 225.07766,354.90352 229.42033,339.68286 L 230.57315,339.68286 C 230.84982,353.09936 234.08809,369.91437 239.23543,382.33715 C 242.48522,390.18093 250.85353,401.43474 250.62528,410.00479 C 250.23332,424.6917 227.98046,434.29814 238.65325,451.48436 C 249.39061,468.77318 274.76876,451.37946 288.21408,448.33717 C 295.5852,446.66904 305.46947,448.85248 309.08701,439.92851 C 314.08102,427.61179 303.94429,415.93605 302.24388,404.2407 C 300.29677,390.85648 302.81107,377.3904 300.35902,363.89205 C 298.56524,354.01355 290.52433,342.51879 290.79409,332.76595 C 290.98315,325.90322 295.85496,317.777 297.43663,310.86239 L 341.24374,331.43444 L 359.68884,341.9885 C 359.76953,351.78745 359.50093,363.49548 361.22093,373.1146 C 362.04289,377.70858 366.35674,382.34983 365.04137,387.09829 C 362.47635,396.35081 339.82923,405.84427 344.92584,415.64784 C 347.72719,421.03612 355.4603,422.88178 360.84165,424.26516 C 374.47028,427.76973 410.17653,433.03465 420.19567,420.25566 C 424.61097,414.62414 424.24437,405.25403 424.24668,398.47661 C 424.2536,381.39414 426.0543,363.29604 421.94104,346.59977 C 436.77551,355.74739 440.14866,374.13023 447.58434,389.25406 C 450.15974,394.49247 455.52611,402.79968 453.77036,408.83468 C 451.06124,418.14254 423.2933,432.67613 436.14146,445.243 C 439.70367,448.72797 446.17905,448.98736 450.76151,450.38227 C 464.02123,454.41713 504.26958,461.00203 510.53746,443.41924 C 516.39493,426.98697 514.89973,397.96937 510.82336,381.18433 C 508.42434,371.30583 502.85162,362.73693 501.87749,352.36386 C 500.98175,342.81968 507.59316,333.16021 508.29869,323.5434 C 509.27973,310.15571 505.14112,298.39927 504.72956,285.50038 C 504.46556,277.20239 507.24962,268.6577 507.24962,260.13837 C 519.91218,293.70269 506.65707,329.81588 515.87386,363.89205 C 517.21574,368.85263 517.74027,396.98486 527.67641,394.15123 C 531.40232,393.08949 532.50442,386.62909 531.75624,383.48997 C 528.49376,369.79218 522.58441,357.68182 522.55214,343.14131 C 522.536,335.91084 525.83997,328.45902 526.6481,321.23776 C 531.41962,278.59269 538.08406,219.28709 501.48092,188.01689 C 485.15931,174.07356 467.47968,163.88933 449.60869,152.34454 C 435.62385,143.31024 421.3116,132.76288 404.64876,129.16712 C 392.42658,126.5297 379.02852,130.4275 366.60575,129.82365 C 339.51912,128.5069 312.91322,123.37997 285.90844,120.84308 C 273.6194,119.68853 261.44678,122.05792 249.01825,119.72046 C 222.3132,114.69798 202.56196,94.517658 176.39067,87.917425 C 168.10075,85.82695 153.73433,87.259511 145.26457,88.747339 C 137.26631,90.15251 133.03086,95.755093 126.80217,100.1901 C 108.71422,113.07054 84.992786,133.72502 74.977328,154.07815 C 68.829116,166.5724 68.169934,183.26946 64.225681,196.73335 C 58.476689,216.35778 47.555231,232.68515 44.322613,253.22146 C 40.93713,274.7296 46.123546,297.32254 46.122162,318.93212 C 46.121125,335.17764 37.033456,355.04993 42.817608,370.80896 C 50.903017,392.83817 93.824875,400.11707 96.846181,370.80896 z" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/traffic_signal.svg b/vtm-themes/resources/assets/symbols/traffic_signal.svg
index 87a547be..73e93602 100644
--- a/vtm-themes/resources/assets/symbols/traffic_signal.svg
+++ b/vtm-themes/resources/assets/symbols/traffic_signal.svg
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="4.16" height="7.67" viewBox="0 0 122.74678 226.3144">
- <metadata id="metadata14"/>
- <g transform="matrix(0.3,0,0,0.3,29.506437,29.61796)" id="g6771">
-  <path d="m 212.1,105 c 0,58 -47.5,105 -106,105 C 47.5,210 0.1,163 0.1,105 0,47 47.5,0 106,0 164.6,0 212.1,47 212.1,105 z" id="path6773" inkscape:connector-curvature="0"/>
-  <path d="m 212.1,452.3 c 0,58 -47.5,105 -106,105 -58.6,0 -106,-47 -106,-105 0,-58 47.5,-105 106,-105 58.5,0 106,47 106,105 z" id="path6775" inkscape:connector-curvature="0"/>
-  <path d="M 211.3,458.9 H 0 V 106.7 h 211.3 v 352.2 z" id="path6777" inkscape:connector-curvature="0"/>
-  <path d="m 190,103 c 0,46.4 -37.6,84 -84,84 -46.4,0 -84,-37.6 -84,-84 0,-46.4 37.6,-84 84,-84 46.4,0 84,37.6 84,84 z" id="path6779" inkscape:connector-curvature="0" fill="#ff0000"/>
-  <path d="m 190,455 c 0,46.4 -37.6,84 -84,84 -46.4,0 -84,-37.6 -84,-84 0,-46.4 37.6,-84 84,-84 46.4,0.1 84,37.7 84,84 z" id="path6781" inkscape:connector-curvature="0" fill="#32cd32"/>
-  <path d="m 190,279 c 0,46.4 -37.6,84 -84,84 -46.4,0 -84,-37.6 -84,-84 0,-46.4 37.6,-84 84,-84 46.4,0 84,37.6 84,84 z" id="path6783" inkscape:connector-curvature="0" fill="#ffff00"/>
- </g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" enable-background="new -0.2 -0.2 19 19" viewBox="-0.2 -0.2 580 580" height="580" width="580" version="1.0">
+ <metadata id="metadata20"/>
+ <path id="path8084" d="m 381.09,457.95 c -61.96,0 -123.63,0 -185.59,0 0,-109.35 0,-218.71 0,-328.06 62.82,0 125.35,0 188.16,0 0,109.35 0,218.71 0,328.06 0,0 -2.85,0 -2.85,0 z m 3.14,-8.28 c 0,46.83 -34.83,92.22 -82.23,97.65 -44.83,6.85 -89.94,-24.84 -101.64,-68.24 -14.85,-46.54 8.85,-102.79 55.1,-121.06 37.98,-16.56 85.09,-2.86 108.79,31.98 12.56,17.13 19.98,38.26 19.98,59.67 z m -0.85,-319.78 c 0,46.82 -34.55,92.22 -81.95,97.65 -44.83,6.85 -90.22,-24.85 -101.65,-68.24 -14.84,-46.54 8.86,-102.792 55.11,-121.066 40.83,-17.702 91.94,0 113.92,38.546 9.71,15.703 14.57,34.55 14.57,53.11 z" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="40"/>
+ <path id="path4" d="m 383.38,129.89 c 0,46.82 -34.55,92.22 -81.95,97.65 -44.83,6.85 -90.22,-24.85 -101.65,-68.24 -14.84,-46.54 8.86,-102.792 55.11,-121.066 40.83,-17.702 91.94,0 113.92,38.546 9.71,15.703 14.57,34.55 14.57,53.11 z" inkscape:connector-curvature="0"/>
+ <path id="path6" d="m 384.23,449.67 c 0,46.83 -34.83,92.22 -82.23,97.65 -44.83,6.85 -89.94,-24.84 -101.64,-68.24 -14.85,-46.54 8.85,-102.79 55.1,-121.06 37.98,-16.56 85.09,-2.86 108.79,31.98 12.56,17.13 19.98,38.26 19.98,59.67 z" inkscape:connector-curvature="0"/>
+ <path id="path8" d="m 381.09,457.95 c -61.96,0 -123.63,0 -185.59,0 0,-109.35 0,-218.71 0,-328.06 62.82,0 125.35,0 188.16,0 0,109.35 0,218.71 0,328.06 0,0 -2.85,0 -2.85,0 z" inkscape:connector-curvature="0"/>
+ <path id="path10" d="m 357.39,129.89 c 2.86,40.26 -35.97,79.37 -77.09,72.8 -42.26,-6.85 -71.66,-53.96 -57.96,-94.79 9.71,-38.829 56.53,-63.955 93.37,-45.967 25.69,11.706 41.97,39.977 41.68,67.957 z" inkscape:connector-curvature="0" fill="#ff0000"/>
+ <path id="path12" d="m 360.25,446.82 c 2.85,39.68 -33.98,77.09 -74.24,73.95 -41.97,0 -73.38,-44.83 -65.95,-85.09 3.99,-39.4 44.82,-70.52 83.94,-61.1 33.12,6.57 56.82,39.12 56.25,72.24 z" inkscape:connector-curvature="0" fill="#32cd32"/>
+ <path id="path14" d="m 360.25,285.78 c 2.85,39.4 -33.98,76.81 -74.24,73.67 -41.97,0 -73.38,-44.83 -65.95,-85.09 3.99,-39.12 44.82,-70.52 83.94,-61.1 33.12,6.85 56.82,39.12 56.25,72.52 z" inkscape:connector-curvature="0" fill="#ffff00"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/airport2.svg b/vtm-themes/resources/assets/symbols/transport/airport2.svg
old mode 100755
new mode 100644
index 09b90176..10a05366
--- a/vtm-themes/resources/assets/symbols/transport/airport2.svg
+++ b/vtm-themes/resources/assets/symbols/transport/airport2.svg
@@ -1,88 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <g id="g1970" transform="translate(68.799779,58.552307)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="30">
-  <path id="path1972" d="M 196.91,25.3815 C 196.97,-8.6185 248.219,-8.6185 248.185,26.3395 L 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 249.144,383.029 L 295.152,418.973 L 295.152,460.667 L 224.225,438.621 L 153.298,460.667 L 153.298,418.973 L 198.827,383.029 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 196.91,25.3815 z"/>
-  <path d="M 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 248.185,169.031 z" id="path7842" sodipodi:nodetypes="ccccccccc"/>
- </g>
- <g transform="translate(68.799779,58.552307)" id="g7850" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="40">
-  <path d="M 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 248.185,169.031 z" id="path7852" sodipodi:nodetypes="ccccccccc"/>
-  <path sodipodi:nodetypes="ccccccccc" id="path7854" d="M 248.185,169.031 L 447.949,289.095 L 447.949,341.812 L 249.144,276.382 L 198.827,276.382 L 0,341.812 L 0,289.095 L 196.91,169.031 L 248.185,169.031 z"/>
- </g>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4136" d="m 264.3,53.5 c -7.9,7 -13,18 -13,24.2 l 0,135.2 -192,117 c -6,3.6 -9.6,10 -9.6,17 l 0,52.7 c 0,13.6 13.3,23.3 26.3,19 l 178,-58 0,73 -39.8,31.4 c -3.6,2.8 -5.7,7.2 -5.7,11.8 l 0,41.7 c 0,10 9.8,17.3 19.4,14.3 L 293,513 l 67,21 c 9.6,3 19.4,-4.2 19.4,-14.3 l 0,-41.7 c 0,-4.6 -2.1,-9 -5.8,-11.8 l -40,-31.4 0,-73 178,58 c 12.9,4.3 26,-5.4 26.3,-19 l 0,-52.7 c 0,-7 -3.7,-13.5 -9.7,-17 l -195,-117 0,-128 c 0,-12.4 -5,-23.6 -12.9,-30.8 -7.9,-7.2 -17.8,-10.5 -27.95,-11.2 -10.15,-0.7 -20.15,2.4 -28.05,9.4 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 264.3,53.5 c -7.9,7 -13,18 -13,24.2 l 0,135.2 -192,117 c -6,3.6 -9.6,10 -9.6,17 l 0,52.7 c 0,13.6 13.3,23.3 26.3,19 l 178,-58 0,73 -39.8,31.4 c -3.6,2.8 -5.7,7.2 -5.7,11.8 l 0,41.7 c 0,10 9.8,17.3 19.4,14.3 L 293,513 l 67,21 c 9.6,3 19.4,-4.2 19.4,-14.3 l 0,-41.7 c 0,-4.6 -2.1,-9 -5.8,-11.8 l -40,-31.4 0,-73 178,58 c 12.9,4.3 26,-5.4 26.3,-19 l 0,-52.7 c 0,-7 -3.7,-13.5 -9.7,-17 l -195,-117 0,-128 c 0,-12.4 -5,-23.6 -12.9,-30.8 -7.9,-7.2 -17.8,-10.5 -27.95,-11.2 -10.15,-0.7 -20.15,2.4 -28.05,9.4 z" id="path7852" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#0092da" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/bus_station.svg b/vtm-themes/resources/assets/symbols/transport/bus_station.svg
old mode 100755
new mode 100644
index 730e48f5..d2455261
--- a/vtm-themes/resources/assets/symbols/transport/bus_station.svg
+++ b/vtm-themes/resources/assets/symbols/transport/bus_station.svg
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="580" width="580" version="1.0">
  <metadata id="metadata1976"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 289.075,74.970939 C 289.60491,74.970939 290.15544,74.991208 290.69088,74.995422 C 291.23004,74.99115 291.77323,74.970939 292.30677,74.970939 L 289.075,74.970939 z M 290.69088,74.995422 C 253.06535,75.29353 202.08803,85.88773 180.81067,94.75329 C 159.22842,103.7459 144.83592,112.74284 140.34008,135.22388 L 124.15675,259.86741 L 124.15675,431.59197 L 152.04301,431.59197 L 152.04301,458.52339 C 152.04301,491.36026 200.07888,491.36024 200.07888,458.52339 L 200.07888,431.59197 L 288.80568,431.59197 L 289.075,431.59197 L 381.30289,431.59197 L 381.30289,458.52339 C 381.30289,491.36026 429.36324,491.36024 429.36324,458.52339 L 429.36324,431.59197 L 457.2495,431.59197 L 457.2495,259.86741 L 441.06617,135.22388 C 436.57033,112.74284 422.17784,103.7459 400.59558,94.75329 C 379.31614,85.88686 328.31748,75.291548 290.69088,74.995422 z M 222.18713,106.45622 L 289.075,106.45622 L 359.21912,106.45622 C 372.70849,106.45623 372.7085,126.67927 359.21912,126.67927 L 288.9281,126.67927 L 222.18713,126.67927 C 208.69776,126.67927 208.69775,106.45622 222.18713,106.45622 z M 185.80523,147.12267 L 288.9281,147.12267 L 395.57654,147.12267 C 409.82585,147.12267 413.55543,154.35559 415.28545,165.33811 L 427.89425,255.72977 C 429.06887,264.39401 426.54587,272.99035 414.57544,272.99036 L 289.075,272.99036 L 166.80633,272.99036 C 154.83589,272.99036 152.33738,264.394 153.512,255.72977 L 166.1208,165.33811 C 167.85084,154.35559 171.5559,147.12267 185.80523,147.12267 z M 176.08543,331.6519 C 188.81487,331.65189 199.12404,341.98555 199.12404,354.71499 C 199.12404,367.44444 188.81487,377.7536 176.08543,377.7536 C 163.35599,377.75361 153.02234,367.44443 153.02234,354.71499 C 153.02234,341.98556 163.35599,331.6519 176.08543,331.6519 z M 405.32082,331.6519 C 418.05026,331.6519 428.35942,341.98556 428.35943,354.71499 C 428.35943,367.44443 418.05026,377.75361 405.32082,377.7536 C 392.59138,377.7536 382.25772,367.44444 382.25773,354.71499 C 382.25773,341.98555 392.59139,331.65189 405.32082,331.6519 z" id="path2115" fill="#ffffff"/>
- <path transform="matrix(0.9469422,0,0,0.9469422,84.843881,0.5062342)" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" sodipodi:ry="288.57144" sodipodi:rx="288.57144" sodipodi:cy="305.71429" sodipodi:cx="217.14285" id="path3267" sodipodi:type="arc" opacity=".1" fill="#ffffff" stroke="#ffffff" stroke-width="25.14"/>
- <path sodipodi:type="arc" id="path3276" sodipodi:cx="217.14285" sodipodi:cy="305.71429" sodipodi:rx="288.57144" sodipodi:ry="288.57144" d="M 505.71429,305.71429 A 288.57144,288.57144 0 1 1 -71.428589,305.71429 A 288.57144,288.57144 0 1 1 505.71429,305.71429 z" transform="matrix(0.9469422,0,0,0.9469422,84.843881,0.5062342)" fill="none" stroke="#ffffff" stroke-width="25.14"/>
+ <path d="M 538.44,290.05 C 544.54,450.86 368.85,580.11 217.18,526.95 61.846,485.23 -9.9891,279.27 85.795,150.03 171.56,13.911 389.53,6.1916 484.71,135.91 c 34.61,43.39 53.86,98.63 53.73,154.14 z" id="path8070" inkscape:connector-curvature="0" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="59.44"/>
+ <path id="path3267-1" d="M 538.01,290.05 C 544.12,450.86 368.43,580.11 216.76,526.95 61.422,485.23 -10.414,279.27 85.37,150.03 171.13,13.911 389.11,6.1916 484.28,135.91 c 34.62,43.39 53.86,98.63 53.73,154.14 z" inkscape:connector-curvature="0" fill="#ffffff"/>
+ <path id="path2115" d="m 289.19,94.914 c 3.87,0.05 3.91,-0.03 0,0 z m 1.47,0.02 c -40.54,2.18 -83.19,7.027 -118.87,27.757 -22.01,14.03 -18.08,42.33 -22.47,64.64 -3.83,35.34 -11.62,70.41 -9.79,106.11 0,41.7 0,83.4 0,125.1 7.86,1.05 19.92,-2.08 25.31,1.46 0.87,15.33 -4.64,37.01 13.79,43.93 22.14,8.34 33.33,-15.87 29.81,-34.13 -4,-13.11 6.25,-11.99 16.1,-11.26 49.45,0 98.9,0 148.35,0 1.05,15.75 -5.08,38.09 13.8,45.39 22.14,8.34 33.34,-15.86 29.81,-34.13 -3.99,-13.11 6.26,-11.99 16.11,-11.26 13.22,4.29 8.49,-9.36 9.2,-17.57 -0.38,-47.53 0.75,-95.16 -0.57,-142.62 -5.11,-37.46 -9.24,-75.1 -14.99,-112.44 -8.81,-29.7 -43.99,-36.33 -70.12,-42.89 -21.53,-4.555 -43.45,-7.763 -65.47,-8.087 z m -62.17,28.557 c 41.46,0 82.9,0 124.36,0 22.26,8.66 -2.29,23.51 -16.11,18.35 -36.08,0 -72.16,0 -108.25,0 -12.08,0.61 -12.07,-18.95 0,-18.35 z m -33.01,36.9 c 64.92,0.2 129.87,-0.41 194.78,0.3 17.29,3.48 13.11,24.84 16.5,37.97 2.66,22.03 7,43.93 8.5,66.05 -3.23,15.18 -21.62,8.35 -32.67,9.9 -69.35,-0.23 -138.73,0.46 -208.03,-0.36 -14.9,-5.32 -5.78,-23.97 -5.56,-35.6 4.13,-23.71 4.93,-48.27 11.55,-71.35 2.84,-5.37 9.29,-7.05 14.93,-6.91 z m -8.82,167.45 c 35.81,0 18.11,58.39 -11.7,38.27 -17.11,-10.57 -8.4,-39.05 11.7,-38.27 z m 208.02,0 c 35.81,-0.1 18.12,58.38 -11.7,38.27 -17.1,-10.57 -8.38,-39.05 11.7,-38.27 z" inkscape:connector-curvature="0" fill="#0092da"/>
+ <path id="path3276" d="M 538.44,290.05 C 544.54,450.86 368.85,580.11 217.18,526.95 61.846,485.23 -9.9891,279.27 85.795,150.03 171.56,13.911 389.53,6.1916 484.71,135.91 c 34.61,43.39 53.86,98.63 53.73,154.14 z" inkscape:connector-curvature="0" fill="none" stroke="#0092da" stroke-width="21.603"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/bus_stop.svg b/vtm-themes/resources/assets/symbols/transport/bus_stop.svg
old mode 100755
new mode 100644
index 2575f666..ff340dbc
--- a/vtm-themes/resources/assets/symbols/transport/bus_stop.svg
+++ b/vtm-themes/resources/assets/symbols/transport/bus_stop.svg
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="580" width="580" version="1.0">
  <metadata id="metadata1976"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 290.625 34.5625 C 291.30137 34.5625 292.00406 34.588371 292.6875 34.59375 C 293.37567 34.588298 294.069 34.5625 294.75 34.5625 L 290.625 34.5625 z M 292.6875 34.59375 C 244.66265 34.974252 179.59571 48.496579 152.4375 59.8125 C 124.89013 71.290575 106.51969 82.774174 100.78125 111.46875 L 80.125 270.5625 L 80.125 489.75 L 115.71875 489.75 L 115.71875 524.125 C 115.71875 566.03764 177.03125 566.03762 177.03125 524.125 L 177.03125 489.75 L 290.28125 489.75 L 290.625 489.75 L 408.34375 489.75 L 408.34375 524.125 C 408.34375 566.03764 469.6875 566.03762 469.6875 524.125 L 469.6875 489.75 L 505.28125 489.75 L 505.28125 270.5625 L 484.625 111.46875 C 478.88656 82.774174 460.51613 71.290573 432.96875 59.8125 C 405.80789 48.495478 340.71371 34.971722 292.6875 34.59375 z M 205.25 74.75 L 290.625 74.75 L 380.15625 74.75 C 397.37395 74.750004 397.37396 100.5625 380.15625 100.5625 L 290.4375 100.5625 L 205.25 100.5625 C 188.0323 100.5625 188.03229 74.75 205.25 74.75 z M 158.8125 126.65625 L 290.4375 126.65625 L 426.5625 126.65625 C 444.75018 126.65625 449.51057 135.88827 451.71875 149.90625 L 467.8125 265.28125 C 469.31177 276.3402 466.09144 287.31249 450.8125 287.3125 L 290.625 287.3125 L 134.5625 287.3125 C 119.28355 287.3125 116.09448 276.34019 117.59375 265.28125 L 133.6875 149.90625 C 135.8957 135.88827 140.62481 126.65625 158.8125 126.65625 z M 146.40625 362.1875 C 162.65398 362.18749 175.8125 375.37727 175.8125 391.625 C 175.8125 407.87274 162.65398 421.03125 146.40625 421.03125 C 130.15852 421.03126 116.96875 407.87273 116.96875 391.625 C 116.96875 375.37728 130.15852 362.1875 146.40625 362.1875 z M 439 362.1875 C 455.24773 362.1875 468.40624 375.37728 468.40625 391.625 C 468.40625 407.87273 455.24773 421.03126 439 421.03125 C 422.75227 421.03125 409.56249 407.87274 409.5625 391.625 C 409.5625 375.37727 422.75228 362.18749 439 362.1875 z " id="path2115" fill="#ffffff"/>
+ <path id="path8070" d="m 288.7,38.913 c 6.55,0.06 3.81,-0.03 0,0 z M 145.96,67.555 c -23.62,8.671 -41.09,30.692 -41.58,56.105 -6.029,49.21 -13.386,98.33 -18.579,147.59 l 0,208.25 34.309,0 c 1.33,17.27 -3.77,36.2 5.45,51.82 14.27,21.52 53.11,11.79 53.48,-14.86 0.37,-12.31 0.1,-24.64 0.17,-36.96 l 222.96,0 c 1.33,17.27 -3.77,36.2 5.46,51.82 14.27,21.52 53.11,11.8 53.49,-14.86 0.37,-12.31 0.1,-24.64 0.17,-36.96 l 34.32,0 C 495.39,407.93 496.06,336.31 495.28,264.77 488.19,212.66 482.47,160.29 474.52,108.33 465.32,73.801 426.83,62.461 396.31,53.935 312.68,32.693 219.26,36.845 145.96,67.555 Z m 15.69,60.505 c 87.07,0.1 174.15,-0.14 261.22,0.1 20.56,-0.1 21.22,22.65 23.26,37.84 4.48,33.41 9.58,66.77 13.67,100.23 1.74,18.89 -19.24,17.87 -32.29,17.33 l -289.24,0 c -20.42,0.77 -17.01,-22 -14.38,-35.48 5.46,-35.55 8.81,-71.52 15.76,-106.77 2.78,-9.69 12.69,-13.66 22,-13.25 z" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="40"/>
+ <path id="rect8097" d="m 114.09,117.02 c 118.51,0 237.01,0 355.52,0 0,105.5 0,211 0,316.5 -118.51,0 -237.01,0 -355.52,0 0,-105.5 0,-211 0,-316.5 z" opacity="0.765" stroke-opacity="0.737" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.8"/>
+ <path id="rect8101" d="m 184.75,69.913 c 70.17,0 140.35,0 210.52,0 0,13.248 0,26.497 0,39.747 -70.17,0 -140.35,0 -210.52,0 0,-13.25 0,-26.499 0,-39.747 z" opacity="0.765" stroke-opacity="0.737" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.8"/>
+ <path id="path2115-3" d="m 288.7,38.913 c 6.55,0.06 3.81,-0.03 0,0 z m 1.99,0.03 C 241.57,41 191.4,47.974 145.96,67.555 122.34,76.226 104.87,98.247 104.38,123.66 98.351,172.87 90.994,221.99 85.801,271.25 l 0,208.25 34.309,0 c 1.33,17.27 -3.77,36.2 5.45,51.82 14.27,21.52 53.11,11.79 53.48,-14.86 0.37,-12.31 0.1,-24.64 0.17,-36.96 l 222.96,0 c 1.33,17.27 -3.77,36.2 5.46,51.82 14.27,21.52 53.11,11.8 53.49,-14.86 0.37,-12.31 0.1,-24.64 0.17,-36.96 l 34.32,0 C 495.39,407.93 496.06,336.31 495.28,264.77 488.19,212.66 482.47,160.29 474.52,108.33 465.32,73.801 426.83,62.461 396.31,53.935 361.78,45.334 326.32,39.579 290.69,38.943 Z M 206.4,77.812 c 57.17,0.187 109.29,-1.099 166.44,-0.444 14.91,0.06 18,23.982 -2.14,24.702 -52.83,-0.19 -114.4,1.1 -167.21,0.45 -14.24,-2.525 -11.55,-25.692 2.91,-24.708 z m -44.75,50.248 c 87.07,0.1 174.15,-0.14 261.22,0.1 20.56,-0.1 21.22,22.65 23.26,37.84 4.48,33.41 9.58,66.77 13.67,100.23 1.74,18.89 -19.24,17.87 -32.29,17.33 l -289.24,0 c -20.42,0.77 -17.01,-22 -14.38,-35.48 5.46,-35.55 8.81,-71.52 15.76,-106.77 2.78,-9.69 12.69,-13.66 22,-13.25 z m -11.96,227.98 c 24.35,-1.28 38.11,32.33 20.05,48.62 -16.26,18.21 -49.79,4.17 -48.43,-20.14 -0.32,-15.27 13.08,-28.8 28.38,-28.48 z m 282.03,0 c 24.35,-1.27 38.1,32.34 20.04,48.62 -16.25,18.21 -49.78,4.17 -48.42,-20.14 -0.32,-15.27 13.08,-28.8 28.38,-28.48 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccc" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/fuel.svg b/vtm-themes/resources/assets/symbols/transport/fuel.svg
old mode 100755
new mode 100644
index 184fbfc1..987453b2
--- a/vtm-themes/resources/assets/symbols/transport/fuel.svg
+++ b/vtm-themes/resources/assets/symbols/transport/fuel.svg
@@ -1,23 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker8025">
-   <path id="path8027" d="M 10,0 L 0,5 L 10,10 L 10,0 z "/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="marker8021">
-   <path id="path8023" d="M 0,0 L 10,5 L 0,10 L 0,0 z "/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 249,111.75 C 240.51758,111.75 232.0625,117.88064 232.0625,127.6875 L 231.875,442.9375 L 249.3125,442.9375 L 249.46875,467.875 L 409.5625,467.78125 L 409.6875,442.9375 L 424.6875,443.0625 L 424.6875,124.4375 C 424.68751,117.64142 420.75087,111.75 413.34375,111.75 L 249,111.75 z M 275.78125,146.59375 L 380.6875,146.59375 C 386.49577,146.59375 391.06251,148.95926 391.0625,156.96875 L 391.0625,239.84375 C 391.0625,245.45746 388.06163,249.53125 381.65625,249.53125 L 276.0625,249.25 C 269.96423,249.25 264.71875,244.74463 264.71875,238.1875 L 265.25,156.6875 C 265.25,150.1638 269.76979,146.59375 275.78125,146.59375 z" id="path1897" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 232.83211,220.10791 L 216.8105,220.01303 C 216.70662,285.20608 217.18175,413.86794 217.45327,416.06937 C 218.03287,420.76868 217.68239,425.63716 216.47581,430.07245 C 191.35934,493.34558 110.08776,464.28417 121.62727,402.71575 C 146.97207,341.64522 182.51061,300.32073 200.19813,228.29037 L 201.77268,281.83519 C 185.8545,312.81087 157.77166,367.21167 135.99276,412.68501 C 134.15788,454.66887 184.10162,468.50125 199.74349,423.43723 C 206.71402,344.55555 199.48141,258.5723 199.35038,176.13983 C 209.5149,145.92256 220.73039,143.03014 232.11247,144.46938" id="path1899" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4141" d="M 479 50.900391 L 258 51 C 247 50.7 236 59 236 72 L 236 95 C 221 93 206 97 192 137 C 192 160 193 183 193 206 C 169 303 122 359 88 441 C 72 524 181 562 215 478 C 219 386 215 290 216 196 L 236 196 L 236 495 L 259 495 L 259 529 L 474 529 L 474 496 L 494 496 L 494 67.900391 C 494 58.800391 489 50.900391 479 50.900391 z M 295 98 L 435 98 C 442 98 448 101 448 112 L 448 223 C 448 230 444 236 436 236 L 295 235 C 287 235 280 229 280 220 L 280 111 C 280 103 286 98 295 98 z M 196 279 C 198 343 199 408 193 470 C 172 530 105 511 108 454 C 137 394 174 321 196 279 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 479 50.900391 L 258 51 C 247 50.7 236 59 236 72 L 236 95 C 221 93 206 97 192 137 C 192 160 193 183 193 206 C 169 303 122 359 88 441 C 72 524 181 562 215 478 C 219 386 215 290 216 196 L 236 196 L 236 495 L 259 495 L 259 529 L 474 529 L 474 496 L 494 496 L 494 67.900391 C 494 58.800391 489 50.900391 479 50.900391 z M 295 98 L 435 98 C 442 98 448 101 448 112 L 448 223 C 448 230 444 236 436 236 L 295 235 C 287 235 280 229 280 220 L 280 111 C 280 103 286 98 295 98 z M 196 279 C 198 343 199 408 193 470 C 172 530 105 511 108 454 C 137 394 174 321 196 279 z " id="path4138" fill="#ac39ac"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/helicopter.svg b/vtm-themes/resources/assets/symbols/transport/helicopter.svg
old mode 100755
new mode 100644
index 11da4dd2..1c81a047
--- a/vtm-themes/resources/assets/symbols/transport/helicopter.svg
+++ b/vtm-themes/resources/assets/symbols/transport/helicopter.svg
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata1976"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <g id="g3780" transform="matrix(1.4851465,0,0,1.4851465,-135.79563,-178.9105)">
-  <path sodipodi:nodetypes="cc" id="path2872" d="m 265.10872,398.21695 133.2798,0" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="18.7"/>
-  <path sodipodi:nodetypes="cccccccccccccccccccccc" id="path3660" d="m 325.40054,283.74495 c -27.11433,0.84507 -53.34269,9.42465 -80.529,9.87961 -34.92928,2.29399 -76.99751,3.87666 -111.94063,2.33695 1.99656,1.29533 11.54415,0.37374 11.46146,10.50423 2.816,5.21168 -6.14351,12.8561 -2.37094,14.37937 44.41493,2.77835 104.78136,26.58994 152.50411,46.64984 24.34401,8.36603 50.93941,6.82358 76.25,4.625 13.21538,-2.20492 29.92826,-3.26191 37.15625,-16.5 3.20298,-9.11621 -8.6e-4,-19.28648 -3.34375,-27.875 -11.6761,-27.02707 -41.17439,-41.70987 -69.46548,-43.73707 -3.23142,-0.26887 -6.48062,-0.35427 -9.72202,-0.26293 z m 25.96291,11.97167 c 12.0857,1.03859 24.30274,7.05641 32.10105,16.18312 8.62377,8.08029 13.16131,20.04676 14.02395,31.94188 -15.66602,0.52921 -28.81749,-0.0801 -43.71661,-0.0801 -7.73602,-16.05957 -16.47031,-31.19742 -24.12714,-47.29488 7.2289,-0.56234 12.93621,-1.23604 21.71875,-0.75 z m -34.59375,1.72517 c 7.20805,7.01924 17.11979,39.02726 20.93546,47.78885 -12.84377,-0.14361 -32.90884,0.35436 -45.75234,0.19042 -0.13401,-7.95854 -0.61938,-39.77742 -0.75146,-47.73599 8.10431,-0.12441 17.46396,-0.13307 25.56834,-0.24328 z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.5"/>
-  <path sodipodi:nodetypes="ccccc" id="path3662" d="m 311.72788,272.31885 c -12.3058,-2.26182 -27.05427,8.72945 -38.93108,13.81425 l 36.4194,2.51168 41.79147,-5.02336 c -8.58846,-4.45605 -26.07283,-13.00453 -39.27979,-11.30257 z" fill="#ffffff" stroke="#ffffff" stroke-width="3.7"/>
-  <path id="path3664" d="m 311.72788,245.31825 -0.62792,30.76812" fill="#ffffff" stroke="#ffffff" stroke-width="10.4"/>
-  <path id="path3666" d="m 156.08241,228.99232 154.38963,14.44217 159.41299,-13.81425 -7.53504,8.79089 -150.62211,8.16297 -148.11042,-6.90713 -7.53505,-10.67465 z" sodipodi:nodetypes="ccccccc" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="5.1"/>
-  <path id="path3726" d="m 124.32868,293.75121 c -3.56225,-9.47953 -6.98912,-19.03812 -10.52189,-28.53751 l -6.59375,0.375 0,0 c 4.65512,9.70907 9.08305,19.82866 13.73933,29.53563" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.1"/>
-  <path id="path3678" d="m 132.4186,323.78079 10.16944,29.18291 c 1.68267,-0.54311 6.53218,0.98878 6.90625,-1.0625 -5.3782,-9.42179 -9.37675,-19.68689 -13.76577,-29.71518" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10.1"/>
-  <path id="path3680" d="m 126.58241,291.30255 c -12.63207,0.0284 -21.2103,15.46427 -14.75279,26.22719 5.63246,11.59712 23.73241,12.38102 30.43823,1.4131 8.08174,-11.83297 -1.22345,-28.58449 -15.68544,-27.64029 z m 0.48045,7.99816 c 8.34686,-0.78819 13.60603,10.54095 7.57423,16.36373 -5.34325,6.46098 -17.01785,2.13193 -16.92897,-6.21765 -0.30203,-5.24668 4.09881,-10.01936 9.35474,-10.14608 z" fill="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="18.7"/>
- </g>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 118,187.2 198,9.2 -0.7,31.9 c -15.2,1.5 -32,13.3 -45.9,19 -66,6.3 -139,10.8 -199,7.1 -4.8,-12.6 -9.4,-25.5 -14.2,-38 -5.4,-9 -25.7,-3.5 -22,5.9 6,12.5 11.9,25.6 18,38 -17.8,16.6 -8,41.5 17.2,42.5 l 13.5,38 c 8.6,9.8 27,2.2 22,-7.2 -5.9,-10.3 -10.7,-21.7 -15.8,-33 60,4 140,38 193,56 52,17.5 88,17.8 117,14.5 29.4,-3.3 52.6,-8.2 61.8,-28 14,-56 -45.6,-94 -90,-102 -11,-5.3 -27,-11.9 -40.9,-12.3 l 0.7,-31.9 202,-10.8 c 3.7,0.6 9,-8.7 12.9,-13.2 2.1,-2.4 0.2,-6 -3,-5.8 l -222,17.9 -214,-19 c -2.8,0.8 -4.1,3.2 -2.05,5.25 3.35,4.65 7.45,15.35 13.45,15.95 z M 53.8,280 c -0.4,-7.2 4.6,-13.8 14.2,-13.9 9.6,-0.1 17.3,14.8 9.2,22.4 -7.4,8.9 -23.6,2.9 -23.4,-8.5 z m 330.4,41.1 c -9.1,-18.4 -18.9,-36 -27.9,-54 39,-1.3 71,15.9 77.9,54.05 -17.3,0.35 -33,0.05 -50,-0.05 z m -83,2 c -0.2,-13.3 -0.6,-40.5 -0.9,-53.9 8.7,-0.1 17.9,-0.1 26.6,-0.3 10.7,17.2 16.6,35.8 23.35,53.95 -15.75,0.05 -34.05,0.35 -49.05,0.25 z m -42.9,65.7 c -19,2.8 -13.9,25.4 0,25.6 l 184,0 c 19,-2.8 13.9,-25.4 0,-25.6 z" id="path4138" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4290" d="m 118,187.2 198,9.2 -0.7,31.9 c -15.2,1.5 -32,13.3 -45.9,19 -66,6.3 -139,10.8 -199,7.1 -4.8,-12.6 -9.4,-25.5 -14.2,-38 -5.4,-9 -25.7,-3.5 -22,5.9 6,12.5 11.9,25.6 18,38 -17.8,16.6 -8,41.5 17.2,42.5 l 13.5,38 c 8.6,9.8 27,2.2 22,-7.2 -5.9,-10.3 -10.7,-21.7 -15.8,-33 60,4 140,38 193,56 52,17.5 88,17.8 117,14.5 29.4,-3.3 52.6,-8.2 61.8,-28 14,-56 -45.6,-94 -90,-102 -11,-5.3 -27,-11.9 -40.9,-12.3 l 0.7,-31.9 202,-10.8 c 3.7,0.6 9,-8.7 12.9,-13.2 2.1,-2.4 0.2,-6 -3,-5.8 l -222,17.9 -214,-19 c -2.8,0.8 -4.1,3.2 -2.05,5.25 3.35,4.65 7.45,15.35 13.45,15.95 z M 53.8,280 c -0.4,-7.2 4.6,-13.8 14.2,-13.9 9.6,-0.1 17.3,14.8 9.2,22.4 -7.4,8.9 -23.6,2.9 -23.4,-8.5 z m 330.4,41.1 c -9.1,-18.4 -18.9,-36 -27.9,-54 39,-1.3 71,15.9 77.9,54.05 -17.3,0.35 -33,0.05 -50,-0.05 z m -83,2 c -0.2,-13.3 -0.6,-40.5 -0.9,-53.9 8.7,-0.1 17.9,-0.1 26.6,-0.3 10.7,17.2 16.6,35.8 23.35,53.95 -15.75,0.05 -34.05,0.35 -49.05,0.25 z m -42.9,65.7 c -19,2.8 -13.9,25.4 0,25.6 l 184,0 c 19,-2.8 13.9,-25.4 0,-25.6 z" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#0092da" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/lighthouse.svg b/vtm-themes/resources/assets/symbols/transport/lighthouse.svg
old mode 100755
new mode 100644
index 7305ece9..40917860
--- a/vtm-themes/resources/assets/symbols/transport/lighthouse.svg
+++ b/vtm-themes/resources/assets/symbols/transport/lighthouse.svg
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 361.71459,80.721032 C 364.06866,80.721399 365.24586,79.741384 365.24623,77.781001 C 365.24586,76.598174 364.66025,75.618173 363.48938,74.840955 L 291.22544,34.899496 L 219.57102,74.840955 C 218.38762,75.618173 217.79603,76.598174 217.79625,77.781001 C 217.79603,79.741384 218.77604,80.721399 220.73628,80.721032 L 361.71459,80.721032 z M 365.24623,180.60396 C 369.54834,180.60424 371.6996,178.453 371.69997,174.15023 C 371.6996,169.83608 369.54834,167.67885 365.24623,167.67856 L 217.79625,167.67856 C 213.49353,167.67885 211.34229,169.83608 211.34251,174.15023 C 211.34229,178.453 213.49353,180.60424 217.79625,180.60396 L 230.13006,180.60396 L 181.96007,543.67391 L 400.4908,543.67391 L 352.91242,180.60396 L 365.24623,180.60396 z" id="flowRoot3192" sodipodi:nodetypes="cscccscccsccscccccc" stroke-width="10" fill="#ffffff" stroke-linejoin="round" stroke="#ffffff"/>
- <path sodipodi:nodetypes="cccccccccc" id="path3186" d="M 239.17868,105.75173 L 35.92179,79.900921 L 36.51338,165.66393 L 239.17868,140.40471 L 239.17868,105.75173 z M 345.88172,139.81312 L 548.54702,165.66393 L 548.54702,79.900921 L 345.88172,105.75173 L 345.88172,139.81312 z" opacity=".5" stroke-width="10" fill="#ffffff" stroke-linejoin="round" stroke="#ffffff"/>
- <path sodipodi:type="arc" id="path3188" sodipodi:cx="286.43436" sodipodi:cy="125.39394" sodipodi:rx="36.889275" sodipodi:ry="36.889275" d="M 323.32363,125.39394 A 36.889275,36.889275 0 1 1 249.54508,125.39394 A 36.889275,36.889275 0 1 1 323.32363,125.39394 z" transform="matrix(0.8704944,0,0,0.8704944,43.094837,14.239211)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10"/>
+ <path color-interpolation="sRGB" color-rendering="auto" color="#000000" solid-color="#000000" image-rendering="auto" solid-opacity="1" fill="none" white-space="normal" isolation="auto" color-interpolation-filters="linearRGB" mix-blend-mode="normal" shape-rendering="auto" d="m289 37.7c-.8 0-1.7.2-2.4.6l-70 38.8c-.1.1-.2.1-.3.2-2.1 1.4-3.9 4.2-3.9 6.9 0 1.8.5 4 2.1 5.6 1.6 1.6 3.8 2.1 5.6 2.1l137 0c1.8 0 3.9-.3 5.7-1.8 1.8-1.5 2.6-4 2.6-5.9l0 0c0-2.8-1.8-5.5-3.9-6.9-.1-.1-.2-.1-.3-.2L291 38c-.7-.4-1.5-.6-2.3-.6M218 167c-2.9 0-6 .8-8.2 3-2.2 2.2-3 5.3-3 8.2 0 2.9.8 5.9 3 8.2 2.2 2.2 5.3 3 8.2 3l6.4 0-46 348c-.4 2.9 1.9 5.5 4.8 5.5l213 0c2.9 0 5.2-2.6 4.8-5.5l-45.6-348 6.5 0c2.9 0 5.9-.8 8.1-3 2.2-2.2 3-5.2 3-8.2 0-2.9-.8-6-3-8.2-2.2-2.2-5.3-3-8.1-3z" id="path4143" opacity="0.8" filter-gaussianBlur-deviation="0" stroke-width="64" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff"/>
+ <path color-interpolation="sRGB" color-rendering="auto" color="#000000" solid-color="#000000" image-rendering="auto" solid-opacity="1" fill="none" opacity="0.8" white-space="normal" isolation="auto" color-interpolation-filters="linearRGB" mix-blend-mode="normal" shape-rendering="auto" d="m40.8 82c-2.8-.1-5 2.2-5 4.9l.6 83c0 2.9 2.6 5.2 5.5 4.8l197-24.6c2.4-.3 4.3-2.4 4.3-4.8l0-33.7c0-2.5-1.8-4.5-4.3-4.8L41 82c-.2 0-.3 0-.5 0m498 0c-.2 0-.3 0-.5 0L342 107c-2.4.3-4.3 2.4-4.3 4.8l0 33c0 2.4 1.8 4.5 4.3 4.8l197 25c2.9.4 5.5-1.9 5.5-4.8l0-83c0-2.7-2.3-4.9-5-4.9" id="path4145" filter-gaussianBlur-deviation="0" stroke-width="64" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff"/>
+ <path id="path3186-1" d="M238 112L40.7 86 41 170 238 145l0-33.7zm104 33l197 25 0-83-197 25 0 33z" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="10"/>
+ <path d="m289 37.7c-.8 0-1.7.2-2.4.6l-70 38.8c-.1.1-.2.1-.3.2-2.1 1.4-3.9 4.2-3.9 6.9 0 1.8.5 4 2.1 5.6 1.6 1.6 3.8 2.1 5.6 2.1l137 0c1.8 0 3.9-.3 5.7-1.8 1.8-1.5 2.6-4 2.6-5.9l0 0c0-2.8-1.8-5.5-3.9-6.9-.1-.1-.2-.1-.3-.2L291 38c-.7-.4-1.5-.6-2.3-.6M218 167c-2.9 0-6 .8-8.2 3-2.2 2.2-3 5.3-3 8.2 0 2.9.8 5.9 3 8.2 2.2 2.2 5.3 3 8.2 3l6.4 0-46 348c-.4 2.9 1.9 5.5 4.8 5.5l213 0c2.9 0 5.2-2.6 4.8-5.5l-45.6-348 6.5 0c2.9 0 5.9-.8 8.1-3 2.2-2.2 3-5.2 3-8.2 0-2.9-.8-6-3-8.2-2.2-2.2-5.3-3-8.1-3z" id="flowRoot3192" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" fill="#0092da" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <path d="m40.8 82c-2.8-.1-5 2.2-5 4.9l.6 83c0 2.9 2.6 5.2 5.5 4.8l197-24.6c2.4-.3 4.3-2.4 4.3-4.8l0-33.7c0-2.5-1.8-4.5-4.3-4.8L41 82c-.2 0-.3 0-.5 0m498 0c-.2 0-.3 0-.5 0L342 107c-2.4.3-4.3 2.4-4.3 4.8l0 33c0 2.4 1.8 4.5 4.3 4.8l197 25c2.9.4 5.5-1.9 5.5-4.8l0-83c0-2.7-2.3-4.9-5-4.9" id="path3186" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.5" fill="#0092da" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <ellipse cy="129" cx="290" id="path3188" rx="31" ry="31" fill="#0092da" stroke="#0092da" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="M238 112L40.7 86 41 170 238 145l0-33.7zm104 33l197 25 0-83-197 25 0 33z" id="path4149" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-width="10"/>
+ <path id="path4151" d="m289 37.7c-.8 0-1.7.2-2.4.6l-70 38.8c-.1.1-.2.1-.3.2-2.1 1.4-3.9 4.2-3.9 6.9 0 1.8.5 4 2.1 5.6 1.6 1.6 3.8 2.1 5.6 2.1l137 0c1.8 0 3.9-.3 5.7-1.8 1.8-1.5 2.6-4 2.6-5.9l0 0c0-2.8-1.8-5.5-3.9-6.9-.1-.1-.2-.1-.3-.2L291 38c-.7-.4-1.5-.6-2.3-.6M218 167c-2.9 0-6 .8-8.2 3-2.2 2.2-3 5.3-3 8.2 0 2.9.8 5.9 3 8.2 2.2 2.2 5.3 3 8.2 3l6.4 0-46 348c-.4 2.9 1.9 5.5 4.8 5.5l213 0c2.9 0 5.2-2.6 4.8-5.5l-45.6-348 6.5 0c2.9 0 5.9-.8 8.1-3 2.2-2.2 3-5.2 3-8.2 0-2.9-.8-6-3-8.2-2.2-2.2-5.3-3-8.1-3z" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" fill="#0092da" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <path id="path4153" d="m40.8 82c-2.8-.1-5 2.2-5 4.9l.6 83c0 2.9 2.6 5.2 5.5 4.8l197-24.6c2.4-.3 4.3-2.4 4.3-4.8l0-33.7c0-2.5-1.8-4.5-4.3-4.8L41 82c-.2 0-.3 0-.5 0m498 0c-.2 0-.3 0-.5 0L342 107c-2.4.3-4.3 2.4-4.3 4.8l0 33c0 2.4 1.8 4.5 4.3 4.8l197 25c2.9.4 5.5-1.9 5.5-4.8l0-83c0-2.7-2.3-4.9-5-4.9" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.5" fill="#0092da" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <path d="m290 93c-19.5 0-35.5 15.9-35.5 35.5 0 19.5 15.9 35.5 35.5 35.5 19.5 0 35.5-15.9 35.5-35.5 0-19.5-15.9-35.5-35.5-35.5m0 8.5c15 0 27 12 27 27 0 15-12 27-27 27-15 0-27-12-27-27 0-15 12-27 27-27" id="path4155" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" fill="#0092da" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/parking.svg b/vtm-themes/resources/assets/symbols/transport/parking.svg
old mode 100755
new mode 100644
index 11230cb2..e290e60a
--- a/vtm-themes/resources/assets/symbols/transport/parking.svg
+++ b/vtm-themes/resources/assets/symbols/transport/parking.svg
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 145.35836,505.1504 L 145.35836,85.566299 L 303.63258,85.566299 C 331.49012,85.56672 352.76506,86.902366 367.45745,89.573248 C 388.06429,93.008179 405.33227,99.543305 419.26147,109.17864 C 433.19004,118.81477 444.39993,132.31434 452.89116,149.67738 C 461.38172,167.04114 465.62716,186.12179 465.62752,206.91942 C 465.62716,242.60054 454.27416,272.79568 431.56851,297.50493 C 408.8622,322.21458 367.83879,334.56932 308.49813,334.56915 L 200.88312,334.56915 L 200.88312,505.1504 L 145.35836,505.1504 z M 200.88312,285.05478 L 309.35678,285.05478 C 345.22821,285.05501 370.70087,278.37678 385.77488,265.02007 C 400.84831,251.66386 408.38518,232.8694 408.38548,208.63666 C 408.38518,191.08276 403.94894,176.05676 395.07671,163.55858 C 386.2039,151.06108 374.51701,142.80869 360.01596,138.8014 C 350.66619,136.32127 333.39819,135.08103 308.21194,135.08067 L 200.88312,135.08067 L 200.88312,285.05478 z" id="text2419" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="22.688"/>
+ <path id="path4151" d="M 155 122.65039 C 148.73213 122.65123 143.65123 127.73213 143.65039 134 L 143.65039 495 C 143.65057 500.20836 147.1943 504.74915 151.29688 505.59961 L 203.09961 506.44922 C 209.36748 506.44838 214.44838 501.36748 214.44922 495.09961 L 214.44922 359.44922 L 295.09961 359.44922 C 347.96309 359.44922 386.64341 348.79826 408.58203 324.65625 C 430.52066 300.51424 441.44922 271.31464 441.44922 238.19922 C 441.44922 219.053 437.50114 200.75892 429.39453 184.21094 C 421.38974 167.771 410.48947 154.46393 396.75586 144.96484 C 383.13572 135.54425 366.6782 129.43073 347.72266 126.21484 C 333.84133 123.82894 315.27992 122.65039 291 122.65039 L 155 122.65039 z M 214.55078 188.15039 L 295.19922 188.15039 C 316.3506 188.15039 331.116 189.50342 336.74805 190.9668 C 346.63722 193.71692 354.21034 199.01066 360.41797 207.83203 C 366.57577 216.58259 369.75 227.0165 369.75 240.09961 C 369.75 258.6052 364.52678 270.93379 354.21094 280.16406 C 344.12987 288.83869 325.01653 294.65039 295.69922 294.65039 L 214.55078 294.65039 L 214.55078 188.15039 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 155 122.65039 C 148.73213 122.65123 143.65123 127.73213 143.65039 134 L 143.65039 495 C 143.65057 500.20836 147.1943 504.74915 151.29688 505.59961 L 203.09961 506.44922 C 209.36748 506.44838 214.44838 501.36748 214.44922 495.09961 L 214.44922 359.44922 L 295.09961 359.44922 C 347.96309 359.44922 386.64341 348.79826 408.58203 324.65625 C 430.52066 300.51424 441.44922 271.31464 441.44922 238.19922 C 441.44922 219.053 437.50114 200.75892 429.39453 184.21094 C 421.38974 167.771 410.48947 154.46393 396.75586 144.96484 C 383.13572 135.54425 366.6782 129.43073 347.72266 126.21484 C 333.84133 123.82894 315.27992 122.65039 291 122.65039 L 155 122.65039 z M 214.55078 188.15039 L 295.19922 188.15039 C 316.3506 188.15039 331.116 189.50342 336.74805 190.9668 C 346.63722 193.71692 354.21034 199.01066 360.41797 207.83203 C 366.57577 216.58259 369.75 227.0165 369.75 240.09961 C 369.75 258.6052 364.52678 270.93379 354.21094 280.16406 C 344.12987 288.83869 325.01653 294.65039 295.69922 294.65039 L 214.55078 294.65039 L 214.55078 188.15039 z " id="path4136" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/parking_private.svg b/vtm-themes/resources/assets/symbols/transport/parking_private.svg
old mode 100755
new mode 100644
index afbe52ee..ac02d096
--- a/vtm-themes/resources/assets/symbols/transport/parking_private.svg
+++ b/vtm-themes/resources/assets/symbols/transport/parking_private.svg
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2295" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2292" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path d="M 145.34375 74.21875 C 142.37406 74.219094 139.41239 75.43136 137.3125 77.53125 C 135.21261 79.63114 134.00034 82.592807 134 85.5625 L 134 108.03125 L 169.34375 108.03125 L 169.34375 74.21875 L 145.34375 74.21875 z M 212.28125 74.21875 L 212.28125 106.5 L 254.21875 106.5 L 254.21875 74.21875 L 212.28125 74.21875 z M 297.65625 74.21875 L 297.65625 105.65625 L 339.59375 105.65625 L 339.59375 75.15625 C 329.01542 74.534513 317.08787 74.218953 303.625 74.21875 L 297.65625 74.21875 z M 385.125 81.71875 L 385.125 104.09375 L 427.0625 104.09375 L 427.0625 100.8125 C 426.61503 100.49203 426.17149 100.15697 425.71875 99.84375 C 414.03244 91.759904 400.44451 85.747274 385.125 81.71875 z M 427.3125 103 L 427.3125 144.9375 L 463.21875 144.9375 C 463.17813 144.85398 463.13455 144.77094 463.09375 144.6875 C 454.74663 127.61915 443.67363 113.55724 430 103 L 427.3125 103 z M 254.96875 104.875 L 254.96875 146.4375 L 296.90625 146.4375 L 296.90625 104.875 L 254.96875 104.875 z M 341.5625 105.03125 L 341.5625 146.96875 L 383.5 146.96875 L 383.5 105.03125 L 341.5625 105.03125 z M 170.09375 107.5 L 170.09375 149.4375 L 212.03125 149.4375 L 212.03125 107.5 L 170.09375 107.5 z M 385.125 146.03125 L 385.125 169.1875 C 385.35371 169.49797 385.58677 169.80705 385.8125 170.125 C 389.63165 175.50497 392.49896 181.41173 394.375 188 L 427.0625 188 L 427.0625 146.03125 L 385.125 146.03125 z M 134 149.96875 L 134 191.90625 L 169.34375 191.90625 L 169.34375 149.96875 L 134 149.96875 z M 468.78125 158.1875 L 468.78125 186.90625 L 427.3125 186.90625 L 427.3125 228.84375 L 469.25 228.84375 L 469.25 188.0625 L 475.8125 188.0625 C 474.53885 177.71974 472.20685 167.74182 468.78125 158.1875 z M 170.09375 191.375 L 170.09375 233.3125 L 212.03125 233.3125 L 212.03125 191.375 L 170.09375 191.375 z M 394.53125 229.9375 C 392.56388 237.3559 389.4165 243.70797 385.125 249.21875 L 385.125 271.875 L 427.0625 271.875 L 427.0625 229.9375 L 394.53125 229.9375 z M 468.78125 230 L 468.78125 257.21875 C 471.81903 248.52007 473.99222 239.42734 475.34375 230 L 468.78125 230 z M 134 233.84375 L 134 275.78125 L 169.34375 275.78125 L 169.34375 233.84375 L 134 233.84375 z M 427.3125 270.78125 L 427.3125 312.71875 L 432.125 312.71875 C 434.87572 310.34828 437.47505 307.8332 439.90625 305.1875 C 449.53043 294.71406 457.29142 283.20553 463.1875 270.78125 L 427.3125 270.78125 z M 339.59375 271.59375 C 334.10594 272.44029 328.17766 273.06869 321.71875 273.40625 L 339.59375 273.40625 L 339.59375 271.59375 z M 341.5625 272.8125 L 341.5625 314.75 L 383.5 314.75 L 383.5 272.8125 L 341.5625 272.8125 z M 212.28125 273.71875 L 212.28125 274.28125 L 254.21875 274.28125 L 254.21875 273.71875 L 212.28125 273.71875 z M 254.96875 273.71875 L 254.96875 314.5625 L 296.90625 314.5625 L 296.90625 273.71875 L 254.96875 273.71875 z M 170.09375 275.25 L 170.09375 317.1875 L 212.03125 317.1875 L 212.03125 275.25 L 170.09375 275.25 z M 385.125 313.8125 L 385.125 336.8125 C 401.48404 332.10404 415.49881 325.47498 427.0625 316.78125 L 427.0625 313.8125 L 385.125 313.8125 z M 297.65625 315.34375 L 297.65625 345.90625 L 308.5 345.90625 C 319.39398 345.90628 329.76395 345.50004 339.59375 344.6875 L 339.59375 315.34375 L 297.65625 315.34375 z M 212.28125 316.21875 L 212.28125 345.90625 L 254.21875 345.90625 L 254.21875 316.21875 L 212.28125 316.21875 z M 134 317.71875 L 134 359.6875 L 169.34375 359.6875 L 169.34375 317.71875 L 134 317.71875 z M 170.09375 359.15625 L 170.09375 401.09375 L 212.03125 401.09375 L 212.03125 359.15625 L 170.09375 359.15625 z M 134 401.625 L 134 443.5625 L 169.34375 443.5625 L 169.34375 401.625 L 134 401.625 z M 170.09375 443.03125 L 170.09375 484.96875 L 212.03125 484.96875 L 212.03125 443.03125 L 170.09375 443.03125 z M 134 485.5 L 134 505.15625 C 134.00034 508.12594 135.21261 511.08761 137.3125 513.1875 C 139.41239 515.28739 142.37406 516.49966 145.34375 516.5 L 169.34375 516.5 L 169.34375 485.5 L 134 485.5 z " id="text2419" opacity=".75" color="#000000" stroke-width="22.688" fill="#ffffff"/>
- <path d="m 145.3295,72.845074 a 11.345066,11.345066 0 0 0 -11.34375,11.3438 l 0,419.593696 a 11.345066,11.345066 0 0 0 11.34375,11.3438 l 55.53125,0 a 11.345066,11.345066 0 0 0 11.34375,-11.3438 l 0,-159.25 96.28125,0 c 60.9152,2e-4 105.3686,-12.3838 131.40624,-40.7187 24.54634,-26.7124 37.06212,-60.1939 37.0625,-98.2813 -3.9e-4,-22.3412 -4.59935,-43.2494 -13.875,-62.2187 -9.2028,-18.8181 -21.71176,-34.0076 -37.375,-44.8438 -15.51745,-10.733996 -34.40527,-17.778696 -56.21875,-21.437496 -0.0574,-0.01 -0.12999,-0.021 -0.1875,-0.031 -15.9176,-2.8746 -37.56905,-4.1559 -65.68749,-4.1563 l -158.28125,0 z m 11.34375,22.687496 146.9375,0 c 27.49502,4e-4 48.36129,1.3673 61.81249,3.8125 a 11.345066,11.345066 0 0 0 0.15625,0.031 c 19.31888,3.2203 34.92333,9.2448 47.21875,17.75 12.1939,8.4361 22.09534,20.2483 29.875,36.1563 7.70547,15.7582 11.59342,32.996 11.59375,52.25 -3.4e-4,33.2749 -10.19754,60.2313 -31.0625,82.9375 -19.37498,21.0844 -56.95264,33.3751 -114.71874,33.375 l -107.625,0 a 11.345066,11.345066 0 0 0 -11.34375,11.3437 l 0,159.25 -32.84375,0 0,-396.9062 z m 44.1875,26.8438 a 11.345066,11.345066 0 0 0 -11.34375,11.3437 l 0,149.9688 a 11.345066,11.345066 0 0 0 11.34375,11.3437 l 108.46875,0 c 37.2794,3e-4 65.55178,-6.5874 83.96874,-22.9062 17.62215,-15.6146 26.40592,-38.2902 26.40625,-64.875 -3.3e-4,-19.465 -5.08295,-37.0827 -15.40625,-51.625 -10.23022,-14.4095 -24.43448,-24.4695 -41.28125,-29.125 a 11.345066,11.345066 0 0 0 -0.0937,-0.031 c -11.78959,-3.1273 -29.16017,-4.0934 -54.71874,-4.0938 l -107.34375,0 z m 11.34375,22.6875 96,0 c 24.72938,3e-4 41.82519,1.488 48.78124,3.3125 0.0238,0.01 0.0702,0.025 0.0937,0.031 12.10617,3.3666 21.22373,9.7869 28.71875,20.3437 7.42116,10.4541 11.21848,22.8572 11.21875,38.5 -2.7e-4,21.8807 -6.25654,36.8084 -18.78125,47.9063 -11.73106,10.3946 -34.4428,17.1877 -68.90624,17.1875 l -97.125,0 0,-127.2813 z" id="text2419-1" opacity=".5" color="#000000" stroke-width="22.688" fill="#ffffff"/>
+ <path id="path4193" d="M 154 123 C 151.4 123 148.8 124.00039 147 125.90039 C 145.2 127.70039 144.09961 130.30039 144.09961 132.90039 L 144.09961 152.40039 L 174.80078 152.40039 L 174.80078 188.5 L 211.19922 188.5 L 211.19922 152.09961 L 174.80078 152.09961 L 174.80078 123 L 154 123 z M 212 123 L 212 151 L 248.40039 151 L 248.40039 123 L 212 123 z M 286.09961 123 L 286 150.30078 L 322.40039 150.30078 L 322.40039 123.80078 C 313.20039 123.30078 302.90039 123 291.40039 123 L 286.09961 123 z M 362.19922 129.55078 L 362.09961 148.90039 L 398.5 148.90039 L 398.5 146.09961 C 398.1 145.79961 397.70078 145.50078 397.30078 145.30078 C 387.30078 138.30078 375.39922 133.10078 362.19922 129.55078 z M 398.84961 148.19922 L 398.90039 184.5 L 429.90039 184.5 C 429.90039 184.4 429.80078 184.40078 429.80078 184.30078 C 422.50078 169.50078 412.89961 157.30078 401.09961 148.30078 L 398.84961 148.19922 z M 248.80078 149.90039 L 248.80078 185.90039 L 285.19922 185.90039 L 285.19922 149.90039 L 248.80078 149.90039 z M 323.80078 150 L 323.80078 186.40039 L 360.19922 186.40039 L 360.19922 150 L 323.80078 150 z M 398.19922 185.40039 L 361.80078 185.44922 L 361.80078 205.5 C 362.00078 205.8 362.20039 206.00078 362.40039 206.30078 C 365.70039 211.00078 368.20078 216.10078 369.80078 221.80078 L 398.19922 221.80078 L 398.19922 185.40039 z M 144 188 L 144 224.40039 L 174.69922 224.40039 L 174.69922 188 L 144 188 z M 435 195.09961 L 435 220 L 399 220 L 399 256.40039 L 435.40039 256.40039 L 435.40039 221 L 441.09961 221 C 439.99961 212 438 203.39961 435 195.09961 z M 176 223.90039 L 176 260.30078 L 212.40039 260.30078 L 212.40039 223.90039 L 176 223.90039 z M 371.09961 257.40039 C 369.29961 263.80039 366.60078 269.39961 362.80078 274.09961 L 362.80078 293.80078 L 399 293.80078 L 399 293 L 399.19922 293 L 399.19922 257.40039 L 371.09961 257.40039 z M 399.19922 293 L 399.19922 293.80078 L 399 293.80078 L 399 329.40039 L 403.19922 329.40039 C 405.59922 327.30039 407.8 325.20039 410 322.90039 C 418.4 313.80039 425 303.9 430 293 L 399.19922 293 z M 436.19922 257.5 L 436.19922 281.09961 C 438.79922 273.49961 440.70039 265.7 441.90039 257.5 L 436.19922 257.5 z M 144 261 L 144 297.40039 L 174.69922 297.40039 L 174.69922 261 L 144 261 z M 323 293.69922 C 318.2 294.39922 313.1 295.00078 307.5 295.30078 L 323 295.30078 L 323 293.69922 z M 324.69922 294.80078 L 324.69922 331.19922 L 361.09961 331.19922 L 361.09961 294.80078 L 324.69922 294.80078 z M 212.69922 295.59961 L 212.69922 296.09961 L 249.09961 296.09961 L 249.09961 295.59961 L 212.69922 295.59961 z M 249.69922 295.59961 L 249.69922 331.09961 L 286.09961 331.09961 L 286.09961 295.59961 L 249.69922 295.59961 z M 175.69922 296.90039 L 175.69922 333.30078 L 212.09961 333.30078 L 212.09961 296.90039 L 175.69922 296.90039 z M 362.69922 330.40039 L 362.69922 350.40039 C 376.89922 346.30039 389.09961 340.6 399.09961 333 L 399.09961 330.40039 L 362.69922 330.40039 z M 323.19922 331.59961 L 286.80078 331.65039 L 286.80078 358.19922 L 296.19922 358.19922 C 305.69922 358.19922 314.69922 357.79961 323.19922 357.09961 L 323.19922 331.59961 z M 212.80078 332.40039 L 212.80078 358.19922 L 249.19922 358.19922 L 249.19922 332.40039 L 212.80078 332.40039 z M 144 334 L 144 370.40039 L 174.69922 370.40039 L 174.69922 334 L 144 334 z M 175 370 L 175 406.40039 L 211.40039 406.40039 L 211.40039 370 L 175 370 z M 144 407 L 144 443.40039 L 174.69922 443.40039 L 174.69922 407 L 144 407 z M 175 442.90039 L 175 479.30078 L 211.40039 479.30078 L 211.40039 442.90039 L 175 442.90039 z M 144 480 L 144 497 C 144 499.6 145.10039 502.1 146.90039 504 C 148.70039 505.8 151.30039 506.90039 153.90039 506.90039 L 174.69922 506.90039 L 174.69922 480 L 144 480 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 154 123 C 151.4 123 148.8 124.00039 147 125.90039 C 145.2 127.70039 144.09961 130.30039 144.09961 132.90039 L 144.09961 152.40039 L 174.80078 152.40039 L 174.80078 188.5 L 211.19922 188.5 L 211.19922 152.09961 L 174.80078 152.09961 L 174.80078 123 L 154 123 z M 212 123 L 212 151 L 248.40039 151 L 248.40039 123 L 212 123 z M 286.09961 123 L 286 150.30078 L 322.40039 150.30078 L 322.40039 123.80078 C 313.20039 123.30078 302.90039 123 291.40039 123 L 286.09961 123 z M 362.19922 129.55078 L 362.09961 148.90039 L 398.5 148.90039 L 398.5 146.09961 C 398.1 145.79961 397.70078 145.50078 397.30078 145.30078 C 387.30078 138.30078 375.39922 133.10078 362.19922 129.55078 z M 398.84961 148.19922 L 398.90039 184.5 L 429.90039 184.5 C 429.90039 184.4 429.80078 184.40078 429.80078 184.30078 C 422.50078 169.50078 412.89961 157.30078 401.09961 148.30078 L 398.84961 148.19922 z M 248.80078 149.90039 L 248.80078 185.90039 L 285.19922 185.90039 L 285.19922 149.90039 L 248.80078 149.90039 z M 323.80078 150 L 323.80078 186.40039 L 360.19922 186.40039 L 360.19922 150 L 323.80078 150 z M 398.19922 185.40039 L 361.80078 185.44922 L 361.80078 205.5 C 362.00078 205.8 362.20039 206.00078 362.40039 206.30078 C 365.70039 211.00078 368.20078 216.10078 369.80078 221.80078 L 398.19922 221.80078 L 398.19922 185.40039 z M 144 188 L 144 224.40039 L 174.69922 224.40039 L 174.69922 188 L 144 188 z M 435 195.09961 L 435 220 L 399 220 L 399 256.40039 L 435.40039 256.40039 L 435.40039 221 L 441.09961 221 C 439.99961 212 438 203.39961 435 195.09961 z M 176 223.90039 L 176 260.30078 L 212.40039 260.30078 L 212.40039 223.90039 L 176 223.90039 z M 371.09961 257.40039 C 369.29961 263.80039 366.60078 269.39961 362.80078 274.09961 L 362.80078 293.80078 L 399 293.80078 L 399 293 L 399.19922 293 L 399.19922 257.40039 L 371.09961 257.40039 z M 399.19922 293 L 399.19922 293.80078 L 399 293.80078 L 399 329.40039 L 403.19922 329.40039 C 405.59922 327.30039 407.8 325.20039 410 322.90039 C 418.4 313.80039 425 303.9 430 293 L 399.19922 293 z M 436.19922 257.5 L 436.19922 281.09961 C 438.79922 273.49961 440.70039 265.7 441.90039 257.5 L 436.19922 257.5 z M 144 261 L 144 297.40039 L 174.69922 297.40039 L 174.69922 261 L 144 261 z M 323 293.69922 C 318.2 294.39922 313.1 295.00078 307.5 295.30078 L 323 295.30078 L 323 293.69922 z M 324.69922 294.80078 L 324.69922 331.19922 L 361.09961 331.19922 L 361.09961 294.80078 L 324.69922 294.80078 z M 212.69922 295.59961 L 212.69922 296.09961 L 249.09961 296.09961 L 249.09961 295.59961 L 212.69922 295.59961 z M 249.69922 295.59961 L 249.69922 331.09961 L 286.09961 331.09961 L 286.09961 295.59961 L 249.69922 295.59961 z M 175.69922 296.90039 L 175.69922 333.30078 L 212.09961 333.30078 L 212.09961 296.90039 L 175.69922 296.90039 z M 362.69922 330.40039 L 362.69922 350.40039 C 376.89922 346.30039 389.09961 340.6 399.09961 333 L 399.09961 330.40039 L 362.69922 330.40039 z M 323.19922 331.59961 L 286.80078 331.65039 L 286.80078 358.19922 L 296.19922 358.19922 C 305.69922 358.19922 314.69922 357.79961 323.19922 357.09961 L 323.19922 331.59961 z M 212.80078 332.40039 L 212.80078 358.19922 L 249.19922 358.19922 L 249.19922 332.40039 L 212.80078 332.40039 z M 144 334 L 144 370.40039 L 174.69922 370.40039 L 174.69922 334 L 144 334 z M 175 370 L 175 406.40039 L 211.40039 406.40039 L 211.40039 370 L 175 370 z M 144 407 L 144 443.40039 L 174.69922 443.40039 L 174.69922 407 L 144 407 z M 175 442.90039 L 175 479.30078 L 211.40039 479.30078 L 211.40039 442.90039 L 175 442.90039 z M 144 480 L 144 497 C 144 499.6 145.10039 502.1 146.90039 504 C 148.70039 505.8 151.30039 506.90039 153.90039 506.90039 L 174.69922 506.90039 L 174.69922 480 L 144 480 z " id="path4190" opacity="0.8" fill="#0092da" color="#000000"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/rental_bicycle.svg b/vtm-themes/resources/assets/symbols/transport/rental_bicycle.svg
old mode 100755
new mode 100644
index 59642036..7e12e6f0
--- a/vtm-themes/resources/assets/symbols/transport/rental_bicycle.svg
+++ b/vtm-themes/resources/assets/symbols/transport/rental_bicycle.svg
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <path transform="matrix(-1.043444,0,0,1.043444,323.37568,-17.91917)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path596" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
- <path transform="matrix(-1.043444,0,0,1.043444,673.88637,-19.51244)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path595" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-width="26"/>
- <path sodipodi:nodetypes="ccccc" id="path594" d="M 399.8509,323.37769 L 189.54455,324.43987 L 115.19386,462.51978 L 257.52239,462.51978 L 406.22382,361.61524" fill="none" fill-rule="evenodd" stroke="#ffffff" stroke-linejoin="round" stroke-width="21.782"/>
- <path sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc" id="path593" d="M 391.76959,240.62652 C 403.19308,240.62652 411.82771,240.37164 420.67812,253.89246 C 423.2257,258.3997 424.39045,263.90301 423.44977,269.38108 C 422.32132,275.61019 418.63346,281.73019 414.28594,285.35311 C 408.52909,290.15049 403.06568,289.78041 403.94863,294.09299 C 405.08154,299.62655 408.53901,307.31615 412.27539,319.80251 C 416.06809,332.47698 420.57169,347.98935 424.99237,363.26848 C 429.41305,378.54758 433.75257,393.60169 437.1876,405.33231 C 438.90516,411.19759 440.40517,416.23394 441.55706,420.00574 C 442.67934,423.68059 443.6702,426.53512 443.5787,426.33161 C 447.15752,432.62827 447.64466,436.73113 453.64743,442.09045 C 460.37787,447.98085 465.85772,452.33235 467.75953,453.66161 C 472.59005,457.17067 474.83572,464.5761 472.28487,468.23518 C 469.07016,473.22193 462.43098,473.98687 457.5786,472.49499 C 452.97115,471.03238 445.6776,468.52005 437.22023,461.51522 L 437.155,461.41741 L 437.05718,461.35218 C 425.28921,451.25828 420.93556,439.00744 420.49254,438.29863 L 419.87297,437.35299 L 419.44906,436.30955 C 418.42937,433.79944 417.81856,431.58612 416.61222,427.63591 C 415.40585,423.6857 413.87655,418.58235 412.14495,412.66901 C 408.68179,400.84238 404.3643,385.76538 399.94972,370.50737 C 395.5351,355.24938 391.04254,339.816 387.29795,327.30227 C 383.55335,314.78855 381.18764,304.51112 380.31314,302.32482 C 378.18463,297.00359 377.09723,291.25886 378.5523,285.49927 C 380.00737,279.73971 384.3555,275.09124 388.25864,274.01066 C 397.16788,271.51814 394.80395,265.10979 390.24588,265.1005 L 352.04959,265.02275 L 351.95544,240.62705 C 351.95568,240.62652 376.74854,240.62652 391.76959,240.62652 z" fill="#ffffff" fill-rule="evenodd" stroke-linecap="round" stroke-width="25"/>
- <path id="path599" d="M 254.79723,458.19646 L 182.69587,281.69838" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="26.09"/>
- <path id="path600" d="M 279.58342,413.13108 L 236.0195,514.52769" sodipodi:nodetypes="cc" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="9.521"/>
- <path transform="matrix(-0.294204,0,0,0.259853,315.7233,342.74209)" sodipodi:type="arc" sodipodi:ry="78.380615" sodipodi:rx="78.380615" sodipodi:cy="461.96271" sodipodi:cx="200.53224" id="path597" d="M 278.91286,461.96271 A 78.380615,78.380615 0 1 1 122.15163,461.96271 A 78.380615,78.380615 0 1 1 278.91286,461.96271 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-width="31.31"/>
- <path sodipodi:nodetypes="cc" id="path601" d="M 298.97743,413.1773 L 260.49527,413.53004" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="13.304"/>
- <path sodipodi:nodetypes="cc" id="path602" d="M 255.63669,513.07118 L 217.15452,513.42393" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff" stroke-linecap="round" stroke-width="13.304"/>
- <path sodipodi:nodetypes="cssccc" id="path603" d="M 147.3959,265.92563 L 237.89819,265.92563 C 241.27795,265.92563 245.64018,271.90419 241.27795,275.87712 C 236.55999,280.36731 194.14915,289.58389 194.14915,289.58389 C 194.14915,289.58389 182.50779,292.77588 176.31155,292.02484 C 170.11535,291.27378 148.71025,289.39614 147.3959,265.92563 z" fill="#ffffff" fill-rule="evenodd" stroke-width=".695"/>
- <g id="g2303" transform="matrix(1.1575693,0,0,1.1575693,79.723001,48.80318)" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="10">
-  <g id="g2305">
-   <path d="M 100.25,5.75 C 60.335317,5.4974281 26.826507,47.079175 35.324049,86.079571 C 40.899839,118.70779 72.527534,145.59302 106.15625,142.28125 C 128.63909,140.89286 149.66527,127.49806 160.96875,108.1875 C 171.22308,100.14266 186.5403,110.7971 196.625,102.125 C 203.52011,94.990233 209.28493,85.495716 219,82.28125 C 226.79207,84.482581 230.2873,92.927779 236.71875,96.84375 C 243.17665,92.70632 246.9099,82.864282 255.75,82.90625 C 262.00373,86.670488 265.96886,93.31314 271.875,97.25 C 278.58404,92.957363 282.56064,82.699357 291.6875,82.6875 C 298.0679,86.28521 301.59369,93.796619 308.25,96.65625 C 317.51043,88.304078 326.98735,79.656571 334.71875,69.71875 C 334.69063,64.095915 327.08245,60.980337 324.06234,56.381768 C 317.78098,50.838171 312.47635,40.600972 302.59375,42.71875 C 289.22865,43.785674 275.56059,42.397209 262.0625,42.9375 C 229.36594,42.923262 196.41274,43.721279 163.875,42.125 C 154.95723,34.457888 150.20766,22.500694 139.25,17.0625 C 127.86772,9.4689786 114.03062,5.323508 100.25,5.75 z M 73.09375,50.53125 C 92.620948,50.045026 104.27829,77.77724 90.09375,91.25 C 78.614364,103.88316 54.044314,99.821659 49.21875,82.875 C 43.869693,67.719648 56.328438,48.853256 73.09375,50.53125 z" id="path2307" stroke-width="10"/>
-  </g>
- </g>
+ <path id="path4137" d="m 350.2,236.8 -1.6,22 36,0.1 c 15.7,3.2 -8.7,10.7 -11,19 -1.6,9.4 2.4,17.9 4.4,25.6 l -164,0.8 -9.7,-23.7 c 10.4,-2.4 35.8,-8.4 39,-11.8 4.1,-3.8 0,-9.4 -3.2,-9.4 l -85,0 c 1.1,18.8 15.8,22.9 23.8,24 l 9.4,23 c -10.7,20 -21,37 -31,56 -83,-24 -122,38.6 -123,84 0,50 40,90 90,90 46.6,0 85,-35.7 90,-81 l 21.5,0 c 2.4,4.4 6.4,8 11.3,10.3 l -9,21 -16.2,0.1 c -9,1.2 -6.7,12.4 0.1,12.5 l 36,-0.3 c 9.2,-1.1 6.8,-12.5 -0.1,-12.5 l -10.3,0.1 7.9,-18.4 c 23,1.9 31.7,-15.6 29,-27.5 l 112,-76 c 1,3.4 1.9,6.7 2.9,9.9 -20.5,16.5 -33.7,41.8 -33.7,70 0,50 40,90 90,90 50,0 90,-40 90,-90 -3,-57 -47.9,-104 -124,-83 -10,-23.9 -21.9,-61 -22.9,-75 1.7,-9.7 16,-10.5 18.4,-23 -1.7,-23.9 -21.3,-27.7 -41.1,-27.6 -9.1,0 -18.3,0.8 -25.9,0.8 z m 39.6,107.2 -0.1,0 c -37.6,26.9 -75,53.9 -114,79 l 7.7,-17.6 c 7.2,-0.2 6.6,-0.1 15,-0.6 9.2,-1.7 6,-12.4 0.1,-12.4 l -36,0.3 c -9.2,1.1 -6.8,12.5 0.1,12.5 l 10.3,-0.1 -7.7,17.9 c -0.7,-0.2 -1.5,-0.3 -2.2,-0.4 l -39.9,-98 c 37,0 104,-0.2 160.95,-0.4 1.75,6.1 3.65,12.8 5.75,19.8 z m -149.7,86.4 c -1.4,1.4 -2.6,3 -3.6,4.7 l -22,0 c -3.4,-25.7 -17.4,-47.7 -37,-61.7 l 22.7,-42 z M 520.3,445 c 0.1,35.7 -28.6,64 -63.9,64 l 0.2,0.4 c -58.8,-3.1 -81,-59 -48,-107 4.2,15.2 11,31.5 22,41.6 l 0.1,0.1 0.1,0.1 c 32.5,29.6 53,5.1 15.3,-18.2 -8,-11.2 -12.5,-25 -16.8,-39 10.6,-4.9 20.5,-7 29.9,-6.9 36.1,0.2 60.1,33.8 61.1,64.9 z m -373.2,-58.5 -29,53.9 c -3.7,6.8 1.3,15 9,15 l 62.8,0 c -4.3,31.5 -31,56 -63.8,56 -35.7,0 -64,-28.6 -64,-64 -0.1,-35 23.4,-64 62,-64.1 7.2,-0.1 14.8,1 23,3.2 z m 41.6,49.3 -44.9,0 21,-39 c 12.3,9.5 21,23.3 23.9,39 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4139" d="m 125,144.6 c 8,37.5 45.9,68 85,62 24.7,-2.4 47.9,-17 61,-38 11.7,-5.5 26.3,3.4 37,-5.5 8.4,-5.3 14.3,-22 24.8,-18.9 5.9,4 10,14.8 18.4,13 8.6,-4 15.7,-22.6 24,-7.9 4.2,5.2 12.7,13 18.6,5.2 7.1,-11.5 17,-15 24.5,-1.8 5.4,7 12.8,5.5 19.5,-1.2 8.5,-8.9 18.6,-17.6 23.8,-28.9 C 461,111 453,106 444,98 429,83 416,87 402,87 358,86 311,88 271,86 253,60 232,46 201,46.6 c -48,-0.8 -88,51 -76,98 z m 48,-37 c 17.3,1.6 24.9,29 8.6,38 -13.7,8.7 -35,-2.8 -31.6,-19.9 2.8,-13 12.6,-19 23,-18 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 350.2,236.8 -1.6,22 36,0.1 c 15.7,3.2 -8.7,10.7 -11,19 -1.6,9.4 2.4,17.9 4.4,25.6 l -164,0.8 -9.7,-23.7 c 10.4,-2.4 35.8,-8.4 39,-11.8 4.1,-3.8 0,-9.4 -3.2,-9.4 l -85,0 c 1.1,18.8 15.8,22.9 23.8,24 l 9.4,23 c -10.7,20 -21,37 -31,56 -83,-24 -122,38.6 -123,84 0,50 40,90 90,90 46.6,0 85,-35.7 90,-81 l 21.5,0 c 2.4,4.4 6.4,8 11.3,10.3 l -9,21 -16.2,0.1 c -9,1.2 -6.7,12.4 0.1,12.5 l 36,-0.3 c 9.2,-1.1 6.8,-12.5 -0.1,-12.5 l -10.3,0.1 7.9,-18.4 c 23,1.9 31.7,-15.6 29,-27.5 l 112,-76 c 1,3.4 1.9,6.7 2.9,9.9 -20.5,16.5 -33.7,41.8 -33.7,70 0,50 40,90 90,90 50,0 90,-40 90,-90 -3,-57 -47.9,-104 -124,-83 -10,-23.9 -21.9,-61 -22.9,-75 1.7,-9.7 16,-10.5 18.4,-23 -1.7,-23.9 -21.3,-27.7 -41.1,-27.6 -9.1,0 -18.3,0.8 -25.9,0.8 z m 39.6,107.2 -0.1,0 c -37.6,26.9 -75,53.9 -114,79 l 7.7,-17.6 c 7.2,-0.2 6.6,-0.1 15,-0.6 9.2,-1.7 6,-12.4 0.1,-12.4 l -36,0.3 c -9.2,1.1 -6.8,12.5 0.1,12.5 l 10.3,-0.1 -7.7,17.9 c -0.7,-0.2 -1.5,-0.3 -2.2,-0.4 l -39.9,-98 c 37,0 104,-0.2 160.95,-0.4 1.75,6.1 3.65,12.8 5.75,19.8 z m -149.7,86.4 c -1.4,1.4 -2.6,3 -3.6,4.7 l -22,0 c -3.4,-25.7 -17.4,-47.7 -37,-61.7 l 22.7,-42 z M 520.3,445 c 0.1,35.7 -28.6,64 -63.9,64 l 0.2,0.4 c -58.8,-3.1 -81,-59 -48,-107 4.2,15.2 11,31.5 22,41.6 l 0.1,0.1 0.1,0.1 c 32.5,29.6 53,5.1 15.3,-18.2 -8,-11.2 -12.5,-25 -16.8,-39 10.6,-4.9 20.5,-7 29.9,-6.9 36.1,0.2 60.1,33.8 61.1,64.9 z m -373.2,-58.5 -29,53.9 c -3.7,6.8 1.3,15 9,15 l 62.8,0 c -4.3,31.5 -31,56 -63.8,56 -35.7,0 -64,-28.6 -64,-64 -0.1,-35 23.4,-64 62,-64.1 7.2,-0.1 14.8,1 23,3.2 z m 41.6,49.3 -44.9,0 21,-39 c 12.3,9.5 21,23.3 23.9,39 z" id="path596-0" fill="#0092da"/>
+ <path d="m 125,144.6 c 8,37.5 45.9,68 85,62 24.7,-2.4 47.9,-17 61,-38 11.7,-5.5 26.3,3.4 37,-5.5 8.4,-5.3 14.3,-22 24.8,-18.9 5.9,4 10,14.8 18.4,13 8.6,-4 15.7,-22.6 24,-7.9 4.2,5.2 12.7,13 18.6,5.2 7.1,-11.5 17,-15 24.5,-1.8 5.4,7 12.8,5.5 19.5,-1.2 8.5,-8.9 18.6,-17.6 23.8,-28.9 C 461,111 453,106 444,98 429,83 416,87 402,87 358,86 311,88 271,86 253,60 232,46 201,46.6 c -48,-0.8 -88,51 -76,98 z m 48,-37 c 17.3,1.6 24.9,29 8.6,38 -13.7,8.7 -35,-2.8 -31.6,-19.9 2.8,-13 12.6,-19 23,-18 z" id="path2307" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/slipway.svg b/vtm-themes/resources/assets/symbols/transport/slipway.svg
old mode 100755
new mode 100644
index cc2df524..a3307bba
--- a/vtm-themes/resources/assets/symbols/transport/slipway.svg
+++ b/vtm-themes/resources/assets/symbols/transport/slipway.svg
@@ -1,84 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path inkscape:connector-curvature="0" id="path5679" d="m 121.52892,132.23153 100.56651,27.37779 55.84341,-38.73987 19.40016,4.65362 -55.2995,38.86073 304.78178,83.58383 -22.3011,81.83115 -305.93008,-83.4025 C 100.07394,211.16174 121.64979,132.11067 121.64979,132.11067" fill="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path5681" d="m 385.87862,341.52348 c -0.36262,-6.82934 -1.63179,-13.35649 -3.86794,-19.52101 l 137.91632,38.43767 -4.41188,16.92225 -129.6365,-35.83891 z" fill="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path5683" d="m 260.65398,306.89331 c 3.74706,-5.43929 8.15894,-10.33465 13.17518,-14.50478 L 43.747015,228.86967 v 18.25184 l 216.906965,59.7718 z" fill="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path5685" d="m 317.52481,367.39035 c 12.38951,0 22.42198,-9.97204 22.42198,-22.36155 0,-12.38949 -10.03247,-22.42197 -22.42198,-22.42197 -12.38949,0 -22.42196,10.03248 -22.42196,22.42197 0,12.38951 10.03247,22.36155 22.42196,22.36155 z m 224.58241,137.43283 c -10.93902,0 -21.33411,-2.4779 -30.58091,-6.64803 -9.60942,-4.41187 -20.36714,-7.01064 -31.60834,-7.01064 -11.24121,0 -21.99892,2.59877 -31.48747,7.01064 -9.36768,4.17013 -19.76277,6.64803 -30.70179,6.64803 -10.93904,0 -21.33413,-2.4779 -30.7018,-6.64803 -9.54898,-4.41187 -20.3067,-7.01064 -31.48747,-7.01064 -11.30165,0 -21.99892,2.59877 -31.60834,7.01064 -9.2468,4.17013 -19.76276,6.64803 -30.64136,6.64803 -10.87858,0 -21.33412,-2.4779 -30.64135,-6.64803 -9.60943,-4.41187 -20.42757,-7.01064 -31.60835,-7.01064 -11.18077,0 -21.99892,2.59877 -31.48747,7.01064 -9.30723,4.17013 -19.8232,6.64803 -30.70178,6.64803 -10.8786,0 -21.33413,-2.4779 -30.70181,-6.64803 -9.48854,-4.41187 -20.30669,-7.01064 -31.48746,-7.01064 -11.180769,0 -21.998925,2.59877 -31.5479,7.01064 -9.307246,4.17013 -19.823206,6.64803 -30.641362,6.64803 L 43.747015,322.18377 295.34459,391.50455 c -17.34531,-8.40069 -29.3722,-25.98774 -29.3722,-46.47575 0,-28.5865 23.14723,-51.67328 51.6733,-51.67328 28.52608,0 51.6733,23.14722 51.6733,51.67328 0,28.52609 -23.20766,51.6733 -51.6733,51.6733 -1.69223,0 -3.44488,-0.36262 -5.07667,-0.54393 l 229.29646,63.21668 0.24174,45.44833 z" fill="#ffffff"/>
+ <path id="path4136" d="M 222,160 122,132 c -1,2 -21,80 97,114 l 306,84 22,-82 -305,-84 55,-38 -19,-5 z M 43.8,247 261,307 c 3,-5 8,-10 13,-15 L 43.8,229 Z M 266,345 c 0,21 12,38 29,47 L 43.8,322 44.5,505 c 10.5,0 21.3,-3 30.5,-7 10,-4 21,-7 32,-7 11,0 22,3 31,7 10,4 20,7 31,7 11,0 21,-3 31,-7 9,-4 20,-7 31,-7 11,0 22,3 32,7 9,4 19,7 30,7 11,0 22,-3 31,-7 10,-4 20,-7 32,-7 11,0 22,3 31,7 9,4 20,7 31,7 11,0 21,-3 30,-7 10,-4 21,-7 32,-7 11,0 22,3 32,7 9,4 19,7 30,7 l 0,-46 -229,-63 c 41.84053,3.68633 55.38359,-30.27233 56,-51 0,-28 -23,-52 -51,-52 -29,0 -52,23 -52,52 z m 120,-3 130,35 4,-17 -138,-38 c 2,6 4,13 4,20 z m -46,3 c 0,12 -10,22 -22,22 -13,0 -23,-10 -23,-22 0,-12 10,-22 23,-22 12,0 22,10 22,22 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 222,160 122,132 c -1,2 -21,80 97,114 l 306,84 22,-82 -305,-84 55,-38 -19,-5 z M 43.8,247 261,307 c 3,-5 8,-10 13,-15 L 43.8,229 Z M 266,345 c 0,21 12,38 29,47 L 43.8,322 44.5,505 c 10.5,0 21.3,-3 30.5,-7 10,-4 21,-7 32,-7 11,0 22,3 31,7 10,4 20,7 31,7 11,0 21,-3 31,-7 9,-4 20,-7 31,-7 11,0 22,3 32,7 9,4 19,7 30,7 11,0 22,-3 31,-7 10,-4 20,-7 32,-7 11,0 22,3 31,7 9,4 20,7 31,7 11,0 21,-3 30,-7 10,-4 21,-7 32,-7 11,0 22,3 32,7 9,4 19,7 30,7 l 0,-46 -229,-63 c 41.84053,3.68633 55.38359,-30.27233 56,-51 0,-28 -23,-52 -51,-52 -29,0 -52,23 -52,52 z m 120,-3 130,35 4,-17 -138,-38 c 2,6 4,13 4,20 z m -46,3 c 0,12 -10,22 -22,22 -13,0 -23,-10 -23,-22 0,-12 10,-22 23,-22 12,0 22,10 22,22 z" id="path5679" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/traffic_lights.svg b/vtm-themes/resources/assets/symbols/transport/traffic_lights.svg
old mode 100755
new mode 100644
index 12afe437..ed7fbe31
--- a/vtm-themes/resources/assets/symbols/transport/traffic_lights.svg
+++ b/vtm-themes/resources/assets/symbols/transport/traffic_lights.svg
@@ -1,79 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width=".8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r=".8" id="circle4300"/>
-    <circle cx="6.5" r=".8" id="circle4302"/>
-    <circle cx="10" r=".8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity=".75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width=".625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-         <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width=".125"/></marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path sodipodi:type="arc" id="path4809" sodipodi:cx="288.46561" sodipodi:cy="119.68254" sodipodi:rx="95.132271" sodipodi:ry="95.132271" d="m 383.59788,119.68254 a 95.132271,95.132271 0 1 1 -190.26454,0 95.132271,95.132271 0 1 1 190.26454,0 z" transform="matrix(0.91935484,0,0,0.91935484,29.263356,9.6518182)" opacity=".6" fill="#ffffff"/>
- <path transform="matrix(0.91935484,0,0,0.91935484,29.263356,181.65182)" d="m 383.59788,119.68254 a 95.132271,95.132271 0 1 1 -190.26454,0 95.132271,95.132271 0 1 1 190.26454,0 z" sodipodi:ry="95.132271" sodipodi:rx="95.132271" sodipodi:cy="119.68254" sodipodi:cx="288.46561" id="path4813" sodipodi:type="arc" opacity=".2" fill="#ffffff"/>
- <path sodipodi:type="arc" id="path4815" sodipodi:cx="288.46561" sodipodi:cy="119.68254" sodipodi:rx="95.132271" sodipodi:ry="95.132271" d="m 383.59788,119.68254 a 95.132271,95.132271 0 1 1 -190.26454,0 95.132271,95.132271 0 1 1 190.26454,0 z" transform="matrix(0.91935484,0,0,0.91935484,29.263356,351.65182)" opacity=".3" fill="#ffffff"/>
- <path d="m 296.09195,17.829971 c -1.1544,-0.01235 -2.31572,5.1e-4 -3.47009,0.02965 -49.73086,-0.08599 -95.36898,42.46164 -97.87428,92.298414 -1.58709,25.61454 0.16862,51.29301 -0.50421,76.93512 0.21255,95.85547 -0.63683,191.72794 0.50421,287.57244 4.1478,45.80317 43.39248,85.55474 89.33253,89.62911 43.41739,4.86929 88.30297,-21.28198 103.92469,-62.28363 8.26021,-19.9307 8.13,-41.86942 7.41471,-63.08442 -0.27357,-110.32898 0.62412,-220.67496 -0.53386,-330.99303 -4.11589,-45.501345 -42.81102,-85.076601 -88.44276,-89.451167 -3.44097,-0.392503 -6.88777,-0.615452 -10.35094,-0.652495 z m -0.0297,24.972772 c 42.62651,0 77.20205,34.575538 77.20205,77.202047 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.626509 34.54588,-77.202047 77.17239,-77.202047 z m 0,170.835107 c 42.62651,0 77.20205,34.57554 77.20205,77.20205 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20205 77.17239,-77.20205 z m 0,170.83512 c 42.62651,0 77.20205,34.57553 77.20205,77.20204 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20204 77.17239,-77.20204 z" id="path4782" color="#000000" stroke-width="200" fill="#ffffff"/>
- <path id="path8151" d="m 296.09195,17.829971 c -1.1544,-0.01235 -2.31572,5.1e-4 -3.47009,0.02965 -49.73086,-0.08599 -95.36898,42.46164 -97.87428,92.298414 -1.58709,25.61454 0.16862,51.29301 -0.50421,76.93512 0.21255,95.85547 -0.63683,191.72794 0.50421,287.57244 4.1478,45.80317 43.39248,85.55474 89.33253,89.62911 43.41739,4.86929 88.30297,-21.28198 103.92469,-62.28363 8.26021,-19.9307 8.13,-41.86942 7.41471,-63.08442 -0.27357,-110.32898 0.62412,-220.67496 -0.53386,-330.99303 -4.11589,-45.501345 -42.81102,-85.076601 -88.44276,-89.451167 -3.44097,-0.392503 -6.88777,-0.615452 -10.35094,-0.652495 z m -0.0297,24.972772 c 42.62651,0 77.20205,34.575538 77.20205,77.202047 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.626509 34.54588,-77.202047 77.17239,-77.202047 z m 0,170.835107 c 42.62651,0 77.20205,34.57554 77.20205,77.20205 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20205 77.17239,-77.20205 z m 0,170.83512 c 42.62651,0 77.20205,34.57553 77.20205,77.20204 0,42.62651 -34.57554,77.17239 -77.20205,77.17239 -42.62651,0 -77.17239,-34.54588 -77.17239,-77.17239 0,-42.62651 34.54588,-77.20204 77.17239,-77.20204 z" color="#000000" stroke-width="8" fill="none" stroke="#ffffff"/>
+ <path id="path4152" d="m 219.6,162.8 c -1.1,18 0.1,36 -0.3,54 0.2,67 -0.4,135 0.3,202 2.9,32 30.5,60 62.7,62.9 30.5,3.4 62,-14.9 72.9,-43.7 5.8,-14 5.7,-29.4 5.2,-44 C 360.2,317 360.8,239 360,162 357.1,130.1 330.27019,99.778256 292.16522,98.118631 254.06025,96.459006 221.7,127.8 219.6,162.8 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 219.6,162.8 c -1.1,18 0.1,36 -0.3,54 0.2,67 -0.4,135 0.3,202 2.9,32 30.5,60 62.7,62.9 30.5,3.4 62,-14.9 72.9,-43.7 5.8,-14 5.7,-29.4 5.2,-44 C 360.2,317 360.8,239 360,162 357.1,130.1 330.27019,99.778256 292.16522,98.118631 254.06025,96.459006 221.7,127.8 219.6,162.8 Z" id="path4150" fill="#0092da"/>
+ <path d="m 344.7,170.2 c 0,29.9 -24.3,54 -54,54 -29.9,0 -54,-24 -54,-54 0,-29.9 24,-54 54,-54 29.9,0 54,24.3 54,54 z" id="path4148" opacity="0.4" fill="#ffffff"/>
+ <path d="m 344.7,290.2 c 0,29.9 -24.3,54 -54,54 -29.9,0 -54,-24 -54,-54 0,-29.9 24,-54 54,-54 29.9,0 54,24.3 54,54 z" id="path4146" opacity="0.8" fill="#ffffff"/>
+ <path d="m 344.7,410.2 c 0,29.9 -24.3,54 -54,54 -29.9,0 -54,-24 -54,-54 0,-29.9 24,-54 54,-54 29.9,0 54,24.3 54,54 z" id="path4782" opacity="0.7" fill="#ffffff"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/train_station2.svg b/vtm-themes/resources/assets/symbols/transport/train_station2.svg
old mode 100755
new mode 100644
index a051f037..a34e76fb
--- a/vtm-themes/resources/assets/symbols/transport/train_station2.svg
+++ b/vtm-themes/resources/assets/symbols/transport/train_station2.svg
@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <defs id="defs22">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path3568" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path3565" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <metadata id="metadata10"/>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z" id="path1329" fill="#0092DA" stroke="#eeeeee" stroke-width="3.408"/>
- </g>
- <g id="g3574" transform="matrix(1.2317123,0,0,1.2317123,-81.360132,-113.23274)">
-  <g id="g3576">
-   <path d="M 295.5625,77.1875 L 213.03125,77.25 C 174.59259,77.249989 146.3125,108.11801 146.3125,141.75 L 146.3125,379.96875 C 146.31253,412.55139 171.80358,439.27577 197.4375,443.40625 L 120.5625,558.71875 L 164.9375,558.71875 L 219.90625,478.125 L 295.1875,478.125 L 295.25,478.125 L 295.3125,478.125 L 370.59375,478.125 L 425.5625,558.71875 L 469.9375,558.71875 L 393.0625,443.40625 C 418.69638,439.27575 444.21875,412.55141 444.21875,379.96875 L 444.21875,141.75 C 444.21871,108.11804 415.90738,77.25 377.46875,77.25 L 295.5625,77.1875 z M 262.875,91 L 295.1875,91 L 295.25,91 L 295.3125,91 L 327.625,91 C 333.47317,91 338.5625,95.90183 338.5625,101.75 L 338.5625,120.6875 C 338.5625,126.53567 333.75166,131.5625 327.625,131.5625 L 295.3125,131.5625 L 295.25,131.5625 L 295.1875,131.5625 L 262.875,131.5625 C 256.74835,131.5625 251.9375,126.53567 251.9375,120.6875 L 251.9375,101.75 C 251.9375,95.90183 257.02682,91.000003 262.875,91 z M 215.25,144.40625 L 295.1875,144.40625 L 295.3125,144.40625 L 375.25,144.40625 C 396.97176,144.40626 408.50001,159.95825 408.5,177.78125 L 408.5,220.65625 C 408.66931,241.26409 393.62996,253.90625 375.25,253.90625 L 295.3125,253.90625 L 295.25,253.90625 L 295.1875,253.90625 L 215.25,253.90625 C 196.87003,253.90625 181.83068,241.26409 182,220.65625 L 182,177.78125 C 181.99999,159.95825 193.52822,144.40625 215.25,144.40625 z M 211.625,350.15625 C 227.78266,350.15622 240.90625,363.24859 240.90625,379.40625 C 240.90625,395.56275 227.78266,408.65625 211.625,408.65625 C 195.46731,408.65623 182.375,395.56279 182.375,379.40625 C 182.37496,363.24855 195.46734,350.15625 211.625,350.15625 z M 378.1875,350.15625 C 394.34514,350.15623 407.4375,363.24858 407.4375,379.40625 C 407.43748,395.56277 394.34517,408.65626 378.1875,408.65625 C 362.02982,408.65623 348.93749,395.56278 348.9375,379.40625 C 348.93748,363.24857 362.02985,350.15625 378.1875,350.15625 z" transform="matrix(0.8977168,0,0,0.8977168,40.710583,46.777129)" id="path3578" fill="#ffffff"/>
-  </g>
- </g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="580" width="580" version="1.0">
+ <metadata id="metadata1976"/>
+ <path d="M 541.03,290.07 C 547.2,452.58 369.67,583.19 216.39,529.47 59.43,487.31 -13.161,279.18 83.631,148.58 170.3,11.03 390.56,3.2299 486.74,134.31 c 34.98,43.85 54.43,99.68 54.29,155.76 z" id="path8069" inkscape:connector-curvature="0" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="58.69"/>
+ <path id="path3276" d="M 541.03,290.07 C 547.2,452.58 369.67,583.19 216.39,529.47 59.43,487.31 -13.161,279.18 83.631,148.58 170.3,11.03 390.56,3.2299 486.74,134.31 c 34.98,43.85 54.43,99.68 54.29,155.76 z" inkscape:connector-curvature="0" fill="#bfe3f5" stroke="#0092da" stroke-width="21.831"/>
+ <path id="path3578" d="m 290.26,102.7 c -27.67,0.36 -55.41,-0.71 -83.03,0.7 -28.45,3.04 -53.27,29.43 -50.13,58.7 0.17,65.25 -0.35,130.51 0.26,195.74 2.51,23.42 22.2,43.68 45.36,47.43 -22.86,31.76 -45.73,63.51 -68.59,95.27 13.19,0 26.4,0 39.59,0 16.36,-22.2 32.7,-44.4 49.05,-66.6 44.83,0 89.67,0 134.51,0 16.35,22.2 32.69,44.4 49.04,66.6 13.19,0 26.4,0 39.6,0 -22.87,-31.76 -45.74,-63.51 -68.6,-95.27 27.55,-4.27 48.75,-31.73 45.65,-59.5 -0.19,-64.97 0.39,-129.96 -0.29,-194.91 -3.39,-30.96 -35.77,-51.048 -65.33,-48.12 -22.37,-0 -44.72,-0 -67.09,-0 z m -29.16,11.41 c 20.5,0.45 41.17,-0.9 61.57,0.71 9.29,4.43 5.08,15.69 6.03,23.82 -1.78,12.41 -16.12,8.25 -24.93,8.98 -15.48,-0.41 -31.13,0.88 -46.5,-0.72 -9.17,-4.55 -4.97,-15.77 -5.93,-23.91 0,-5.06 4.93,-8.96 9.76,-8.88 z m -42.49,44.13 c 48.76,0.1 97.53,-0.19 146.29,0.15 16.72,0.16 28.53,16.56 26.13,32.47 -0.75,13.94 1.91,28.38 -2.26,41.84 -6.79,16.1 -25.6,16.69 -40.54,16.01 -44.24,-0.1 -88.49,0.16 -132.73,-0.12 -16.7,-0.21 -29.25,-16.21 -26.63,-32.41 0.91,-14.42 -2.36,-29.57 2.98,-43.28 4.82,-9.98 16.08,-14.92 26.76,-14.66 z m -3.24,169.99 c 18.86,-1.48 34.13,22.12 21.67,37.67 -12.24,18.31 -45.53,11.55 -47.63,-11.04 -1.91,-14.6 11.84,-27.09 25.96,-26.63 z m 148.62,0 c 18.86,-1.47 34.08,22.13 21.64,37.67 -12.22,18.31 -45.51,11.55 -47.6,-11.04 -1.92,-14.61 11.85,-27.1 25.96,-26.63 z" inkscape:connector-curvature="0" fill="#0092d9"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/transport/tram_stop.svg b/vtm-themes/resources/assets/symbols/transport/tram_stop.svg
old mode 100755
new mode 100644
index ca7669c7..33a165cf
--- a/vtm-themes/resources/assets/symbols/transport/tram_stop.svg
+++ b/vtm-themes/resources/assets/symbols/transport/tram_stop.svg
@@ -1,91 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <marker id="Arrow2Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Lend">
-   <path transform="scale(1.1) rotate(180) translate(1,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4137" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
-  </marker>
-  <marker id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Mend">
-   <path transform="scale(0.4) rotate(180) translate(10,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4125" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="TriangleOutL" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutL">
-   <path transform="scale(0.8)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4214" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Lend" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Lend">
-   <path transform="scale(0.8) rotate(180) translate(12.5,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4119" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Tail" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Tail">
-   <g transform="scale(-1.2)" id="g4152">
-    <path d="M -3.8048674,-3.9585227 L 0.54352094,0" id="path4154" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M -1.2866832,-3.9585227 L 3.0617053,0" id="path4156" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M 1.3053582,-3.9585227 L 5.6537466,0" id="path4158" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M -3.8048674,4.1775838 L 0.54352094,0.21974226" id="path4160" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M -1.2866832,4.1775838 L 3.0617053,0.21974226" id="path4162" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-    <path d="M 1.3053582,4.1775838 L 5.6537466,0.21974226" id="path4164" fill="none" fill-rule="evenodd" stroke="#000000" stroke-linecap="round" stroke-width="0.8"/>
-   </g>
-  </marker>
-  <marker id="Arrow1Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Sstart">
-   <path transform="scale(0.2) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4128" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow1Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow1Send">
-   <path transform="scale(0.2) rotate(180) translate(6,0)" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path4131" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="SemiCircleOut" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="SemiCircleOut">
-   <path transform="scale(0.6) translate(7.125493,0.763446)" d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z " id="path4235" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Send" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Send">
-   <path transform="scale(0.3) rotate(180) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4149" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
-  </marker>
-  <marker id="TriangleOutS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="TriangleOutS">
-   <path transform="scale(0.2)" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " id="path4220" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker id="CurveIn" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="CurveIn">
-   <path transform="scale(0.6)" d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074" id="path4238" fill="none" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="InfiniteLineStart" inkscape:stockid="InfiniteLineStart">
-   <g transform="translate(-13,0)" id="g4298">
-    <circle cx="3" r="0.8" id="circle4300"/>
-    <circle cx="6.5" r="0.8" id="circle4302"/>
-    <circle cx="10" r="0.8" id="circle4304"/>
-   </g>
-  </marker>
-  <marker id="StopS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="StopS">
-   <path transform="scale(0.2)" d="M 0.0,5.65 L 0.0,-5.65" id="path4229" fill="none" fill-rule="evenodd" stroke="#000000" fill-opacity="0.75" stroke-width="1.25"/>
-  </marker>
-  <marker id="Arrow2Sstart" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="Arrow2Sstart">
-   <path transform="scale(0.3) translate(-2.3,0)" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " id="path4146" fill-rule="evenodd" stroke-linejoin="round" stroke-width="0.625"/>
-  </marker>
-  <marker id="DiamondS" refX="0.0" refY="0.0" orient="auto" inkscape:stockid="DiamondS">
-   <path transform="scale(0.2)" d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z " id="path4202" fill-rule="evenodd" stroke="#000000" stroke-width="1.25"/>
-  </marker>
-  <marker orient="auto" id="RazorWire" inkscape:stockid="RazorWire">
-       style="overflow:visible"&gt;
-            <path d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z " transform="scale(0.8,0.8)" id="path4286" fill="#808080" fill-rule="evenodd" stroke="#000000" stroke-width="0.125"/></marker>
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path1968" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path1965" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" stroke-width="3.408" stroke="#eee" fill="#0092da"/>
- </g>
- <path inkscape:connector-curvature="0" id="path30859" d="M 208.7127,117.9537 333.07725,36.035961 454.73526,117.8877 333.16165,199.77627 208.7127,117.9537 z" fill="none" stroke="#ffffff" stroke-width="10.203"/>
- <path inkscape:connector-curvature="0" id="path29926" d="m 160.41817,491.74312 c 0.43281,67.56962 97.21497,67.57086 97.21497,0.60759" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path30815" d="m 360.92405,491.7233 c 0.43282,67.56962 97.21497,67.57086 97.21497,0.60759" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path30821" d="m 268.11413,522.5785 81.41754,0 c -4.14386,-7.17737 -6.03434,-14.78615 -5.77213,-30.37969 l -68.50618,0 c -0.48497,15.8109 -2.96383,23.14768 -7.13923,30.37969 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path30827" d="m 131.77163,205.029 0.27328,30.78975 376.99221,0 0,-30.78975 -377.26549,0 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" id="path30833" d="m 480.43363,234.40679 c 7.58287,5.35346 14.57502,9.87803 14.57502,14.48394 l -0.0911,102.38957 c -1.77496,10.05829 -8.9163,11.74021 -14.48393,17.30785 l 28.60349,0 0,-134.18136 -28.60349,0 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path30839" d="m 270.74634,234.72407 c 7.58289,5.35345 14.57994,9.882 14.57994,14.48792 l -0.0886,188.16651 c -1.77496,10.05828 -8.92375,11.72291 -14.49138,17.29054 l 34.59355,-0.26458 0.43151,-205.58342 c 0,-4.06837 7.20375,-8.83149 14.63843,-14.08105 l -49.66349,-0.0159 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path30849" d="m 224.52251,234.55124 c -7.58289,5.35345 -14.57994,9.882 -14.57994,14.48791 l 0.0886,188.16652 c 1.77496,10.05828 8.92375,11.72291 14.49138,17.29054 l -34.59355,-0.005 0.21252,-219.82158 34.38103,-0.11794 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccc" id="path30853" d="m 131.7212,234.17906 -65.952005,131.26635 0,79.61609 c 1.5e-5,14.37924 16.979427,29.32707 29.924355,29.28669 l 413.34357,0 0,-106.35215 -204.64739,0 0,86.31149 -113.50303,0 0,-86.17485 -57.11589,0 c -12.94931,-10e-6 -34.80333,-15.56068 -26.9638,-44.81821 l 43.86172,-89.13541 -18.94753,0 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path30857" d="m 306.47577,351.37859 c 1.77496,10.05828 9.13631,11.29779 14.70394,16.86542 -11.43275,-0.0212 -30.02772,-0.14759 -30.06886,-1.20447 l -0.60232,-15.46855 15.96724,-0.1924 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path31750" d="m 438.29341,205.67655 -10.41177,-10.91967 -192.7448,0 -8.88809,10.66572 212.04466,0.25395 z" fill="#ffffff" fill-rule="evenodd" stroke="#ffffff"/>
+ <path d="M 333.08 36.035 C 291.62 63.341 250.17 90.647 208.71 117.95 C 247.66 143.56 286.59 169.15 325.53 194.76 L 235.14 194.76 C 230.57 200.14 226.94 207.52 218.69 205.03 L 131.77 205.03 C 131.29 214.94 133.08 225.99 131.21 235.19 C 109.4 278.61 87.585 322.03 65.77 365.45 C 65.897 392.88 65.515 420.34 65.965 447.76 C 69.327 465.85 88.265 476.98 105.83 474.35 L 509.04 474.35 L 509.04 205.03 L 437.68 205.03 C 432.61 200.55 429.09 192.45 421.12 194.76 L 340.61 194.76 C 378.66 169.13 416.69 143.51 454.74 117.89 C 414.18 90.605 373.63 63.319 333.08 36.035 z M 149.86 235.82 L 190.14 235.82 C 190.14 279.92 190.04 324.03 190.01 368.13 C 169.55 367.7 148.93 369.02 128.57 367.4 C 106.03 361.6 98.845 332.25 111.29 314.21 C 124.14 288.08 137 261.95 149.86 235.82 z M 222.69 235.82 L 222.73 235.82 L 272.29 235.82 C 284.37 240.69 286.78 252.36 285.32 263.86 C 285.32 321.7 285.22 379.54 285.22 437.38 C 282.49 449.34 270.52 456.66 258.72 454.31 L 224.3 454.31 C 212.93 448.49 208.13 436.98 210 424.82 C 210 366.22 209.9 307.63 209.9 249.04 C 211.1 242.6 218.11 239.56 222.69 235.82 z M 318.87 235.82 L 318.89 235.82 L 482.43 235.82 C 494.38 240.62 496.33 252.29 495 263.54 C 495 292.79 494.9 322.03 494.9 351.28 C 492.28 363.23 480.33 370.32 468.65 368 L 320.9 368 C 310.26 361.76 303.38 352.38 305.56 340.12 C 305.66 309.69 305.69 279.25 305.75 248.82 C 307.32 242.54 314.29 239.6 318.87 235.82 z M 338.05 491.63 C 336.82 491.57 335.36 491.74 333.62 492.18 L 275.25 492.18 C 280.1 503.84 258.42 526.81 278.25 522.56 L 349.53 522.56 C 340.19 514.18 349.94 492.19 338.05 491.63 z M 160.42 491.72 C 158.87 517.8 180.52 542.29 206.91 542.42 C 233.37 544.79 258.08 522.1 257.56 495.42 C 256.4 488.93 243.57 493.78 237.35 492.2 C 211.71 492.04 186.06 491.88 160.42 491.72 z M 360.92 491.72 C 359.23 518.68 382.5 543.56 409.69 542.47 C 435.43 543.63 458.5 521.21 458.07 495.42 C 456.91 488.93 444.08 493.78 437.86 492.2 C 412.21 492.04 386.57 491.88 360.92 491.72 z " id="path8407" opacity="0.8" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="40"/>
+ <path id="path30859" d="m 208.71,117.95 c 41.46,-27.302 82.91,-54.608 124.37,-81.914 40.55,27.284 81.1,54.568 121.66,81.854 -40.53,27.29 -81.05,54.59 -121.58,81.89 C 291.68,172.5 250.2,145.23 208.71,117.95 Z" fill="none" stroke="#0092d9" stroke-width="16"/>
+ <path d="m 235.14,194.76 c -4.57,5.38 -8.2,12.76 -16.45,10.27 -28.97,0 -57.95,0 -86.92,0 -0.48,9.91 1.31,20.96 -0.56,30.16 -21.81,43.42 -43.625,86.84 -65.44,130.26 0.127,27.43 -0.256,54.89 0.194,82.31 3.362,18.09 22.301,29.22 39.866,26.59 134.41,0 268.81,0 403.21,0 0,-89.77 0,-179.55 0,-269.32 -23.79,0 -47.57,0 -71.36,0 -5.07,-4.48 -8.59,-12.58 -16.56,-10.27 -61.99,0 -123.99,0 -185.98,0 z m -85.28,41.06 c 13.43,0 26.85,0 40.28,0 -0,44.1 -0.1,88.21 -0.13,132.31 -20.46,-0.43 -41.08,0.89 -61.44,-0.73 -22.54,-5.8 -29.724,-35.15 -17.28,-53.19 12.85,-26.13 25.71,-52.26 38.57,-78.39 z m 72.87,0 c 16.52,0 33.04,0 49.56,0 12.08,4.87 14.49,16.54 13.03,28.04 -0,57.84 -0.1,115.68 -0.1,173.52 -2.73,11.96 -14.7,19.28 -26.5,16.93 -11.48,0 -22.95,0 -34.42,0 -11.37,-5.82 -16.17,-17.33 -14.3,-29.49 -0,-58.6 -0.1,-117.19 -0.1,-175.78 1.2,-6.44 8.21,-9.48 12.79,-13.22 z m 96.16,0 c 54.51,0 109.03,0 163.54,0 11.95,4.8 13.9,16.47 12.57,27.72 -0,29.25 -0.1,58.49 -0.1,87.74 -2.62,11.95 -14.57,19.04 -26.25,16.72 -49.25,0 -98.5,0 -147.75,0 -10.64,-6.24 -17.52,-15.62 -15.34,-27.88 0.1,-30.43 0.13,-60.87 0.19,-91.3 1.57,-6.28 8.54,-9.22 13.12,-13 z m 42.03,255.9 c -1.69,26.96 21.58,51.84 48.77,50.75 25.74,1.16 48.81,-21.26 48.38,-47.05 -1.16,-6.49 -13.99,-1.64 -20.21,-3.22 -25.65,-0.16 -51.29,-0.32 -76.94,-0.48 z m -200.5,0 c -1.55,26.08 20.1,50.57 46.49,50.7 26.46,2.37 51.17,-20.32 50.65,-47 -1.16,-6.49 -13.99,-1.64 -20.21,-3.22 -25.64,-0.16 -51.29,-0.32 -76.93,-0.48 z m 114.83,0.46 c 4.85,11.66 -16.83,34.63 3,30.38 23.76,0 47.52,0 71.28,0 -10.3,-9.25 2.63,-35.06 -15.91,-30.38 -19.46,0 -38.91,0 -58.37,0 z" id="path29926" fill="#0092d9"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/volcano.svg b/vtm-themes/resources/assets/symbols/volcano.svg
index 1c5fcbb5..0838a636 100755
--- a/vtm-themes/resources/assets/symbols/volcano.svg
+++ b/vtm-themes/resources/assets/symbols/volcano.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="580" viewBox="0 0 6444.4444 6444.4444" height="580">
  <metadata id="metadata9"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4138" d="m 2126.6284,4166.6666 1228.927,-2010.9689 1228.927,2010.9689 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="1024" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" stroke="#ffffff" shape-rendering="auto"/>
  <path d="m 2126.6284,4166.6666 1228.927,-2010.9689 1228.927,2010.9689 z" id="path3-9" inkscape:connector-curvature="0" fill="#dd3333" stroke="#000000" stroke-width="266.67"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/water/weir.svg b/vtm-themes/resources/assets/symbols/water/weir.svg
old mode 100755
new mode 100644
index d59c8c64..11a8ab3b
--- a/vtm-themes/resources/assets/symbols/water/weir.svg
+++ b/vtm-themes/resources/assets/symbols/water/weir.svg
@@ -1,34 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
  <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
-   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
-   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
-   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
-   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
-  </symbol>
-  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
-   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
-  <linearGradient id="linearGradient2936">
-   <stop id="stop2938" stop-color="#8acf6b"/>
-   <stop offset="1" id="stop2940" stop-color="#368912"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2952">
-   <stop id="stop2954" stop-color="#c0d50d"/>
-   <stop offset="1" id="stop2956" stop-color="#eef2cd"/>
-  </linearGradient>
- </defs>
- <g id="g1327">
-  <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z " id="path1329" fill="#0092DA" stroke="#eee" stroke-width="3.408"/>
- </g>
- <path d="M 105 138.5625 C 82.455636 139.04808 61.42436 153.68047 39.6875 153.5625 C 39.477692 153.55754 39.27222 153.53876 39.0625 153.53125 L 39.0625 197.15625 C 61.302883 197.02121 82.818963 181.68267 106 182.15625 C 129.44843 182.79644 154.8153 199.06962 177.78125 200.1875 C 200.43961 200.80612 224.32047 186.55857 240.9375 186.4375 C 257.16223 186.30388 265.77336 196.91758 275.46875 199.40625 C 285.01176 201.72301 292.31781 202.22622 298.03125 200.65625 L 298.15625 169.9375 C 301.99997 171.95999 320.23864 173.93213 288.375 154.71875 C 274.40607 144.84293 258.32295 142.6086 242.09375 142.90625 C 225.47492 143.0272 201.65835 157.27487 179 156.65625 C 156.03404 155.53837 130.63594 139.20268 107.1875 138.5625 C 106.45705 138.54774 105.72724 138.54684 105 138.5625 z " id="path121" fill="#ffffff" fill-rule="evenodd"/>
- <path d="m 272.81345,203.26343 c 5.4828,17.66839 1.73344,42.62012 8.42705,62.46192 7.27785,19.4899 11.44834,27.60472 18.70891,47.5966 0.38761,1.09033 8.17912,19.81802 8.47491,20.92412 29.0411,-0.2218 57.0508,23.61394 40.49302,-25.1136 -7.26055,-19.9919 -18.90558,-37.18293 -26.18346,-56.67283 -6.6936,-19.84178 2.39416,-42.65962 -3.08808,-60.32633 -9.25741,-32.80102 -33.09728,-33.91389 -41.39465,-35.83641 -32.81615,-7.60364 -56.31307,-17.88257 -39.03183,16.18077 3.88984,7.66729 17.65058,13.14773 33.59413,30.78576 z" id="path3025" sodipodi:nodetypes="cccccccssc" fill="#ffffff" fill-rule="evenodd"/>
- <path d="m 140.53158,233.875 c -20.6718,-0.0322 -74.867293,0.70379 -101.46908,1.4375 l 0,241.3125 237.43138,0 C 260.82193,231.04103 268.79743,207.07373 140.53158,233.875 z" id="rect3039" sodipodi:nodetypes="ccccc" opacity=".75" fill="#ffffff" stroke="#ffffff" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.04"/>
- <path d="M 371 320.03125 C 349.83492 320.50279 329.29817 332.3247 309.4375 331.625 C 308.62739 331.587 307.86459 331.54873 307.0625 331.46875 L 307.0625 375.1875 C 307.46587 375.216 307.87582 375.2326 308.28125 375.25 C 329.44393 375.99556 351.28679 362.62729 373.9375 363.65625 C 396.27477 364.59271 418.64775 380.42422 441.46875 380.96875 C 463.9069 381.08692 485.53182 365.49479 508.90625 365.96875 C 519.83001 366.23041 531.17539 369.95588 542.5 373.96875 L 542.5 329.9375 C 531.58299 326.11964 520.65336 322.66245 510.125 322.375 C 486.75051 321.90282 465.06314 337.55569 442.625 337.4375 C 419.80394 336.89477 397.46222 321.06326 375.125 320.125 C 374.4173 320.0877 373.73743 320.04075 373.03125 320.03125 C 372.34715 320.02202 371.68274 320.01604 371 320.03125 z " id="path3815" fill="#ffffff" fill-rule="evenodd"/>
- <path d="M 378.65625 408.4375 C 356.76496 408.14203 335.56385 420.78476 315.0625 420.0625 C 314.2524 420.0245 313.45833 419.95498 312.65625 419.875 L 312.65625 463.59375 C 313.05962 463.62225 313.46957 463.6701 313.875 463.6875 C 335.03768 464.43307 356.9118 451.03355 379.5625 452.0625 C 401.89977 452.99897 424.24149 468.83047 447.0625 469.375 C 469.50065 469.49317 491.15682 453.90105 514.53125 454.375 C 523.64659 454.59334 533.05472 457.24053 542.5 460.4375 L 542.5 416.4375 C 533.4631 413.44622 524.47349 411.01942 515.75 410.78125 C 492.37551 410.30906 470.68813 425.96195 448.25 425.84375 C 425.42894 425.30103 403.08722 409.46951 380.75 408.53125 C 380.0423 408.49395 379.36243 408.447 378.65625 408.4375 z " id="path3831" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4147" d="m 199.58398,219.79297 c -16.0301,0.33837 -35.31372,3.69845 -59.14257,8.71289 -21.08302,0.008 -74.532876,0.69769 -100.587894,1.39648 -2.979328,0.0797 -5.353226,2.51766 -5.353516,5.49805 l 0,241 c 3.04e-4,3.03744 2.46256,5.4997 5.5,5.5 l 237,0 c 3.17802,-3.9e-4 5.69447,-2.68609 5.48828,-5.85742 -7.99537,-122.629 -9.35501,-189.62695 -26.53125,-225.375 -8.58812,-17.87403 -22.38898,-27.68185 -41.24414,-30.14649 -4.71379,-0.61616 -9.73976,-0.84227 -15.12891,-0.72851 z" shape-rendering="auto" mix-blend-mode="normal" filter-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.8" fill="none" solid-opacity="1" image-rendering="auto" solid-color="#000000" stroke="#ffffff" color="#000000" stroke-linejoin="round" stroke-width="64" color-rendering="auto" filter-gaussianBlur-deviation="0" color-interpolation="sRGB"/>
+ <path id="path4149" d="m 39,154 0,43 c 22,0 44,-15 67,-15 23,1 49,17 72,18 22,1 46,-13 63,-14 13.54524,0.23483 26.96009,6.91165 32,17 8.34898,16.71211 2,43 8,63 7.89308,24.49079 19.99609,40.69408 25,63 1.2642,6.08521 1,46 1,46 25.18304,1.67093 46.70281,-11.4431 67,-11 22,1 45,16 68,17 22,0 44,-15 67,-15 11,0 22,4 34,8 l 0,-44 c -11,-4 -22,-7 -33,-8 -23,0 -45,16 -67,15 -23,0 -45,-16 -61.5,-16.5 C 365,320 359,321 353,323 c -1,-4 -2,-8 -4,-14 -7,-20 -19,-37 -26,-56 -7,-20 2,-43 -3,-61 -9.47112,-32.54639 -50.80058,-48.46639 -78,-49 -16,0 -40,14 -63,14 -23,-1 -48,-18 -72,-18 -25.341464,-1.02418 -47.000254,14.02615 -68,15 z m 274,266 0,44 c 25.22094,0.77117 46.62092,-12.44376 67,-12 22,1 44,17 67,17 23,1 44,-15 68,-15 9,1 18,3 28,6 l 0,-44 c -9,-3 -18,-5 -27,-5 -24,-1 -45,15 -68,15 -23,-1 -45,-16 -68,-17.5 -25.27222,-0.63187 -46.00873,11.5 -67,11.5 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 199.58398,219.79297 c -16.0301,0.33837 -35.31372,3.69845 -59.14257,8.71289 -21.08302,0.008 -74.532876,0.69769 -100.587894,1.39648 -2.979328,0.0797 -5.353226,2.51766 -5.353516,5.49805 l 0,241 c 3.04e-4,3.03744 2.46256,5.4997 5.5,5.5 l 237,0 c 3.17802,-3.9e-4 5.69447,-2.68609 5.48828,-5.85742 -7.99537,-122.629 -9.35501,-189.62695 -26.53125,-225.375 -8.58812,-17.87403 -22.38898,-27.68185 -41.24414,-30.14649 -4.71379,-0.61616 -9.73976,-0.84227 -15.12891,-0.72851 z" id="rect3039-1" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.8" fill="#0092da" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
+ <path d="m 39,154 0,43 c 22,0 44,-15 67,-15 23,1 49,17 72,18 22,1 46,-13 63,-14 13.54524,0.23483 26.96009,6.91165 32,17 8.34898,16.71211 2,43 8,63 7.89308,24.49079 19.99609,40.69408 25,63 1.2642,6.08521 1,46 1,46 25.18304,1.67093 46.70281,-11.4431 67,-11 22,1 45,16 68,17 22,0 44,-15 67,-15 11,0 22,4 34,8 l 0,-44 c -11,-4 -22,-7 -33,-8 -23,0 -45,16 -67,15 -23,0 -45,-16 -61.5,-16.5 C 365,320 359,321 353,323 c -1,-4 -2,-8 -4,-14 -7,-20 -19,-37 -26,-56 -7,-20 2,-43 -3,-61 -9.47112,-32.54639 -50.80058,-48.46639 -78,-49 -16,0 -40,14 -63,14 -23,-1 -48,-18 -72,-18 -25.341464,-1.02418 -47.000254,14.02615 -68,15 z m 274,266 0,44 c 25.22094,0.77117 46.62092,-12.44376 67,-12 22,1 44,17 67,17 23,1 44,-15 68,-15 9,1 18,3 28,6 l 0,-44 c -9,-3 -18,-5 -27,-5 -24,-1 -45,15 -68,15 -23,-1 -45,-16 -68,-17.5 -25.27222,-0.63187 -46.00873,11.5 -67,11.5 z" id="path121" fill="#0092da"/>
 </svg>
diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/vtm/default.xml
similarity index 97%
rename from vtm-themes/resources/assets/styles/default.xml
rename to vtm-themes/resources/assets/vtm/default.xml
index 4b26340f..f3a40a97 100644
--- a/vtm-themes/resources/assets/styles/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -537,7 +537,7 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <!-- A place where planes are parked -->
             <m v="apron">
@@ -976,7 +976,7 @@
                 <symbol src="assets:symbols/dot_blue.svg" />
             </m>
             <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/traffic_signal.svg" />
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
             </m>
             <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
@@ -1034,13 +1034,13 @@
         <!-- railway -->
         <m k="railway">
             <m v="station" zoom-min="14">
-                <symbol src="assets:symbols/transport/train_station.svg" />
+                <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
-                <symbol src="assets:symbols/transport/train_station2.svg" />
+                <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
@@ -1052,10 +1052,10 @@
         <!-- aeroway -->
         <m k="aeroway">
             <m k="aeroway" v="helipad" zoom-min="16">
-                <symbol src="assets:symbols/transport/helicopter_pad.svg" />
+                <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
             <m k="aeroway" v="aerodrome|airport" zoom-min="9">
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
 
@@ -1115,7 +1115,7 @@
                     <symbol src="assets:symbols/money/bank2.svg" />
                 </m>
                 <!--<m k="amenity" v="bench">
-                    <symbol src="assets:symbols/amenity/bench.svg" />
+                    <symbol src="assets:symbols/bench.svg" />
                 </m>-->
                 <m k="amenity" v="bicycle_rental">
                     <symbol src="assets:symbols/transport/rental_bicycle.svg" />
@@ -1127,13 +1127,13 @@
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
                 <m k="amenity" v="fountain">
-                    <symbol src="assets:symbols/amenity/fountain.svg" />
+                    <symbol src="assets:symbols/amenity/fountain2.svg" />
                 </m>
                 <m k="amenity" v="fuel">
                     <symbol src="assets:symbols/transport/fuel.svg" />
                 </m>
                 <m k="amenity" v="kindergarten">
-                    <symbol src="assets:symbols/education/nursery2.svg" />
+                    <symbol src="assets:symbols/education/nursery3.svg" />
                 </m>
                 <m k="amenity" v="parking">
                     <symbol src="assets:symbols/transport/parking.svg" />
@@ -1142,14 +1142,26 @@
                     <symbol src="assets:symbols/health/pharmacy.svg" />
                 </m>
                 <m k="amenity" v="place_of_worship">
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="assets:symbols/place_of_worship/jewish3.svg" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="assets:symbols/place_of_worship/islamic3.svg" />
+                    <m k="denomination|religion" v="buddhist">
+                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
                     </m>
                     <m k="denomination|religion" v="christian">
-                        <symbol src="assets:symbols/place_of_worship/christian3.svg" />
+                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
+                    </m>
+                    <m k="denomination|religion" v="hindu">
+                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
+                    </m>
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
+                    </m>
+                    <m k="denomination|religion" v="shinto">
+                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
+                    </m>
+                    <m k="denomination|religion" v="~|*">
+                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
                     </m>
                 </m>
                 <m k="amenity" v="post_box">
diff --git a/vtm-themes/resources/assets/styles/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
similarity index 97%
rename from vtm-themes/resources/assets/styles/mapzen.xml
rename to vtm-themes/resources/assets/vtm/mapzen.xml
index facaa608..02d5ca84 100644
--- a/vtm-themes/resources/assets/styles/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -537,7 +537,7 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <!-- A place where planes are parked -->
             <m v="apron">
@@ -976,7 +976,7 @@
                 <symbol src="assets:symbols/dot_blue.svg" />
             </m>
             <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/traffic_signal.svg" />
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
             </m>
             <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
@@ -1034,13 +1034,13 @@
         <!-- railway -->
         <m k="railway">
             <m v="station" zoom-min="14">
-                <symbol src="assets:symbols/transport/train_station.svg" />
+                <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
-                <symbol src="assets:symbols/transport/train_station2.svg" />
+                <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
@@ -1052,10 +1052,10 @@
         <!-- aeroway -->
         <m k="aeroway">
             <m k="aeroway" v="helipad" zoom-min="16">
-                <symbol src="assets:symbols/transport/helicopter_pad.svg" />
+                <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
             <m k="aeroway" v="aerodrome|airport" zoom-min="9">
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
 
@@ -1115,7 +1115,7 @@
                     <symbol src="assets:symbols/money/bank2.svg" />
                 </m>
                 <!--<m k="amenity" v="bench">
-                    <symbol src="assets:symbols/amenity/bench.svg" />
+                    <symbol src="assets:symbols/bench.svg" />
                 </m>-->
                 <m k="amenity" v="bicycle_rental">
                     <symbol src="assets:symbols/transport/rental_bicycle.svg" />
@@ -1127,13 +1127,13 @@
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
                 <m k="amenity" v="fountain">
-                    <symbol src="assets:symbols/amenity/fountain.svg" />
+                    <symbol src="assets:symbols/amenity/fountain2.svg" />
                 </m>
                 <m k="amenity" v="fuel">
                     <symbol src="assets:symbols/transport/fuel.svg" />
                 </m>
                 <m k="amenity" v="kindergarten">
-                    <symbol src="assets:symbols/education/nursery2.svg" />
+                    <symbol src="assets:symbols/education/nursery3.svg" />
                 </m>
                 <m k="amenity" v="parking">
                     <symbol src="assets:symbols/transport/parking.svg" />
@@ -1142,14 +1142,26 @@
                     <symbol src="assets:symbols/health/pharmacy.svg" />
                 </m>
                 <m k="amenity" v="place_of_worship">
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="assets:symbols/place_of_worship/jewish3.svg" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="assets:symbols/place_of_worship/islamic3.svg" />
+                    <m k="denomination|religion" v="buddhist">
+                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
                     </m>
                     <m k="denomination|religion" v="christian">
-                        <symbol src="assets:symbols/place_of_worship/christian3.svg" />
+                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
+                    </m>
+                    <m k="denomination|religion" v="hindu">
+                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
+                    </m>
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
+                    </m>
+                    <m k="denomination|religion" v="shinto">
+                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
+                    </m>
+                    <m k="denomination|religion" v="~|*">
+                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
                     </m>
                 </m>
                 <m k="amenity" v="post_box">
diff --git a/vtm-themes/resources/assets/styles/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
similarity index 97%
rename from vtm-themes/resources/assets/styles/newtron.xml
rename to vtm-themes/resources/assets/vtm/newtron.xml
index 46edcff5..785aa3aa 100644
--- a/vtm-themes/resources/assets/styles/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -487,7 +487,7 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#050008" />
@@ -859,7 +859,7 @@
         <!-- <m k="aerialway"> <line stroke="#202020" width="0.4"
           cap="butt" /> <m k="aerialway" v="cable_car"> <lineSymbol
           src="assets:symbols/cable_car.svg"
-          /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="assets:symbols/chair_lift_2.svg"
+          /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="assets:symbols/chair_lift.svg"
           /> </m> <m k="aerialway" v="gondola"> <lineSymbol src="assets:symbols/gondola.svg"
           /> </m> <m zoom-min="14"> <text k="name" style="bold"
           size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
@@ -989,10 +989,10 @@
 
         <m k="aeroway">
             <m k="aeroway" v="helipad" zoom-min="17">
-                <symbol src="assets:symbols/transport/helicopter_pad.svg" />
+                <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
             <m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
 
@@ -1005,7 +1005,7 @@
                     <symbol src="assets:symbols/money/bank2.svg" />
                 </m>
                 <!--<m v="bench" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/bench.svg" />
+                    <symbol src="assets:symbols/bench.svg" />
                 </m>-->
                 <m v="bicycle_rental" zoom-min="17">
                     <symbol src="assets:symbols/transport/rental_bicycle.svg" />
@@ -1029,7 +1029,7 @@
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
                 <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain.svg" />
+                    <symbol src="assets:symbols/amenity/fountain2.svg" />
                 </m>
                 <m v="fuel" zoom-min="17">
                     <symbol src="assets:symbols/transport/fuel.svg" />
@@ -1038,7 +1038,7 @@
                     <symbol src="assets:symbols/health/hospital.svg" />
                 </m>
                 <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery2.svg" />
+                    <symbol src="assets:symbols/education/nursery3.svg" />
                 </m>
                 <m v="library" zoom-min="17">
                     <symbol src="assets:symbols/amenity/library.svg" />
@@ -1050,14 +1050,26 @@
                     <symbol src="assets:symbols/health/pharmacy.svg" />
                 </m>
                 <m v="place_of_worship" zoom-min="17">
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="assets:symbols/place_of_worship/jewish3.svg" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="assets:symbols/place_of_worship/islamic3.svg" />
+                    <m k="denomination|religion" v="buddhist">
+                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
                     </m>
                     <m k="denomination|religion" v="christian">
-                        <symbol src="assets:symbols/place_of_worship/christian3.svg" />
+                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
+                    </m>
+                    <m k="denomination|religion" v="hindu">
+                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
+                    </m>
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
+                    </m>
+                    <m k="denomination|religion" v="shinto">
+                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
+                    </m>
+                    <m k="denomination|religion" v="~|*">
+                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
                     </m>
                 </m>
                 <m v="post_box" zoom-min="17">
@@ -1109,7 +1121,7 @@
                 <symbol src="assets:symbols/dot_blue.svg" />
             </m>
             <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/traffic_signal.svg" />
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
             </m>
             <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
@@ -1203,12 +1215,12 @@
                 <symbol src="assets:symbols/railway-crossing.svg" />
             </m>
             <m k="railway" v="station" zoom-min="14">
-                <symbol src="assets:symbols/transport/train_station.svg" />
+                <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m k="railway" v="halt|tram_stop" zoom-min="15">
-                <symbol src="assets:symbols/transport/train_station2.svg" />
+                <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
similarity index 97%
rename from vtm-themes/resources/assets/styles/osmarender.xml
rename to vtm-themes/resources/assets/vtm/osmarender.xml
index b46646ce..d3e75c87 100644
--- a/vtm-themes/resources/assets/styles/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -121,7 +121,7 @@
                 <m closed="yes" v="fountain">
                     <area fill="#b5d6f1" stroke="#000080" stroke-width="0.15" />
                     <m zoom-min="17">
-                        <symbol src="assets:symbols/amenity/fountain/svg" />
+                        <symbol src="assets:symbols/amenity/fountain2.svg" />
                     </m>
                 </m>
                 <m v="hospital" zoom-min="15">
@@ -429,7 +429,7 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#f0f0f0" />
@@ -887,7 +887,6 @@
                                         stroke="#ffffff" stroke-width="2.0" />
                                 </m>
                             </m>
-                            <m></m>
                         </m>
                     </m>
                 </m>
@@ -956,7 +955,7 @@
                 <lineSymbol src="assets:symbols/cable_car.svg" />
             </m>
             <m k="aerialway" v="chair_lift">
-                <lineSymbol src="assets:symbols/chair_lift_2.svg" />
+                <lineSymbol src="assets:symbols/chair_lift.svg" />
             </m>
             <m k="aerialway" v="gondola">
                 <lineSymbol src="assets:symbols/gondola.svg" />
@@ -1080,10 +1079,10 @@
 
         <m k="aeroway">
             <m k="aeroway" v="helipad" zoom-min="17">
-                <symbol src="assets:symbols/transport/helicopter_pad.svg" />
+                <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
             <m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
 
@@ -1096,7 +1095,7 @@
                     <symbol src="assets:symbols/money/bank2.svg" />
                 </m>
                 <!--<m v="bench" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/bench.svg" />
+                    <symbol src="assets:symbols/bench.svg" />
                 </m>-->
                 <m v="bicycle_rental" zoom-min="17">
                     <symbol src="assets:symbols/transport/rental_bicycle.svg" />
@@ -1120,7 +1119,7 @@
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
                 <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain.svg" />
+                    <symbol src="assets:symbols/amenity/fountain2.svg" />
                 </m>
                 <m v="fuel" zoom-min="17">
                     <symbol src="assets:symbols/transport/fuel.svg" />
@@ -1129,7 +1128,7 @@
                     <symbol src="assets:symbols/health/hospital.svg" />
                 </m>
                 <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery2.svg" />
+                    <symbol src="assets:symbols/education/nursery3.svg" />
                 </m>
                 <m v="library" zoom-min="17">
                     <symbol src="assets:symbols/amenity/library.svg" />
@@ -1141,14 +1140,26 @@
                     <symbol src="assets:symbols/health/pharmacy.svg" />
                 </m>
                 <m v="place_of_worship" zoom-min="17">
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="assets:symbols/place_of_worship/jewish3.svg" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="assets:symbols/place_of_worship/islamic3.svg" />
+                    <m k="denomination|religion" v="buddhist">
+                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
                     </m>
                     <m k="denomination|religion" v="christian">
-                        <symbol src="assets:symbols/place_of_worship/christian3.svg" />
+                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
+                    </m>
+                    <m k="denomination|religion" v="hindu">
+                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
+                    </m>
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
+                    </m>
+                    <m k="denomination|religion" v="shinto">
+                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
+                    </m>
+                    <m k="denomination|religion" v="~|*">
+                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
                     </m>
                 </m>
                 <m v="post_box" zoom-min="17">
@@ -1200,7 +1211,7 @@
                 <symbol src="assets:symbols/dot_blue.svg" />
             </m>
             <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/traffic_signal.svg" />
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
             </m>
             <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
@@ -1294,12 +1305,12 @@
                 <symbol src="assets:symbols/railway-crossing.svg" />
             </m>
             <m k="railway" v="station" zoom-min="14">
-                <symbol src="assets:symbols/transport/train_station.svg" />
+                <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m k="railway" v="halt|tram_stop" zoom-min="15">
-                <symbol src="assets:symbols/transport/train_station2.svg" />
+                <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
similarity index 97%
rename from vtm-themes/resources/assets/styles/tronrender.xml
rename to vtm-themes/resources/assets/vtm/tronrender.xml
index dabaf729..0de719be 100644
--- a/vtm-themes/resources/assets/styles/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -487,7 +487,7 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#050008" />
@@ -852,7 +852,7 @@
         <!-- <m k="aerialway"> <line stroke="#202020" width="0.4"
           cap="butt" /> <m k="aerialway" v="cable_car"> <lineSymbol
           src="assets:symbols/cable_car.svg"
-          /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="assets:symbols/chair_lift_2.svg"
+          /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="assets:symbols/chair_lift.svg"
           /> </m> <m k="aerialway" v="gondola"> <lineSymbol src="assets:symbols/gondola.svg"
           /> </m> <m zoom-min="14"> <text k="name" style="bold"
           size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
@@ -982,10 +982,10 @@
 
         <m k="aeroway">
             <m k="aeroway" v="helipad" zoom-min="17">
-                <symbol src="assets:symbols/transport/helicopter_pad.svg" />
+                <symbol src="assets:symbols/transport/helicopter.svg" />
             </m>
             <m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
-                <symbol src="assets:symbols/transport/airport.svg" />
+                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
         </m>
 
@@ -998,7 +998,7 @@
                     <symbol src="assets:symbols/money/bank2.svg" />
                 </m>
                 <!--<m v="bench" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/bench.svg" />
+                    <symbol src="assets:symbols/bench.svg" />
                 </m>-->
                 <m v="bicycle_rental" zoom-min="17">
                     <symbol src="assets:symbols/transport/rental_bicycle.svg" />
@@ -1022,7 +1022,7 @@
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
                 <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain.svg" />
+                    <symbol src="assets:symbols/amenity/fountain2.svg" />
                 </m>
                 <m v="fuel" zoom-min="17">
                     <symbol src="assets:symbols/transport/fuel.svg" />
@@ -1031,7 +1031,7 @@
                     <symbol src="assets:symbols/health/hospital.svg" />
                 </m>
                 <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery2.svg" />
+                    <symbol src="assets:symbols/education/nursery3.svg" />
                 </m>
                 <m v="library" zoom-min="17">
                     <symbol src="assets:symbols/amenity/library.svg" />
@@ -1043,14 +1043,26 @@
                     <symbol src="assets:symbols/health/pharmacy.svg" />
                 </m>
                 <m v="place_of_worship" zoom-min="17">
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="assets:symbols/place_of_worship/jewish3.svg" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="assets:symbols/place_of_worship/islamic3.svg" />
+                    <m k="denomination|religion" v="buddhist">
+                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
                     </m>
                     <m k="denomination|religion" v="christian">
-                        <symbol src="assets:symbols/place_of_worship/christian3.svg" />
+                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
+                    </m>
+                    <m k="denomination|religion" v="hindu">
+                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
+                    </m>
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
+                    </m>
+                    <m k="denomination|religion" v="shinto">
+                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
+                    </m>
+                    <m k="denomination|religion" v="~|*">
+                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
                     </m>
                 </m>
                 <m v="post_box" zoom-min="17">
@@ -1102,7 +1114,7 @@
                 <symbol src="assets:symbols/dot_blue.svg" />
             </m>
             <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/traffic_signal.svg" />
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
             </m>
             <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
@@ -1196,12 +1208,12 @@
                 <symbol src="assets:symbols/railway-crossing.svg" />
             </m>
             <m k="railway" v="station" zoom-min="14">
-                <symbol src="assets:symbols/transport/train_station.svg" />
+                <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
             <m k="railway" v="halt|tram_stop" zoom-min="15">
-                <symbol src="assets:symbols/transport/train_station2.svg" />
+                <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="-20" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
diff --git a/vtm-themes/src/org/oscim/theme/VtmThemes.java b/vtm-themes/src/org/oscim/theme/VtmThemes.java
index 298a26ea..61243990 100644
--- a/vtm-themes/src/org/oscim/theme/VtmThemes.java
+++ b/vtm-themes/src/org/oscim/theme/VtmThemes.java
@@ -28,11 +28,11 @@ import java.io.InputStream;
  */
 public enum VtmThemes implements ThemeFile {
 
-    DEFAULT("styles/default.xml"),
-    MAPZEN("styles/mapzen.xml"),
-    NEWTRON("styles/newtron.xml"),
-    OSMARENDER("styles/osmarender.xml"),
-    TRONRENDER("styles/tronrender.xml");
+    DEFAULT("vtm/default.xml"),
+    MAPZEN("vtm/mapzen.xml"),
+    NEWTRON("vtm/newtron.xml"),
+    OSMARENDER("vtm/osmarender.xml"),
+    TRONRENDER("vtm/tronrender.xml");
 
     private final String mPath;