diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 20bfdc000c..12fb0ad30b 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index e011496f76..be12099c4a 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -635,56 +635,56 @@
   <symbol minX="960" maxX="1000" minY="926" maxY="966" name="car-repair-s"/>
   <symbol minX="1000" maxX="1040" minY="926" maxY="966" name="car-part-s"/>
   <symbol minX="1040" maxX="1078" minY="926" maxY="964" name="peakt-l"/>
-  <symbol minX="1078" maxX="1134" minY="926" maxY="964" name="subway-kiev-m"/>
-  <symbol minX="1134" maxX="1172" minY="926" maxY="964" name="api-result"/>
-  <symbol minX="1172" maxX="1223" minY="926" maxY="964" name="subway-madrid-s"/>
-  <symbol minX="1223" maxX="1261" minY="926" maxY="964" name="subway-paris-s"/>
-  <symbol minX="1261" maxX="1299" minY="926" maxY="964" name="lightrail-berlin-s"/>
-  <symbol minX="1299" maxX="1355" minY="926" maxY="964" name="subway-kiev-l"/>
-  <symbol minX="1355" maxX="1413" minY="926" maxY="962" name="railway-crossing-xl"/>
-  <symbol minX="1413" maxX="1449" minY="926" maxY="962" name="subway-moscow-s"/>
-  <symbol minX="1449" maxX="1487" minY="926" maxY="959" name="bench"/>
-  <symbol minX="1487" maxX="1520" minY="926" maxY="959" name="subway-rome-s"/>
-  <symbol minX="1520" maxX="1553" minY="926" maxY="959" name="subway-berlin-s"/>
-  <symbol minX="1553" maxX="1595" minY="926" maxY="959" name="subway-london-s"/>
-  <symbol minX="1595" maxX="1626" minY="926" maxY="957" name="train-xs"/>
-  <symbol minX="1626" maxX="1675" minY="926" maxY="957" name="railway-crossing-l"/>
-  <symbol minX="1675" maxX="1706" minY="926" maxY="957" name="parking-s"/>
-  <symbol minX="1706" maxX="1737" minY="926" maxY="957" name="star-l"/>
-  <symbol minX="1737" maxX="1768" minY="926" maxY="957" name="bike-parking-s"/>
-  <symbol minX="1768" maxX="1799" minY="926" maxY="957" name="survey_point-l"/>
-  <symbol minX="1799" maxX="1830" minY="926" maxY="957" name="subway-xs"/>
-  <symbol minX="1830" maxX="1861" minY="926" maxY="957" name="viator-star-l"/>
-  <symbol minX="1861" maxX="1892" minY="926" maxY="957" name="parking_pay-s"/>
-  <symbol minX="1892" maxX="1923" minY="926" maxY="957" name="speedcam-s"/>
-  <symbol minX="1923" maxX="1954" minY="926" maxY="957" name="subway-newyork-xs"/>
-  <symbol minX="1954" maxX="1985" minY="926" maxY="957" name="motorcycle-parking-s"/>
-  <symbol minX="1985" maxX="2041" minY="926" maxY="957" name="subway-minsk-l"/>
-  <symbol minX="0" maxX="29" minY="966" maxY="995" name="viator-star-m"/>
-  <symbol minX="29" maxX="76" minY="966" maxY="995" name="subway-kiev-s"/>
-  <symbol minX="76" maxX="105" minY="966" maxY="995" name="star-m"/>
-  <symbol minX="105" maxX="152" minY="966" maxY="993" name="subway-minsk-m"/>
-  <symbol minX="152" maxX="194" minY="966" maxY="993" name="railway-crossing"/>
-  <symbol minX="194" maxX="221" minY="966" maxY="993" name="survey_point-m"/>
-  <symbol minX="221" maxX="250" minY="966" maxY="993" name="peakt-m"/>
-  <symbol minX="250" maxX="274" minY="966" maxY="990" name="star-s"/>
-  <symbol minX="274" maxX="316" minY="966" maxY="990" name="subway-minsk-s"/>
-  <symbol minX="316" maxX="340" minY="966" maxY="990" name="crossing-l"/>
-  <symbol minX="340" maxX="364" minY="966" maxY="990" name="viator-star-s"/>
-  <symbol minX="364" maxX="415" minY="966" maxY="988" name="arrow-m"/>
-  <symbol minX="415" maxX="437" minY="966" maxY="988" name="survey_point-s"/>
-  <symbol minX="437" maxX="461" minY="966" maxY="988" name="peakt-s"/>
-  <symbol minX="461" maxX="481" minY="966" maxY="986" name="entrance-s"/>
-  <symbol minX="481" maxX="501" minY="966" maxY="986" name="crossing-m"/>
-  <symbol minX="501" maxX="521" minY="966" maxY="986" name="zero-icon"/>
-  <symbol minX="521" maxX="536" minY="966" maxY="981" name="dot-m"/>
-  <symbol minX="536" maxX="551" minY="966" maxY="981" name="crossing-s"/>
-  <symbol minX="551" maxX="589" minY="966" maxY="981" name="arrow-s"/>
-  <symbol minX="589" maxX="604" minY="966" maxY="981" name="cities-m"/>
-  <symbol minX="604" maxX="617" minY="966" maxY="979" name="entrance-xs"/>
-  <symbol minX="617" maxX="628" minY="966" maxY="977" name="cities-xs"/>
-  <symbol minX="628" maxX="639" minY="966" maxY="977" name="cities-s"/>
-  <symbol minX="639" maxX="663" minY="966" maxY="977" name="arrow-xs"/>
-  <symbol minX="663" maxX="674" minY="966" maxY="977" name="dot-s"/>
+  <symbol minX="1078" maxX="1116" minY="926" maxY="964" name="lightrail-berlin-s"/>
+  <symbol minX="1116" maxX="1154" minY="926" maxY="964" name="api-result"/>
+  <symbol minX="1154" maxX="1192" minY="926" maxY="964" name="subway-paris-s"/>
+  <symbol minX="1192" maxX="1248" minY="926" maxY="964" name="subway-kiev-l"/>
+  <symbol minX="1248" maxX="1304" minY="926" maxY="964" name="subway-kiev-m"/>
+  <symbol minX="1304" maxX="1355" minY="926" maxY="964" name="subway-madrid-s"/>
+  <symbol minX="1355" maxX="1391" minY="926" maxY="962" name="subway-moscow-s"/>
+  <symbol minX="1391" maxX="1449" minY="926" maxY="962" name="railway-crossing-xl"/>
+  <symbol minX="1449" maxX="1485" minY="926" maxY="962" name="viator-star-l"/>
+  <symbol minX="1485" maxX="1523" minY="926" maxY="959" name="bench"/>
+  <symbol minX="1523" maxX="1565" minY="926" maxY="959" name="subway-london-s"/>
+  <symbol minX="1565" maxX="1598" minY="926" maxY="959" name="viator-star-m"/>
+  <symbol minX="1598" maxX="1631" minY="926" maxY="959" name="subway-rome-s"/>
+  <symbol minX="1631" maxX="1664" minY="926" maxY="959" name="subway-berlin-s"/>
+  <symbol minX="1664" maxX="1713" minY="926" maxY="957" name="railway-crossing-l"/>
+  <symbol minX="1713" maxX="1744" minY="926" maxY="957" name="motorcycle-parking-s"/>
+  <symbol minX="1744" maxX="1775" minY="926" maxY="957" name="bike-parking-s"/>
+  <symbol minX="1775" maxX="1806" minY="926" maxY="957" name="survey_point-l"/>
+  <symbol minX="1806" maxX="1837" minY="926" maxY="957" name="subway-xs"/>
+  <symbol minX="1837" maxX="1868" minY="926" maxY="957" name="train-xs"/>
+  <symbol minX="1868" maxX="1899" minY="926" maxY="957" name="parking_pay-s"/>
+  <symbol minX="1899" maxX="1955" minY="926" maxY="957" name="subway-minsk-l"/>
+  <symbol minX="1955" maxX="1986" minY="926" maxY="957" name="star-l"/>
+  <symbol minX="1986" maxX="2017" minY="926" maxY="957" name="speedcam-s"/>
+  <symbol minX="2017" maxX="2048" minY="926" maxY="957" name="subway-newyork-xs"/>
+  <symbol minX="0" maxX="31" minY="966" maxY="997" name="parking-s"/>
+  <symbol minX="31" maxX="78" minY="966" maxY="995" name="subway-kiev-s"/>
+  <symbol minX="78" maxX="107" minY="966" maxY="995" name="viator-star-s"/>
+  <symbol minX="107" maxX="136" minY="966" maxY="995" name="star-m"/>
+  <symbol minX="136" maxX="178" minY="966" maxY="993" name="railway-crossing"/>
+  <symbol minX="178" maxX="207" minY="966" maxY="993" name="peakt-m"/>
+  <symbol minX="207" maxX="234" minY="966" maxY="993" name="survey_point-m"/>
+  <symbol minX="234" maxX="281" minY="966" maxY="993" name="subway-minsk-m"/>
+  <symbol minX="281" maxX="323" minY="966" maxY="990" name="subway-minsk-s"/>
+  <symbol minX="323" maxX="347" minY="966" maxY="990" name="star-s"/>
+  <symbol minX="347" maxX="371" minY="966" maxY="990" name="crossing-l"/>
+  <symbol minX="371" maxX="422" minY="966" maxY="988" name="arrow-m"/>
+  <symbol minX="422" maxX="446" minY="966" maxY="988" name="peakt-s"/>
+  <symbol minX="446" maxX="468" minY="966" maxY="988" name="survey_point-s"/>
+  <symbol minX="468" maxX="488" minY="966" maxY="986" name="zero-icon"/>
+  <symbol minX="488" maxX="508" minY="966" maxY="986" name="crossing-m"/>
+  <symbol minX="508" maxX="528" minY="966" maxY="986" name="entrance-s"/>
+  <symbol minX="528" maxX="543" minY="966" maxY="981" name="cities-m"/>
+  <symbol minX="543" maxX="558" minY="966" maxY="981" name="crossing-s"/>
+  <symbol minX="558" maxX="573" minY="966" maxY="981" name="dot-m"/>
+  <symbol minX="573" maxX="611" minY="966" maxY="981" name="arrow-s"/>
+  <symbol minX="611" maxX="624" minY="966" maxY="979" name="entrance-xs"/>
+  <symbol minX="624" maxX="635" minY="966" maxY="977" name="cities-s"/>
+  <symbol minX="635" maxX="659" minY="966" maxY="977" name="arrow-xs"/>
+  <symbol minX="659" maxX="670" minY="966" maxY="977" name="dot-s"/>
+  <symbol minX="670" maxX="681" minY="966" maxY="977" name="cities-xs"/>
  </file>
 </root>
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 2d3316a1f7..f248c89b59 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index 71e13da982..ce12d86ef0 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -462,10 +462,10 @@
   <symbol minX="160" maxX="200" minY="806" maxY="846" name="marketplace-s"/>
   <symbol minX="200" maxX="240" minY="806" maxY="846" name="prison-s"/>
   <symbol minX="240" maxX="280" minY="806" maxY="846" name="mail-s"/>
-  <symbol minX="280" maxX="320" minY="806" maxY="846" name="beer-s"/>
+  <symbol minX="280" maxX="320" minY="806" maxY="846" name="archery-s"/>
   <symbol minX="320" maxX="360" minY="806" maxY="846" name="public-building-s"/>
-  <symbol minX="360" maxX="400" minY="806" maxY="846" name="atm-s"/>
-  <symbol minX="400" maxX="440" minY="806" maxY="846" name="non-found-search-result"/>
+  <symbol minX="360" maxX="400" minY="806" maxY="846" name="beauty-s"/>
+  <symbol minX="400" maxX="440" minY="806" maxY="846" name="beer-s"/>
   <symbol minX="440" maxX="480" minY="806" maxY="846" name="australian-football-s"/>
   <symbol minX="480" maxX="520" minY="806" maxY="846" name="monument-s"/>
   <symbol minX="520" maxX="560" minY="806" maxY="846" name="lighthouse-s"/>
@@ -513,7 +513,7 @@
   <symbol minX="160" maxX="200" minY="846" maxY="886" name="soccer-s"/>
   <symbol minX="200" maxX="240" minY="846" maxY="886" name="garden_center-s"/>
   <symbol minX="240" maxX="280" minY="846" maxY="886" name="police-s"/>
-  <symbol minX="280" maxX="320" minY="846" maxY="886" name="bicycle-s"/>
+  <symbol minX="280" maxX="320" minY="846" maxY="886" name="atm-s"/>
   <symbol minX="320" maxX="360" minY="846" maxY="886" name="garden-s"/>
   <symbol minX="360" maxX="400" minY="846" maxY="886" name="gallery-s"/>
   <symbol minX="400" maxX="440" minY="846" maxY="886" name="furniture-s"/>
@@ -521,54 +521,54 @@
   <symbol minX="480" maxX="520" minY="846" maxY="886" name="funicular-s"/>
   <symbol minX="520" maxX="560" minY="846" maxY="886" name="funeral_directors-s"/>
   <symbol minX="560" maxX="600" minY="846" maxY="886" name="stadium-s"/>
-  <symbol minX="600" maxX="640" minY="846" maxY="886" name="zoo-s"/>
-  <symbol minX="640" maxX="680" minY="846" maxY="886" name="petshop-s"/>
+  <symbol minX="600" maxX="640" minY="846" maxY="886" name="non-found-search-result"/>
+  <symbol minX="640" maxX="680" minY="846" maxY="886" name="bicycle-s"/>
   <symbol minX="680" maxX="720" minY="846" maxY="886" name="airport-s"/>
   <symbol minX="720" maxX="760" minY="846" maxY="886" name="fuel-s"/>
   <symbol minX="760" maxX="800" minY="846" maxY="886" name="fountain-s"/>
   <symbol minX="800" maxX="840" minY="846" maxY="886" name="stationery_shop-s"/>
-  <symbol minX="840" maxX="880" minY="846" maxY="886" name="beauty-s"/>
+  <symbol minX="840" maxX="880" minY="846" maxY="886" name="zoo-s"/>
   <symbol minX="880" maxX="920" minY="846" maxY="886" name="motorcycle_shop-s"/>
   <symbol minX="920" maxX="960" minY="846" maxY="886" name="place-of-worship-s"/>
   <symbol minX="960" maxX="1000" minY="846" maxY="886" name="museum-s"/>
   <symbol minX="1000" maxX="1040" minY="846" maxY="886" name="music-s"/>
-  <symbol minX="1040" maxX="1080" minY="846" maxY="886" name="windmill-s"/>
+  <symbol minX="1040" maxX="1080" minY="846" maxY="886" name="petshop-s"/>
   <symbol minX="1080" maxX="1120" minY="846" maxY="886" name="florist-s"/>
   <symbol minX="1120" maxX="1160" minY="846" maxY="886" name="pitch-s"/>
   <symbol minX="1160" maxX="1200" minY="846" maxY="886" name="subway-entrance-s"/>
-  <symbol minX="1200" maxX="1240" minY="846" maxY="886" name="book-shop-s"/>
-  <symbol minX="1240" maxX="1280" minY="846" maxY="886" name="bookmaker-s"/>
-  <symbol minX="1280" maxX="1320" minY="846" maxY="886" name="wayside_shrine-s"/>
+  <symbol minX="1200" maxX="1240" minY="846" maxY="886" name="beach-s"/>
+  <symbol minX="1240" maxX="1280" minY="846" maxY="886" name="windmill-s"/>
+  <symbol minX="1280" maxX="1320" minY="846" maxY="886" name="book-shop-s"/>
   <symbol minX="1320" maxX="1360" minY="846" maxY="886" name="firehydrant-s"/>
   <symbol minX="1360" maxX="1400" minY="846" maxY="886" name="muslim-s"/>
   <symbol minX="1400" maxX="1440" minY="846" maxY="886" name="newsagent-s"/>
-  <symbol minX="1440" maxX="1480" minY="846" maxY="886" name="bowls-s"/>
+  <symbol minX="1440" maxX="1480" minY="846" maxY="886" name="bookmaker-s"/>
   <symbol minX="1480" maxX="1520" minY="846" maxY="886" name="fire_station-s"/>
   <symbol minX="1520" maxX="1560" minY="846" maxY="886" name="picnic_table-s"/>
   <symbol minX="1560" maxX="1600" minY="846" maxY="886" name="npark-s"/>
-  <symbol minX="1600" maxX="1640" minY="846" maxY="886" name="buddhist-s"/>
-  <symbol minX="1640" maxX="1680" minY="846" maxY="886" name="waterfall-s"/>
+  <symbol minX="1600" maxX="1640" minY="846" maxY="886" name="wayside_shrine-s"/>
+  <symbol minX="1640" maxX="1680" minY="846" maxY="886" name="bowls-s"/>
   <symbol minX="1680" maxX="1720" minY="846" maxY="886" name="bakery-s"/>
   <symbol minX="1720" maxX="1760" minY="846" maxY="886" name="erotic-s"/>
   <symbol minX="1760" maxX="1800" minY="846" maxY="886" name="nparkf-s"/>
   <symbol minX="1800" maxX="1840" minY="846" maxY="886" name="picnic-s"/>
-  <symbol minX="1840" maxX="1880" minY="846" maxY="886" name="bus-s"/>
+  <symbol minX="1840" maxX="1880" minY="846" maxY="886" name="buddhist-s"/>
   <symbol minX="1880" maxX="1920" minY="846" maxY="886" name="fastfood-s"/>
   <symbol minX="1920" maxX="1960" minY="846" maxY="886" name="lift_gate-s"/>
   <symbol minX="1960" maxX="2000" minY="846" maxY="886" name="subway-newyork-s"/>
-  <symbol minX="2000" maxX="2040" minY="846" maxY="886" name="butcher-s"/>
+  <symbol minX="2000" maxX="2040" minY="846" maxY="886" name="waterfall-s"/>
   <symbol minX="0" maxX="40" minY="886" maxY="926" name="equestrian-s"/>
   <symbol minX="40" maxX="80" minY="886" maxY="926" name="office-s"/>
-  <symbol minX="80" maxX="120" minY="886" maxY="926" name="archery-s"/>
+  <symbol minX="80" maxX="120" minY="886" maxY="926" name="bus-s"/>
   <symbol minX="120" maxX="160" minY="886" maxY="926" name="optician-s"/>
   <symbol minX="160" maxX="200" minY="886" maxY="926" name="photo-shop-s"/>
-  <symbol minX="200" maxX="240" minY="886" maxY="926" name="waste-basket-s"/>
+  <symbol minX="200" maxX="240" minY="886" maxY="926" name="butcher-s"/>
   <symbol minX="240" maxX="280" minY="886" maxY="926" name="subway-s"/>
   <symbol minX="280" maxX="320" minY="886" maxY="926" name="bank-s"/>
   <symbol minX="320" maxX="360" minY="886" maxY="926" name="outdoor-shop-s"/>
   <symbol minX="360" maxX="400" minY="886" maxY="926" name="park-s"/>
-  <symbol minX="400" maxX="440" minY="886" maxY="926" name="cable-car-s"/>
-  <symbol minX="440" maxX="480" minY="886" maxY="926" name="cafe-s"/>
+  <symbol minX="400" maxX="440" minY="886" maxY="926" name="waste-basket-s"/>
+  <symbol minX="440" maxX="480" minY="886" maxY="926" name="cable-car-s"/>
   <symbol minX="480" maxX="520" minY="886" maxY="926" name="alcohol-s"/>
   <symbol minX="520" maxX="560" minY="886" maxY="926" name="banknote-s"/>
   <symbol minX="560" maxX="600" minY="886" maxY="926" name="search-result"/>
@@ -617,7 +617,7 @@
   <symbol minX="240" maxX="280" minY="926" maxY="966" name="chemist-s"/>
   <symbol minX="280" maxX="320" minY="926" maxY="966" name="charging-station-s"/>
   <symbol minX="320" maxX="360" minY="926" maxY="966" name="train-s"/>
-  <symbol minX="360" maxX="400" minY="926" maxY="966" name="pharmacy-s"/>
+  <symbol minX="360" maxX="400" minY="926" maxY="966" name="cafe-s"/>
   <symbol minX="400" maxX="440" minY="926" maxY="966" name="cemetery-s"/>
   <symbol minX="440" maxX="480" minY="926" maxY="966" name="phone-s"/>
   <symbol minX="480" maxX="520" minY="926" maxY="966" name="tram-s"/>
@@ -630,62 +630,62 @@
   <symbol minX="760" maxX="800" minY="926" maxY="966" name="car_sharing-s"/>
   <symbol minX="800" maxX="840" minY="926" maxY="966" name="car-wash-s"/>
   <symbol minX="840" maxX="880" minY="926" maxY="966" name="veterinary-s"/>
-  <symbol minX="880" maxX="920" minY="926" maxY="966" name="campsite-s"/>
-  <symbol minX="920" maxX="960" minY="926" maxY="966" name="viewpoint-s"/>
-  <symbol minX="960" maxX="1000" minY="926" maxY="966" name="beach-s"/>
+  <symbol minX="880" maxX="920" minY="926" maxY="966" name="pharmacy-s"/>
+  <symbol minX="920" maxX="960" minY="926" maxY="966" name="campsite-s"/>
+  <symbol minX="960" maxX="1000" minY="926" maxY="966" name="viewpoint-s"/>
   <symbol minX="1000" maxX="1040" minY="926" maxY="966" name="car-repair-s"/>
   <symbol minX="1040" maxX="1080" minY="926" maxY="966" name="car-part-s"/>
   <symbol minX="1080" maxX="1138" minY="926" maxY="965" name="railway-crossing-xl"/>
-  <symbol minX="1138" maxX="1176" minY="926" maxY="964" name="subway-paris-s"/>
-  <symbol minX="1176" maxX="1214" minY="926" maxY="964" name="peakt-l"/>
-  <symbol minX="1214" maxX="1252" minY="926" maxY="964" name="lightrail-berlin-s"/>
-  <symbol minX="1252" maxX="1303" minY="926" maxY="964" name="subway-madrid-s"/>
-  <symbol minX="1303" maxX="1359" minY="926" maxY="964" name="subway-kiev-l"/>
-  <symbol minX="1359" maxX="1397" minY="926" maxY="964" name="api-result"/>
-  <symbol minX="1397" maxX="1453" minY="926" maxY="964" name="subway-kiev-m"/>
-  <symbol minX="1453" maxX="1489" minY="926" maxY="962" name="subway-moscow-s"/>
-  <symbol minX="1489" maxX="1522" minY="926" maxY="959" name="subway-rome-s"/>
-  <symbol minX="1522" maxX="1560" minY="926" maxY="959" name="bench"/>
-  <symbol minX="1560" maxX="1602" minY="926" maxY="959" name="subway-london-s"/>
-  <symbol minX="1602" maxX="1635" minY="926" maxY="959" name="subway-berlin-s"/>
-  <symbol minX="1635" maxX="1666" minY="926" maxY="957" name="train-xs"/>
-  <symbol minX="1666" maxX="1697" minY="926" maxY="957" name="viator-star-l"/>
-  <symbol minX="1697" maxX="1728" minY="926" maxY="957" name="parking-s"/>
-  <symbol minX="1728" maxX="1759" minY="926" maxY="957" name="motorcycle-parking-s"/>
-  <symbol minX="1759" maxX="1790" minY="926" maxY="957" name="bike-parking-s"/>
-  <symbol minX="1790" maxX="1821" minY="926" maxY="957" name="survey_point-l"/>
-  <symbol minX="1821" maxX="1852" minY="926" maxY="957" name="star-l"/>
-  <symbol minX="1852" maxX="1908" minY="926" maxY="957" name="subway-minsk-l"/>
-  <symbol minX="1908" maxX="1939" minY="926" maxY="957" name="parking_pay-s"/>
-  <symbol minX="1939" maxX="1970" minY="926" maxY="957" name="speedcam-s"/>
-  <symbol minX="1970" maxX="2001" minY="926" maxY="957" name="subway-newyork-xs"/>
-  <symbol minX="2001" maxX="2032" minY="926" maxY="957" name="subway-xs"/>
-  <symbol minX="0" maxX="49" minY="966" maxY="997" name="railway-crossing-l"/>
-  <symbol minX="49" maxX="78" minY="966" maxY="995" name="star-m"/>
-  <symbol minX="78" maxX="125" minY="966" maxY="995" name="subway-kiev-s"/>
-  <symbol minX="125" maxX="154" minY="966" maxY="995" name="viator-star-m"/>
-  <symbol minX="154" maxX="183" minY="966" maxY="993" name="peakt-m"/>
-  <symbol minX="183" maxX="210" minY="966" maxY="993" name="survey_point-m"/>
-  <symbol minX="210" maxX="252" minY="966" maxY="993" name="railway-crossing"/>
-  <symbol minX="252" maxX="299" minY="966" maxY="993" name="subway-minsk-m"/>
-  <symbol minX="299" maxX="323" minY="966" maxY="990" name="viator-star-s"/>
-  <symbol minX="323" maxX="347" minY="966" maxY="990" name="star-s"/>
-  <symbol minX="347" maxX="389" minY="966" maxY="990" name="subway-minsk-s"/>
-  <symbol minX="389" maxX="413" minY="966" maxY="990" name="crossing-l"/>
-  <symbol minX="413" maxX="437" minY="966" maxY="988" name="peakt-s"/>
-  <symbol minX="437" maxX="488" minY="966" maxY="988" name="arrow-m"/>
-  <symbol minX="488" maxX="510" minY="966" maxY="988" name="survey_point-s"/>
-  <symbol minX="510" maxX="530" minY="966" maxY="986" name="entrance-s"/>
+  <symbol minX="1138" maxX="1176" minY="926" maxY="964" name="lightrail-berlin-s"/>
+  <symbol minX="1176" maxX="1232" minY="926" maxY="964" name="subway-kiev-l"/>
+  <symbol minX="1232" maxX="1288" minY="926" maxY="964" name="subway-kiev-m"/>
+  <symbol minX="1288" maxX="1326" minY="926" maxY="964" name="peakt-l"/>
+  <symbol minX="1326" maxX="1364" minY="926" maxY="964" name="api-result"/>
+  <symbol minX="1364" maxX="1415" minY="926" maxY="964" name="subway-madrid-s"/>
+  <symbol minX="1415" maxX="1453" minY="926" maxY="964" name="subway-paris-s"/>
+  <symbol minX="1453" maxX="1489" minY="926" maxY="962" name="viator-star-l"/>
+  <symbol minX="1489" maxX="1525" minY="926" maxY="962" name="subway-moscow-s"/>
+  <symbol minX="1525" maxX="1563" minY="926" maxY="959" name="bench"/>
+  <symbol minX="1563" maxX="1596" minY="926" maxY="959" name="subway-berlin-s"/>
+  <symbol minX="1596" maxX="1629" minY="926" maxY="959" name="subway-rome-s"/>
+  <symbol minX="1629" maxX="1671" minY="926" maxY="959" name="subway-london-s"/>
+  <symbol minX="1671" maxX="1704" minY="926" maxY="959" name="viator-star-m"/>
+  <symbol minX="1704" maxX="1735" minY="926" maxY="957" name="motorcycle-parking-s"/>
+  <symbol minX="1735" maxX="1766" minY="926" maxY="957" name="subway-xs"/>
+  <symbol minX="1766" maxX="1797" minY="926" maxY="957" name="bike-parking-s"/>
+  <symbol minX="1797" maxX="1853" minY="926" maxY="957" name="subway-minsk-l"/>
+  <symbol minX="1853" maxX="1902" minY="926" maxY="957" name="railway-crossing-l"/>
+  <symbol minX="1902" maxX="1933" minY="926" maxY="957" name="survey_point-l"/>
+  <symbol minX="1933" maxX="1964" minY="926" maxY="957" name="parking_pay-s"/>
+  <symbol minX="1964" maxX="1995" minY="926" maxY="957" name="parking-s"/>
+  <symbol minX="1995" maxX="2026" minY="926" maxY="957" name="train-xs"/>
+  <symbol minX="0" maxX="31" minY="966" maxY="997" name="star-l"/>
+  <symbol minX="31" maxX="62" minY="966" maxY="997" name="speedcam-s"/>
+  <symbol minX="62" maxX="93" minY="966" maxY="997" name="subway-newyork-xs"/>
+  <symbol minX="93" maxX="122" minY="966" maxY="995" name="star-m"/>
+  <symbol minX="122" maxX="169" minY="966" maxY="995" name="subway-kiev-s"/>
+  <symbol minX="169" maxX="198" minY="966" maxY="995" name="viator-star-s"/>
+  <symbol minX="198" maxX="227" minY="966" maxY="993" name="peakt-m"/>
+  <symbol minX="227" maxX="269" minY="966" maxY="993" name="railway-crossing"/>
+  <symbol minX="269" maxX="296" minY="966" maxY="993" name="survey_point-m"/>
+  <symbol minX="296" maxX="343" minY="966" maxY="993" name="subway-minsk-m"/>
+  <symbol minX="343" maxX="367" minY="966" maxY="990" name="crossing-l"/>
+  <symbol minX="367" maxX="391" minY="966" maxY="990" name="star-s"/>
+  <symbol minX="391" maxX="433" minY="966" maxY="990" name="subway-minsk-s"/>
+  <symbol minX="433" maxX="484" minY="966" maxY="988" name="arrow-m"/>
+  <symbol minX="484" maxX="508" minY="966" maxY="988" name="peakt-s"/>
+  <symbol minX="508" maxX="530" minY="966" maxY="988" name="survey_point-s"/>
   <symbol minX="530" maxX="550" minY="966" maxY="986" name="crossing-m"/>
   <symbol minX="550" maxX="570" minY="966" maxY="986" name="zero-icon"/>
-  <symbol minX="570" maxX="585" minY="966" maxY="981" name="dot-m"/>
-  <symbol minX="585" maxX="623" minY="966" maxY="981" name="arrow-s"/>
-  <symbol minX="623" maxX="638" minY="966" maxY="981" name="crossing-s"/>
-  <symbol minX="638" maxX="653" minY="966" maxY="981" name="cities-m"/>
-  <symbol minX="653" maxX="666" minY="966" maxY="979" name="entrance-xs"/>
-  <symbol minX="666" maxX="677" minY="966" maxY="977" name="cities-s"/>
-  <symbol minX="677" maxX="688" minY="966" maxY="977" name="cities-xs"/>
-  <symbol minX="688" maxX="712" minY="966" maxY="977" name="arrow-xs"/>
-  <symbol minX="712" maxX="723" minY="966" maxY="977" name="dot-s"/>
+  <symbol minX="570" maxX="590" minY="966" maxY="986" name="entrance-s"/>
+  <symbol minX="590" maxX="628" minY="966" maxY="981" name="arrow-s"/>
+  <symbol minX="628" maxX="643" minY="966" maxY="981" name="dot-m"/>
+  <symbol minX="643" maxX="658" minY="966" maxY="981" name="crossing-s"/>
+  <symbol minX="658" maxX="673" minY="966" maxY="981" name="cities-m"/>
+  <symbol minX="673" maxX="686" minY="966" maxY="979" name="entrance-xs"/>
+  <symbol minX="686" maxX="697" minY="966" maxY="977" name="cities-s"/>
+  <symbol minX="697" maxX="708" minY="966" maxY="977" name="cities-xs"/>
+  <symbol minX="708" maxX="732" minY="966" maxY="977" name="arrow-xs"/>
+  <symbol minX="732" maxX="743" minY="966" maxY="977" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 2cc0266fd9..f4b4634472 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index f07e186e4f..fd8dec2eca 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -636,55 +636,55 @@
   <symbol minX="946" maxX="968" minY="553" maxY="575" name="christian-s"/>
   <symbol minX="968" maxX="990" minY="553" maxY="575" name="viewpoint-s"/>
   <symbol minX="990" maxX="1018" minY="553" maxY="574" name="subway-madrid-s"/>
-  <symbol minX="0" maxX="30" minY="575" maxY="596" name="subway-kiev-l"/>
-  <symbol minX="30" maxX="51" minY="575" maxY="596" name="subway-paris-s"/>
-  <symbol minX="51" maxX="81" minY="575" maxY="596" name="subway-kiev-m"/>
+  <symbol minX="0" maxX="30" minY="575" maxY="596" name="subway-kiev-m"/>
+  <symbol minX="30" maxX="51" minY="575" maxY="596" name="lightrail-berlin-s"/>
+  <symbol minX="51" maxX="81" minY="575" maxY="596" name="subway-kiev-l"/>
   <symbol minX="81" maxX="112" minY="575" maxY="596" name="railway-crossing-xl"/>
-  <symbol minX="112" maxX="133" minY="575" maxY="596" name="lightrail-berlin-s"/>
-  <symbol minX="133" maxX="154" minY="575" maxY="596" name="peakt-l"/>
+  <symbol minX="112" maxX="133" minY="575" maxY="596" name="peakt-l"/>
+  <symbol minX="133" maxX="154" minY="575" maxY="596" name="subway-paris-s"/>
   <symbol minX="154" maxX="174" minY="575" maxY="595" name="subway-moscow-s"/>
-  <symbol minX="174" maxX="195" minY="575" maxY="594" name="bench"/>
-  <symbol minX="195" maxX="218" minY="575" maxY="594" name="subway-london-s"/>
-  <symbol minX="218" maxX="237" minY="575" maxY="594" name="subway-berlin-s"/>
-  <symbol minX="237" maxX="256" minY="575" maxY="594" name="subway-rome-s"/>
-  <symbol minX="256" maxX="274" minY="575" maxY="593" name="survey_point-l"/>
-  <symbol minX="274" maxX="292" minY="575" maxY="593" name="speedcam-s"/>
-  <symbol minX="292" maxX="310" minY="575" maxY="593" name="viator-star-l"/>
-  <symbol minX="310" maxX="328" minY="575" maxY="593" name="star-l"/>
-  <symbol minX="328" maxX="355" minY="575" maxY="593" name="railway-crossing-l"/>
-  <symbol minX="355" maxX="373" minY="575" maxY="593" name="subway-xs"/>
-  <symbol minX="373" maxX="391" minY="575" maxY="593" name="motorcycle-parking-s"/>
-  <symbol minX="391" maxX="409" minY="575" maxY="593" name="bike-parking-s"/>
-  <symbol minX="409" maxX="427" minY="575" maxY="593" name="subway-newyork-xs"/>
-  <symbol minX="427" maxX="445" minY="575" maxY="593" name="parking-s"/>
-  <symbol minX="445" maxX="463" minY="575" maxY="593" name="train-xs"/>
-  <symbol minX="463" maxX="481" minY="575" maxY="593" name="parking_pay-s"/>
-  <symbol minX="481" maxX="511" minY="575" maxY="593" name="subway-minsk-l"/>
-  <symbol minX="511" maxX="527" minY="575" maxY="591" name="star-m"/>
-  <symbol minX="527" maxX="552" minY="575" maxY="591" name="subway-kiev-s"/>
-  <symbol minX="552" maxX="568" minY="575" maxY="591" name="viator-star-m"/>
-  <symbol minX="568" maxX="593" minY="575" maxY="590" name="subway-minsk-m"/>
-  <symbol minX="593" maxX="616" minY="575" maxY="590" name="railway-crossing"/>
-  <symbol minX="616" maxX="631" minY="575" maxY="590" name="survey_point-m"/>
-  <symbol minX="631" maxX="647" minY="575" maxY="590" name="peakt-m"/>
-  <symbol minX="647" maxX="661" minY="575" maxY="589" name="viator-star-s"/>
-  <symbol minX="661" maxX="684" minY="575" maxY="589" name="subway-minsk-s"/>
-  <symbol minX="684" maxX="698" minY="575" maxY="589" name="crossing-l"/>
-  <symbol minX="698" maxX="712" minY="575" maxY="589" name="star-s"/>
-  <symbol minX="712" maxX="740" minY="575" maxY="588" name="arrow-m"/>
-  <symbol minX="740" maxX="753" minY="575" maxY="588" name="survey_point-s"/>
-  <symbol minX="753" maxX="767" minY="575" maxY="588" name="peakt-s"/>
-  <symbol minX="767" maxX="779" minY="575" maxY="587" name="zero-icon"/>
-  <symbol minX="779" maxX="791" minY="575" maxY="587" name="entrance-s"/>
-  <symbol minX="791" maxX="803" minY="575" maxY="587" name="crossing-m"/>
-  <symbol minX="803" maxX="824" minY="575" maxY="585" name="arrow-s"/>
-  <symbol minX="824" maxX="834" minY="575" maxY="585" name="crossing-s"/>
-  <symbol minX="834" maxX="844" minY="575" maxY="585" name="cities-m"/>
-  <symbol minX="844" maxX="854" minY="575" maxY="585" name="dot-m"/>
-  <symbol minX="854" maxX="863" minY="575" maxY="584" name="entrance-xs"/>
-  <symbol minX="863" maxX="877" minY="575" maxY="582" name="arrow-xs"/>
-  <symbol minX="877" maxX="884" minY="575" maxY="582" name="cities-s"/>
-  <symbol minX="884" maxX="891" minY="575" maxY="582" name="dot-s"/>
+  <symbol minX="174" maxX="194" minY="575" maxY="595" name="viator-star-l"/>
+  <symbol minX="194" maxX="213" minY="575" maxY="594" name="subway-berlin-s"/>
+  <symbol minX="213" maxX="232" minY="575" maxY="594" name="subway-rome-s"/>
+  <symbol minX="232" maxX="251" minY="575" maxY="594" name="viator-star-m"/>
+  <symbol minX="251" maxX="274" minY="575" maxY="594" name="subway-london-s"/>
+  <symbol minX="274" maxX="295" minY="575" maxY="594" name="bench"/>
+  <symbol minX="295" maxX="313" minY="575" maxY="593" name="parking_pay-s"/>
+  <symbol minX="313" maxX="331" minY="575" maxY="593" name="motorcycle-parking-s"/>
+  <symbol minX="331" maxX="349" minY="575" maxY="593" name="survey_point-l"/>
+  <symbol minX="349" maxX="367" minY="575" maxY="593" name="subway-xs"/>
+  <symbol minX="367" maxX="385" minY="575" maxY="593" name="star-l"/>
+  <symbol minX="385" maxX="403" minY="575" maxY="593" name="train-xs"/>
+  <symbol minX="403" maxX="421" minY="575" maxY="593" name="subway-newyork-xs"/>
+  <symbol minX="421" maxX="448" minY="575" maxY="593" name="railway-crossing-l"/>
+  <symbol minX="448" maxX="466" minY="575" maxY="593" name="speedcam-s"/>
+  <symbol minX="466" maxX="484" minY="575" maxY="593" name="bike-parking-s"/>
+  <symbol minX="484" maxX="514" minY="575" maxY="593" name="subway-minsk-l"/>
+  <symbol minX="514" maxX="532" minY="575" maxY="593" name="parking-s"/>
+  <symbol minX="532" maxX="548" minY="575" maxY="591" name="viator-star-s"/>
+  <symbol minX="548" maxX="573" minY="575" maxY="591" name="subway-kiev-s"/>
+  <symbol minX="573" maxX="589" minY="575" maxY="591" name="star-m"/>
+  <symbol minX="589" maxX="614" minY="575" maxY="590" name="subway-minsk-m"/>
+  <symbol minX="614" maxX="637" minY="575" maxY="590" name="railway-crossing"/>
+  <symbol minX="637" maxX="653" minY="575" maxY="590" name="peakt-m"/>
+  <symbol minX="653" maxX="668" minY="575" maxY="590" name="survey_point-m"/>
+  <symbol minX="668" maxX="691" minY="575" maxY="589" name="subway-minsk-s"/>
+  <symbol minX="691" maxX="705" minY="575" maxY="589" name="crossing-l"/>
+  <symbol minX="705" maxX="719" minY="575" maxY="589" name="star-s"/>
+  <symbol minX="719" maxX="732" minY="575" maxY="588" name="survey_point-s"/>
+  <symbol minX="732" maxX="746" minY="575" maxY="588" name="peakt-s"/>
+  <symbol minX="746" maxX="774" minY="575" maxY="588" name="arrow-m"/>
+  <symbol minX="774" maxX="786" minY="575" maxY="587" name="zero-icon"/>
+  <symbol minX="786" maxX="798" minY="575" maxY="587" name="entrance-s"/>
+  <symbol minX="798" maxX="810" minY="575" maxY="587" name="crossing-m"/>
+  <symbol minX="810" maxX="820" minY="575" maxY="585" name="crossing-s"/>
+  <symbol minX="820" maxX="830" minY="575" maxY="585" name="cities-m"/>
+  <symbol minX="830" maxX="851" minY="575" maxY="585" name="arrow-s"/>
+  <symbol minX="851" maxX="861" minY="575" maxY="585" name="dot-m"/>
+  <symbol minX="861" maxX="870" minY="575" maxY="584" name="entrance-xs"/>
+  <symbol minX="870" maxX="884" minY="575" maxY="582" name="arrow-xs"/>
+  <symbol minX="884" maxX="891" minY="575" maxY="582" name="cities-s"/>
   <symbol minX="891" maxX="898" minY="575" maxY="582" name="cities-xs"/>
+  <symbol minX="898" maxX="905" minY="575" maxY="582" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 2af411d42b..c4d39cf71c 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index cd2d0dc47f..c6d35af783 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -637,55 +637,55 @@
   <symbol minX="990" maxX="1012" minY="553" maxY="575" name="christian-s"/>
   <symbol minX="0" maxX="22" minY="575" maxY="597" name="viewpoint-s"/>
   <symbol minX="22" maxX="50" minY="575" maxY="596" name="subway-madrid-s"/>
-  <symbol minX="50" maxX="80" minY="575" maxY="596" name="subway-kiev-l"/>
-  <symbol minX="80" maxX="101" minY="575" maxY="596" name="subway-paris-s"/>
-  <symbol minX="101" maxX="131" minY="575" maxY="596" name="subway-kiev-m"/>
+  <symbol minX="50" maxX="80" minY="575" maxY="596" name="subway-kiev-m"/>
+  <symbol minX="80" maxX="101" minY="575" maxY="596" name="lightrail-berlin-s"/>
+  <symbol minX="101" maxX="131" minY="575" maxY="596" name="subway-kiev-l"/>
   <symbol minX="131" maxX="162" minY="575" maxY="596" name="railway-crossing-xl"/>
-  <symbol minX="162" maxX="183" minY="575" maxY="596" name="lightrail-berlin-s"/>
-  <symbol minX="183" maxX="204" minY="575" maxY="596" name="peakt-l"/>
+  <symbol minX="162" maxX="183" minY="575" maxY="596" name="peakt-l"/>
+  <symbol minX="183" maxX="204" minY="575" maxY="596" name="subway-paris-s"/>
   <symbol minX="204" maxX="224" minY="575" maxY="595" name="subway-moscow-s"/>
-  <symbol minX="224" maxX="245" minY="575" maxY="594" name="bench"/>
-  <symbol minX="245" maxX="268" minY="575" maxY="594" name="subway-london-s"/>
-  <symbol minX="268" maxX="287" minY="575" maxY="594" name="subway-berlin-s"/>
-  <symbol minX="287" maxX="306" minY="575" maxY="594" name="subway-rome-s"/>
-  <symbol minX="306" maxX="324" minY="575" maxY="593" name="survey_point-l"/>
-  <symbol minX="324" maxX="342" minY="575" maxY="593" name="speedcam-s"/>
-  <symbol minX="342" maxX="360" minY="575" maxY="593" name="viator-star-l"/>
-  <symbol minX="360" maxX="378" minY="575" maxY="593" name="star-l"/>
-  <symbol minX="378" maxX="405" minY="575" maxY="593" name="railway-crossing-l"/>
-  <symbol minX="405" maxX="423" minY="575" maxY="593" name="subway-xs"/>
-  <symbol minX="423" maxX="441" minY="575" maxY="593" name="motorcycle-parking-s"/>
-  <symbol minX="441" maxX="459" minY="575" maxY="593" name="bike-parking-s"/>
-  <symbol minX="459" maxX="477" minY="575" maxY="593" name="subway-newyork-xs"/>
-  <symbol minX="477" maxX="495" minY="575" maxY="593" name="parking-s"/>
-  <symbol minX="495" maxX="513" minY="575" maxY="593" name="train-xs"/>
-  <symbol minX="513" maxX="531" minY="575" maxY="593" name="parking_pay-s"/>
-  <symbol minX="531" maxX="561" minY="575" maxY="593" name="subway-minsk-l"/>
-  <symbol minX="561" maxX="577" minY="575" maxY="591" name="star-m"/>
-  <symbol minX="577" maxX="602" minY="575" maxY="591" name="subway-kiev-s"/>
-  <symbol minX="602" maxX="618" minY="575" maxY="591" name="viator-star-m"/>
-  <symbol minX="618" maxX="643" minY="575" maxY="590" name="subway-minsk-m"/>
-  <symbol minX="643" maxX="666" minY="575" maxY="590" name="railway-crossing"/>
-  <symbol minX="666" maxX="681" minY="575" maxY="590" name="survey_point-m"/>
-  <symbol minX="681" maxX="697" minY="575" maxY="590" name="peakt-m"/>
-  <symbol minX="697" maxX="711" minY="575" maxY="589" name="viator-star-s"/>
-  <symbol minX="711" maxX="734" minY="575" maxY="589" name="subway-minsk-s"/>
-  <symbol minX="734" maxX="748" minY="575" maxY="589" name="crossing-l"/>
-  <symbol minX="748" maxX="762" minY="575" maxY="589" name="star-s"/>
-  <symbol minX="762" maxX="790" minY="575" maxY="588" name="arrow-m"/>
-  <symbol minX="790" maxX="803" minY="575" maxY="588" name="survey_point-s"/>
-  <symbol minX="803" maxX="817" minY="575" maxY="588" name="peakt-s"/>
-  <symbol minX="817" maxX="829" minY="575" maxY="587" name="zero-icon"/>
-  <symbol minX="829" maxX="841" minY="575" maxY="587" name="entrance-s"/>
-  <symbol minX="841" maxX="853" minY="575" maxY="587" name="crossing-m"/>
-  <symbol minX="853" maxX="874" minY="575" maxY="585" name="arrow-s"/>
-  <symbol minX="874" maxX="884" minY="575" maxY="585" name="crossing-s"/>
-  <symbol minX="884" maxX="894" minY="575" maxY="585" name="cities-m"/>
-  <symbol minX="894" maxX="904" minY="575" maxY="585" name="dot-m"/>
-  <symbol minX="904" maxX="913" minY="575" maxY="584" name="entrance-xs"/>
-  <symbol minX="913" maxX="927" minY="575" maxY="582" name="arrow-xs"/>
-  <symbol minX="927" maxX="934" minY="575" maxY="582" name="cities-s"/>
-  <symbol minX="934" maxX="941" minY="575" maxY="582" name="dot-s"/>
+  <symbol minX="224" maxX="244" minY="575" maxY="595" name="viator-star-l"/>
+  <symbol minX="244" maxX="263" minY="575" maxY="594" name="subway-berlin-s"/>
+  <symbol minX="263" maxX="282" minY="575" maxY="594" name="subway-rome-s"/>
+  <symbol minX="282" maxX="301" minY="575" maxY="594" name="viator-star-m"/>
+  <symbol minX="301" maxX="324" minY="575" maxY="594" name="subway-london-s"/>
+  <symbol minX="324" maxX="345" minY="575" maxY="594" name="bench"/>
+  <symbol minX="345" maxX="363" minY="575" maxY="593" name="parking_pay-s"/>
+  <symbol minX="363" maxX="381" minY="575" maxY="593" name="motorcycle-parking-s"/>
+  <symbol minX="381" maxX="399" minY="575" maxY="593" name="survey_point-l"/>
+  <symbol minX="399" maxX="417" minY="575" maxY="593" name="subway-xs"/>
+  <symbol minX="417" maxX="435" minY="575" maxY="593" name="star-l"/>
+  <symbol minX="435" maxX="453" minY="575" maxY="593" name="train-xs"/>
+  <symbol minX="453" maxX="471" minY="575" maxY="593" name="subway-newyork-xs"/>
+  <symbol minX="471" maxX="498" minY="575" maxY="593" name="railway-crossing-l"/>
+  <symbol minX="498" maxX="516" minY="575" maxY="593" name="speedcam-s"/>
+  <symbol minX="516" maxX="534" minY="575" maxY="593" name="bike-parking-s"/>
+  <symbol minX="534" maxX="564" minY="575" maxY="593" name="subway-minsk-l"/>
+  <symbol minX="564" maxX="582" minY="575" maxY="593" name="parking-s"/>
+  <symbol minX="582" maxX="598" minY="575" maxY="591" name="viator-star-s"/>
+  <symbol minX="598" maxX="623" minY="575" maxY="591" name="subway-kiev-s"/>
+  <symbol minX="623" maxX="639" minY="575" maxY="591" name="star-m"/>
+  <symbol minX="639" maxX="664" minY="575" maxY="590" name="subway-minsk-m"/>
+  <symbol minX="664" maxX="687" minY="575" maxY="590" name="railway-crossing"/>
+  <symbol minX="687" maxX="703" minY="575" maxY="590" name="peakt-m"/>
+  <symbol minX="703" maxX="718" minY="575" maxY="590" name="survey_point-m"/>
+  <symbol minX="718" maxX="741" minY="575" maxY="589" name="subway-minsk-s"/>
+  <symbol minX="741" maxX="755" minY="575" maxY="589" name="crossing-l"/>
+  <symbol minX="755" maxX="769" minY="575" maxY="589" name="star-s"/>
+  <symbol minX="769" maxX="782" minY="575" maxY="588" name="survey_point-s"/>
+  <symbol minX="782" maxX="796" minY="575" maxY="588" name="peakt-s"/>
+  <symbol minX="796" maxX="824" minY="575" maxY="588" name="arrow-m"/>
+  <symbol minX="824" maxX="836" minY="575" maxY="587" name="zero-icon"/>
+  <symbol minX="836" maxX="848" minY="575" maxY="587" name="entrance-s"/>
+  <symbol minX="848" maxX="860" minY="575" maxY="587" name="crossing-m"/>
+  <symbol minX="860" maxX="870" minY="575" maxY="585" name="crossing-s"/>
+  <symbol minX="870" maxX="880" minY="575" maxY="585" name="cities-m"/>
+  <symbol minX="880" maxX="901" minY="575" maxY="585" name="arrow-s"/>
+  <symbol minX="901" maxX="911" minY="575" maxY="585" name="dot-m"/>
+  <symbol minX="911" maxX="920" minY="575" maxY="584" name="entrance-xs"/>
+  <symbol minX="920" maxX="934" minY="575" maxY="582" name="arrow-xs"/>
+  <symbol minX="934" maxX="941" minY="575" maxY="582" name="cities-s"/>
   <symbol minX="941" maxX="948" minY="575" maxY="582" name="cities-xs"/>
+  <symbol minX="948" maxX="955" minY="575" maxY="582" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index e537f5082b..5524411e7b 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 38314a527f..b3b1bc2b60 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -636,55 +636,55 @@
   <symbol minX="864" maxX="880" minY="278" maxY="294" name="christian-s"/>
   <symbol minX="880" maxX="896" minY="278" maxY="294" name="viewpoint-s"/>
   <symbol minX="896" maxX="916" minY="278" maxY="293" name="subway-madrid-s"/>
-  <symbol minX="916" maxX="937" minY="278" maxY="293" name="subway-kiev-l"/>
-  <symbol minX="937" maxX="952" minY="278" maxY="293" name="subway-moscow-s"/>
-  <symbol minX="952" maxX="967" minY="278" maxY="293" name="subway-paris-s"/>
+  <symbol minX="916" maxX="937" minY="278" maxY="293" name="subway-kiev-m"/>
+  <symbol minX="937" maxX="952" minY="278" maxY="293" name="viator-star-l"/>
+  <symbol minX="952" maxX="967" minY="278" maxY="293" name="subway-moscow-s"/>
   <symbol minX="967" maxX="989" minY="278" maxY="293" name="railway-crossing-xl"/>
-  <symbol minX="989" maxX="1010" minY="278" maxY="293" name="subway-kiev-m"/>
-  <symbol minX="0" maxX="15" minY="294" maxY="309" name="lightrail-berlin-s"/>
-  <symbol minX="15" maxX="30" minY="294" maxY="309" name="peakt-l"/>
-  <symbol minX="30" maxX="45" minY="294" maxY="308" name="bench"/>
-  <symbol minX="45" maxX="62" minY="294" maxY="308" name="subway-london-s"/>
-  <symbol minX="62" maxX="76" minY="294" maxY="308" name="subway-berlin-s"/>
-  <symbol minX="76" maxX="90" minY="294" maxY="308" name="subway-rome-s"/>
-  <symbol minX="90" maxX="103" minY="294" maxY="307" name="train-xs"/>
-  <symbol minX="103" maxX="116" minY="294" maxY="307" name="speedcam-s"/>
-  <symbol minX="116" maxX="129" minY="294" maxY="307" name="subway-newyork-xs"/>
-  <symbol minX="129" maxX="142" minY="294" maxY="307" name="star-l"/>
-  <symbol minX="142" maxX="155" minY="294" maxY="307" name="bike-parking-s"/>
-  <symbol minX="155" maxX="168" minY="294" maxY="307" name="subway-xs"/>
-  <symbol minX="168" maxX="181" minY="294" maxY="307" name="motorcycle-parking-s"/>
-  <symbol minX="181" maxX="200" minY="294" maxY="307" name="railway-crossing-l"/>
-  <symbol minX="200" maxX="213" minY="294" maxY="307" name="survey_point-l"/>
-  <symbol minX="213" maxX="226" minY="294" maxY="307" name="viator-star-l"/>
-  <symbol minX="226" maxX="239" minY="294" maxY="307" name="parking_pay-s"/>
-  <symbol minX="239" maxX="252" minY="294" maxY="307" name="parking-s"/>
-  <symbol minX="252" maxX="273" minY="294" maxY="307" name="subway-minsk-l"/>
-  <symbol minX="273" maxX="291" minY="294" maxY="306" name="subway-minsk-m"/>
-  <symbol minX="291" maxX="303" minY="294" maxY="306" name="star-m"/>
-  <symbol minX="303" maxX="320" minY="294" maxY="306" name="railway-crossing"/>
-  <symbol minX="320" maxX="338" minY="294" maxY="306" name="subway-kiev-s"/>
-  <symbol minX="338" maxX="350" minY="294" maxY="306" name="viator-star-m"/>
-  <symbol minX="350" maxX="362" minY="294" maxY="306" name="survey_point-m"/>
-  <symbol minX="362" maxX="374" minY="294" maxY="306" name="peakt-m"/>
-  <symbol minX="374" maxX="385" minY="294" maxY="305" name="viator-star-s"/>
-  <symbol minX="385" maxX="402" minY="294" maxY="305" name="subway-minsk-s"/>
-  <symbol minX="402" maxX="413" minY="294" maxY="305" name="crossing-l"/>
-  <symbol minX="413" maxX="424" minY="294" maxY="305" name="star-s"/>
-  <symbol minX="424" maxX="444" minY="294" maxY="304" name="arrow-m"/>
-  <symbol minX="444" maxX="454" minY="294" maxY="304" name="survey_point-s"/>
-  <symbol minX="454" maxX="465" minY="294" maxY="304" name="peakt-s"/>
-  <symbol minX="465" maxX="474" minY="294" maxY="303" name="zero-icon"/>
-  <symbol minX="474" maxX="483" minY="294" maxY="303" name="entrance-s"/>
-  <symbol minX="483" maxX="492" minY="294" maxY="303" name="crossing-m"/>
-  <symbol minX="492" maxX="507" minY="294" maxY="302" name="arrow-s"/>
-  <symbol minX="507" maxX="515" minY="294" maxY="302" name="crossing-s"/>
-  <symbol minX="515" maxX="523" minY="294" maxY="302" name="cities-m"/>
-  <symbol minX="523" maxX="531" minY="294" maxY="302" name="dot-m"/>
-  <symbol minX="531" maxX="538" minY="294" maxY="301" name="entrance-xs"/>
-  <symbol minX="538" maxX="549" minY="294" maxY="300" name="arrow-xs"/>
-  <symbol minX="549" maxX="555" minY="294" maxY="300" name="cities-s"/>
-  <symbol minX="555" maxX="561" minY="294" maxY="300" name="dot-s"/>
-  <symbol minX="561" maxX="567" minY="294" maxY="300" name="cities-xs"/>
+  <symbol minX="989" maxX="1004" minY="278" maxY="293" name="peakt-l"/>
+  <symbol minX="1004" maxX="1019" minY="278" maxY="293" name="subway-paris-s"/>
+  <symbol minX="0" maxX="21" minY="294" maxY="309" name="subway-kiev-l"/>
+  <symbol minX="21" maxX="36" minY="294" maxY="309" name="lightrail-berlin-s"/>
+  <symbol minX="36" maxX="50" minY="294" maxY="308" name="subway-berlin-s"/>
+  <symbol minX="50" maxX="64" minY="294" maxY="308" name="subway-rome-s"/>
+  <symbol minX="64" maxX="78" minY="294" maxY="308" name="viator-star-m"/>
+  <symbol minX="78" maxX="95" minY="294" maxY="308" name="subway-london-s"/>
+  <symbol minX="95" maxX="110" minY="294" maxY="308" name="bench"/>
+  <symbol minX="110" maxX="123" minY="294" maxY="307" name="parking_pay-s"/>
+  <symbol minX="123" maxX="136" minY="294" maxY="307" name="motorcycle-parking-s"/>
+  <symbol minX="136" maxX="149" minY="294" maxY="307" name="survey_point-l"/>
+  <symbol minX="149" maxX="162" minY="294" maxY="307" name="subway-xs"/>
+  <symbol minX="162" maxX="175" minY="294" maxY="307" name="star-l"/>
+  <symbol minX="175" maxX="188" minY="294" maxY="307" name="train-xs"/>
+  <symbol minX="188" maxX="201" minY="294" maxY="307" name="subway-newyork-xs"/>
+  <symbol minX="201" maxX="220" minY="294" maxY="307" name="railway-crossing-l"/>
+  <symbol minX="220" maxX="233" minY="294" maxY="307" name="speedcam-s"/>
+  <symbol minX="233" maxX="246" minY="294" maxY="307" name="bike-parking-s"/>
+  <symbol minX="246" maxX="267" minY="294" maxY="307" name="subway-minsk-l"/>
+  <symbol minX="267" maxX="280" minY="294" maxY="307" name="parking-s"/>
+  <symbol minX="280" maxX="292" minY="294" maxY="306" name="viator-star-s"/>
+  <symbol minX="292" maxX="310" minY="294" maxY="306" name="subway-minsk-m"/>
+  <symbol minX="310" maxX="328" minY="294" maxY="306" name="subway-kiev-s"/>
+  <symbol minX="328" maxX="345" minY="294" maxY="306" name="railway-crossing"/>
+  <symbol minX="345" maxX="357" minY="294" maxY="306" name="peakt-m"/>
+  <symbol minX="357" maxX="369" minY="294" maxY="306" name="survey_point-m"/>
+  <symbol minX="369" maxX="381" minY="294" maxY="306" name="star-m"/>
+  <symbol minX="381" maxX="398" minY="294" maxY="305" name="subway-minsk-s"/>
+  <symbol minX="398" maxX="409" minY="294" maxY="305" name="crossing-l"/>
+  <symbol minX="409" maxX="420" minY="294" maxY="305" name="star-s"/>
+  <symbol minX="420" maxX="430" minY="294" maxY="304" name="survey_point-s"/>
+  <symbol minX="430" maxX="441" minY="294" maxY="304" name="peakt-s"/>
+  <symbol minX="441" maxX="461" minY="294" maxY="304" name="arrow-m"/>
+  <symbol minX="461" maxX="470" minY="294" maxY="303" name="zero-icon"/>
+  <symbol minX="470" maxX="479" minY="294" maxY="303" name="entrance-s"/>
+  <symbol minX="479" maxX="488" minY="294" maxY="303" name="crossing-m"/>
+  <symbol minX="488" maxX="496" minY="294" maxY="302" name="crossing-s"/>
+  <symbol minX="496" maxX="504" minY="294" maxY="302" name="cities-m"/>
+  <symbol minX="504" maxX="519" minY="294" maxY="302" name="arrow-s"/>
+  <symbol minX="519" maxX="527" minY="294" maxY="302" name="dot-m"/>
+  <symbol minX="527" maxX="534" minY="294" maxY="301" name="entrance-xs"/>
+  <symbol minX="534" maxX="545" minY="294" maxY="300" name="arrow-xs"/>
+  <symbol minX="545" maxX="551" minY="294" maxY="300" name="cities-s"/>
+  <symbol minX="551" maxX="557" minY="294" maxY="300" name="cities-xs"/>
+  <symbol minX="557" maxX="563" minY="294" maxY="300" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index be790ece7d..f22e64f1ba 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index 1aed900f8b..4143e351c6 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -637,55 +637,55 @@
   <symbol minX="912" maxX="928" minY="279" maxY="295" name="christian-s"/>
   <symbol minX="928" maxX="944" minY="279" maxY="295" name="viewpoint-s"/>
   <symbol minX="944" maxX="964" minY="279" maxY="294" name="subway-madrid-s"/>
-  <symbol minX="964" maxX="985" minY="279" maxY="294" name="subway-kiev-l"/>
-  <symbol minX="985" maxX="1000" minY="279" maxY="294" name="subway-moscow-s"/>
-  <symbol minX="1000" maxX="1015" minY="279" maxY="294" name="subway-paris-s"/>
+  <symbol minX="964" maxX="985" minY="279" maxY="294" name="subway-kiev-m"/>
+  <symbol minX="985" maxX="1000" minY="279" maxY="294" name="viator-star-l"/>
+  <symbol minX="1000" maxX="1015" minY="279" maxY="294" name="subway-moscow-s"/>
   <symbol minX="0" maxX="22" minY="295" maxY="310" name="railway-crossing-xl"/>
-  <symbol minX="22" maxX="43" minY="295" maxY="310" name="subway-kiev-m"/>
-  <symbol minX="43" maxX="58" minY="295" maxY="310" name="lightrail-berlin-s"/>
-  <symbol minX="58" maxX="73" minY="295" maxY="310" name="peakt-l"/>
-  <symbol minX="73" maxX="88" minY="295" maxY="309" name="bench"/>
-  <symbol minX="88" maxX="105" minY="295" maxY="309" name="subway-london-s"/>
-  <symbol minX="105" maxX="119" minY="295" maxY="309" name="subway-berlin-s"/>
-  <symbol minX="119" maxX="133" minY="295" maxY="309" name="subway-rome-s"/>
-  <symbol minX="133" maxX="146" minY="295" maxY="308" name="train-xs"/>
-  <symbol minX="146" maxX="159" minY="295" maxY="308" name="speedcam-s"/>
-  <symbol minX="159" maxX="172" minY="295" maxY="308" name="subway-newyork-xs"/>
-  <symbol minX="172" maxX="185" minY="295" maxY="308" name="star-l"/>
-  <symbol minX="185" maxX="198" minY="295" maxY="308" name="bike-parking-s"/>
-  <symbol minX="198" maxX="211" minY="295" maxY="308" name="subway-xs"/>
-  <symbol minX="211" maxX="224" minY="295" maxY="308" name="motorcycle-parking-s"/>
-  <symbol minX="224" maxX="243" minY="295" maxY="308" name="railway-crossing-l"/>
-  <symbol minX="243" maxX="256" minY="295" maxY="308" name="survey_point-l"/>
-  <symbol minX="256" maxX="269" minY="295" maxY="308" name="viator-star-l"/>
-  <symbol minX="269" maxX="282" minY="295" maxY="308" name="parking_pay-s"/>
-  <symbol minX="282" maxX="295" minY="295" maxY="308" name="parking-s"/>
-  <symbol minX="295" maxX="316" minY="295" maxY="308" name="subway-minsk-l"/>
-  <symbol minX="316" maxX="334" minY="295" maxY="307" name="subway-minsk-m"/>
-  <symbol minX="334" maxX="346" minY="295" maxY="307" name="star-m"/>
-  <symbol minX="346" maxX="363" minY="295" maxY="307" name="railway-crossing"/>
-  <symbol minX="363" maxX="381" minY="295" maxY="307" name="subway-kiev-s"/>
-  <symbol minX="381" maxX="393" minY="295" maxY="307" name="viator-star-m"/>
-  <symbol minX="393" maxX="405" minY="295" maxY="307" name="survey_point-m"/>
-  <symbol minX="405" maxX="417" minY="295" maxY="307" name="peakt-m"/>
-  <symbol minX="417" maxX="428" minY="295" maxY="306" name="viator-star-s"/>
-  <symbol minX="428" maxX="445" minY="295" maxY="306" name="subway-minsk-s"/>
-  <symbol minX="445" maxX="456" minY="295" maxY="306" name="crossing-l"/>
-  <symbol minX="456" maxX="467" minY="295" maxY="306" name="star-s"/>
-  <symbol minX="467" maxX="487" minY="295" maxY="305" name="arrow-m"/>
-  <symbol minX="487" maxX="497" minY="295" maxY="305" name="survey_point-s"/>
-  <symbol minX="497" maxX="508" minY="295" maxY="305" name="peakt-s"/>
-  <symbol minX="508" maxX="517" minY="295" maxY="304" name="zero-icon"/>
-  <symbol minX="517" maxX="526" minY="295" maxY="304" name="entrance-s"/>
-  <symbol minX="526" maxX="535" minY="295" maxY="304" name="crossing-m"/>
-  <symbol minX="535" maxX="550" minY="295" maxY="303" name="arrow-s"/>
-  <symbol minX="550" maxX="558" minY="295" maxY="303" name="crossing-s"/>
-  <symbol minX="558" maxX="566" minY="295" maxY="303" name="cities-m"/>
-  <symbol minX="566" maxX="574" minY="295" maxY="303" name="dot-m"/>
-  <symbol minX="574" maxX="581" minY="295" maxY="302" name="entrance-xs"/>
-  <symbol minX="581" maxX="592" minY="295" maxY="301" name="arrow-xs"/>
-  <symbol minX="592" maxX="598" minY="295" maxY="301" name="cities-s"/>
-  <symbol minX="598" maxX="604" minY="295" maxY="301" name="dot-s"/>
-  <symbol minX="604" maxX="610" minY="295" maxY="301" name="cities-xs"/>
+  <symbol minX="22" maxX="37" minY="295" maxY="310" name="peakt-l"/>
+  <symbol minX="37" maxX="52" minY="295" maxY="310" name="subway-paris-s"/>
+  <symbol minX="52" maxX="73" minY="295" maxY="310" name="subway-kiev-l"/>
+  <symbol minX="73" maxX="88" minY="295" maxY="310" name="lightrail-berlin-s"/>
+  <symbol minX="88" maxX="102" minY="295" maxY="309" name="subway-berlin-s"/>
+  <symbol minX="102" maxX="116" minY="295" maxY="309" name="subway-rome-s"/>
+  <symbol minX="116" maxX="130" minY="295" maxY="309" name="viator-star-m"/>
+  <symbol minX="130" maxX="147" minY="295" maxY="309" name="subway-london-s"/>
+  <symbol minX="147" maxX="162" minY="295" maxY="309" name="bench"/>
+  <symbol minX="162" maxX="175" minY="295" maxY="308" name="parking_pay-s"/>
+  <symbol minX="175" maxX="188" minY="295" maxY="308" name="motorcycle-parking-s"/>
+  <symbol minX="188" maxX="201" minY="295" maxY="308" name="survey_point-l"/>
+  <symbol minX="201" maxX="214" minY="295" maxY="308" name="subway-xs"/>
+  <symbol minX="214" maxX="227" minY="295" maxY="308" name="star-l"/>
+  <symbol minX="227" maxX="240" minY="295" maxY="308" name="train-xs"/>
+  <symbol minX="240" maxX="253" minY="295" maxY="308" name="subway-newyork-xs"/>
+  <symbol minX="253" maxX="272" minY="295" maxY="308" name="railway-crossing-l"/>
+  <symbol minX="272" maxX="285" minY="295" maxY="308" name="speedcam-s"/>
+  <symbol minX="285" maxX="298" minY="295" maxY="308" name="bike-parking-s"/>
+  <symbol minX="298" maxX="319" minY="295" maxY="308" name="subway-minsk-l"/>
+  <symbol minX="319" maxX="332" minY="295" maxY="308" name="parking-s"/>
+  <symbol minX="332" maxX="344" minY="295" maxY="307" name="viator-star-s"/>
+  <symbol minX="344" maxX="362" minY="295" maxY="307" name="subway-minsk-m"/>
+  <symbol minX="362" maxX="380" minY="295" maxY="307" name="subway-kiev-s"/>
+  <symbol minX="380" maxX="397" minY="295" maxY="307" name="railway-crossing"/>
+  <symbol minX="397" maxX="409" minY="295" maxY="307" name="peakt-m"/>
+  <symbol minX="409" maxX="421" minY="295" maxY="307" name="survey_point-m"/>
+  <symbol minX="421" maxX="433" minY="295" maxY="307" name="star-m"/>
+  <symbol minX="433" maxX="450" minY="295" maxY="306" name="subway-minsk-s"/>
+  <symbol minX="450" maxX="461" minY="295" maxY="306" name="crossing-l"/>
+  <symbol minX="461" maxX="472" minY="295" maxY="306" name="star-s"/>
+  <symbol minX="472" maxX="482" minY="295" maxY="305" name="survey_point-s"/>
+  <symbol minX="482" maxX="493" minY="295" maxY="305" name="peakt-s"/>
+  <symbol minX="493" maxX="513" minY="295" maxY="305" name="arrow-m"/>
+  <symbol minX="513" maxX="522" minY="295" maxY="304" name="zero-icon"/>
+  <symbol minX="522" maxX="531" minY="295" maxY="304" name="entrance-s"/>
+  <symbol minX="531" maxX="540" minY="295" maxY="304" name="crossing-m"/>
+  <symbol minX="540" maxX="548" minY="295" maxY="303" name="crossing-s"/>
+  <symbol minX="548" maxX="556" minY="295" maxY="303" name="cities-m"/>
+  <symbol minX="556" maxX="571" minY="295" maxY="303" name="arrow-s"/>
+  <symbol minX="571" maxX="579" minY="295" maxY="303" name="dot-m"/>
+  <symbol minX="579" maxX="586" minY="295" maxY="302" name="entrance-xs"/>
+  <symbol minX="586" maxX="597" minY="295" maxY="301" name="arrow-xs"/>
+  <symbol minX="597" maxX="603" minY="295" maxY="301" name="cities-s"/>
+  <symbol minX="603" maxX="609" minY="295" maxY="301" name="cities-xs"/>
+  <symbol minX="609" maxX="615" minY="295" maxY="301" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 837ab656c3..304e8ba1ef 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index 4e7fa9fd5f..76d24471b3 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -635,56 +635,56 @@
   <symbol minX="420" maxX="448" minY="935" maxY="963" name="cinema-s"/>
   <symbol minX="448" maxX="476" minY="935" maxY="963" name="christian-s"/>
   <symbol minX="476" maxX="504" minY="935" maxY="963" name="viewpoint-s"/>
-  <symbol minX="504" maxX="543" minY="935" maxY="962" name="subway-kiev-l"/>
-  <symbol minX="543" maxX="570" minY="935" maxY="962" name="peakt-l"/>
-  <symbol minX="570" maxX="597" minY="935" maxY="962" name="lightrail-berlin-s"/>
-  <symbol minX="597" maxX="624" minY="935" maxY="962" name="subway-paris-s"/>
-  <symbol minX="624" maxX="660" minY="935" maxY="962" name="subway-madrid-s"/>
-  <symbol minX="660" maxX="699" minY="935" maxY="962" name="subway-kiev-m"/>
+  <symbol minX="504" maxX="543" minY="935" maxY="962" name="subway-kiev-m"/>
+  <symbol minX="543" maxX="570" minY="935" maxY="962" name="subway-paris-s"/>
+  <symbol minX="570" maxX="606" minY="935" maxY="962" name="subway-madrid-s"/>
+  <symbol minX="606" maxX="633" minY="935" maxY="962" name="peakt-l"/>
+  <symbol minX="633" maxX="660" minY="935" maxY="962" name="lightrail-berlin-s"/>
+  <symbol minX="660" maxX="699" minY="935" maxY="962" name="subway-kiev-l"/>
   <symbol minX="699" maxX="739" minY="935" maxY="961" name="railway-crossing-xl"/>
-  <symbol minX="739" maxX="764" minY="935" maxY="960" name="subway-moscow-s"/>
-  <symbol minX="764" maxX="794" minY="935" maxY="959" name="subway-london-s"/>
-  <symbol minX="794" maxX="821" minY="935" maxY="959" name="bench"/>
-  <symbol minX="821" maxX="845" minY="935" maxY="959" name="subway-berlin-s"/>
-  <symbol minX="845" maxX="869" minY="935" maxY="959" name="subway-rome-s"/>
-  <symbol minX="869" maxX="903" minY="935" maxY="957" name="railway-crossing-l"/>
-  <symbol minX="903" maxX="925" minY="935" maxY="957" name="parking_pay-s"/>
-  <symbol minX="925" maxX="964" minY="935" maxY="957" name="subway-minsk-l"/>
-  <symbol minX="964" maxX="986" minY="935" maxY="957" name="star-l"/>
-  <symbol minX="986" maxX="1008" minY="935" maxY="957" name="speedcam-s"/>
-  <symbol minX="0" maxX="22" minY="963" maxY="985" name="survey_point-l"/>
-  <symbol minX="22" maxX="44" minY="963" maxY="985" name="subway-xs"/>
-  <symbol minX="44" maxX="66" minY="963" maxY="985" name="bike-parking-s"/>
-  <symbol minX="66" maxX="88" minY="963" maxY="985" name="viator-star-l"/>
-  <symbol minX="88" maxX="110" minY="963" maxY="985" name="subway-newyork-xs"/>
-  <symbol minX="110" maxX="132" minY="963" maxY="985" name="train-xs"/>
-  <symbol minX="132" maxX="154" minY="963" maxY="985" name="parking-s"/>
-  <symbol minX="154" maxX="176" minY="963" maxY="985" name="motorcycle-parking-s"/>
-  <symbol minX="176" maxX="209" minY="963" maxY="984" name="subway-kiev-s"/>
-  <symbol minX="209" maxX="230" minY="963" maxY="984" name="viator-star-m"/>
-  <symbol minX="230" maxX="251" minY="963" maxY="984" name="star-m"/>
-  <symbol minX="251" maxX="284" minY="963" maxY="982" name="subway-minsk-m"/>
-  <symbol minX="284" maxX="314" minY="963" maxY="982" name="railway-crossing"/>
-  <symbol minX="314" maxX="335" minY="963" maxY="982" name="peakt-m"/>
-  <symbol minX="335" maxX="354" minY="963" maxY="982" name="survey_point-m"/>
-  <symbol minX="354" maxX="372" minY="963" maxY="981" name="viator-star-s"/>
-  <symbol minX="372" maxX="402" minY="963" maxY="981" name="subway-minsk-s"/>
-  <symbol minX="402" maxX="420" minY="963" maxY="981" name="star-s"/>
-  <symbol minX="420" maxX="438" minY="963" maxY="981" name="crossing-l"/>
-  <symbol minX="438" maxX="474" minY="963" maxY="979" name="arrow-m"/>
-  <symbol minX="474" maxX="490" minY="963" maxY="979" name="survey_point-s"/>
-  <symbol minX="490" maxX="508" minY="963" maxY="979" name="peakt-s"/>
-  <symbol minX="508" maxX="523" minY="963" maxY="978" name="entrance-s"/>
-  <symbol minX="523" maxX="538" minY="963" maxY="978" name="zero-icon"/>
-  <symbol minX="538" maxX="553" minY="963" maxY="978" name="crossing-m"/>
-  <symbol minX="553" maxX="565" minY="963" maxY="975" name="dot-m"/>
-  <symbol minX="565" maxX="577" minY="963" maxY="975" name="cities-m"/>
-  <symbol minX="577" maxX="589" minY="963" maxY="975" name="crossing-s"/>
-  <symbol minX="589" maxX="616" minY="963" maxY="975" name="arrow-s"/>
-  <symbol minX="616" maxX="626" minY="963" maxY="973" name="entrance-xs"/>
-  <symbol minX="626" maxX="635" minY="963" maxY="972" name="dot-s"/>
-  <symbol minX="635" maxX="653" minY="963" maxY="972" name="arrow-xs"/>
-  <symbol minX="653" maxX="662" minY="963" maxY="972" name="cities-xs"/>
-  <symbol minX="662" maxX="671" minY="963" maxY="972" name="cities-s"/>
+  <symbol minX="739" maxX="764" minY="935" maxY="960" name="viator-star-l"/>
+  <symbol minX="764" maxX="789" minY="935" maxY="960" name="subway-moscow-s"/>
+  <symbol minX="789" maxX="819" minY="935" maxY="959" name="subway-london-s"/>
+  <symbol minX="819" maxX="843" minY="935" maxY="959" name="subway-berlin-s"/>
+  <symbol minX="843" maxX="870" minY="935" maxY="959" name="bench"/>
+  <symbol minX="870" maxX="894" minY="935" maxY="959" name="viator-star-m"/>
+  <symbol minX="894" maxX="918" minY="935" maxY="959" name="subway-rome-s"/>
+  <symbol minX="918" maxX="952" minY="935" maxY="957" name="railway-crossing-l"/>
+  <symbol minX="952" maxX="974" minY="935" maxY="957" name="bike-parking-s"/>
+  <symbol minX="974" maxX="996" minY="935" maxY="957" name="star-l"/>
+  <symbol minX="996" maxX="1018" minY="935" maxY="957" name="survey_point-l"/>
+  <symbol minX="0" maxX="22" minY="963" maxY="985" name="subway-xs"/>
+  <symbol minX="22" maxX="61" minY="963" maxY="985" name="subway-minsk-l"/>
+  <symbol minX="61" maxX="83" minY="963" maxY="985" name="train-xs"/>
+  <symbol minX="83" maxX="105" minY="963" maxY="985" name="subway-newyork-xs"/>
+  <symbol minX="105" maxX="127" minY="963" maxY="985" name="speedcam-s"/>
+  <symbol minX="127" maxX="149" minY="963" maxY="985" name="motorcycle-parking-s"/>
+  <symbol minX="149" maxX="171" minY="963" maxY="985" name="parking-s"/>
+  <symbol minX="171" maxX="193" minY="963" maxY="985" name="parking_pay-s"/>
+  <symbol minX="193" maxX="214" minY="963" maxY="984" name="viator-star-s"/>
+  <symbol minX="214" maxX="235" minY="963" maxY="984" name="star-m"/>
+  <symbol minX="235" maxX="268" minY="963" maxY="984" name="subway-kiev-s"/>
+  <symbol minX="268" maxX="301" minY="963" maxY="982" name="subway-minsk-m"/>
+  <symbol minX="301" maxX="320" minY="963" maxY="982" name="survey_point-m"/>
+  <symbol minX="320" maxX="350" minY="963" maxY="982" name="railway-crossing"/>
+  <symbol minX="350" maxX="371" minY="963" maxY="982" name="peakt-m"/>
+  <symbol minX="371" maxX="389" minY="963" maxY="981" name="crossing-l"/>
+  <symbol minX="389" maxX="419" minY="963" maxY="981" name="subway-minsk-s"/>
+  <symbol minX="419" maxX="437" minY="963" maxY="981" name="star-s"/>
+  <symbol minX="437" maxX="453" minY="963" maxY="979" name="survey_point-s"/>
+  <symbol minX="453" maxX="489" minY="963" maxY="979" name="arrow-m"/>
+  <symbol minX="489" maxX="507" minY="963" maxY="979" name="peakt-s"/>
+  <symbol minX="507" maxX="522" minY="963" maxY="978" name="zero-icon"/>
+  <symbol minX="522" maxX="537" minY="963" maxY="978" name="crossing-m"/>
+  <symbol minX="537" maxX="552" minY="963" maxY="978" name="entrance-s"/>
+  <symbol minX="552" maxX="579" minY="963" maxY="975" name="arrow-s"/>
+  <symbol minX="579" maxX="591" minY="963" maxY="975" name="crossing-s"/>
+  <symbol minX="591" maxX="603" minY="963" maxY="975" name="cities-m"/>
+  <symbol minX="603" maxX="615" minY="963" maxY="975" name="dot-m"/>
+  <symbol minX="615" maxX="625" minY="963" maxY="973" name="entrance-xs"/>
+  <symbol minX="625" maxX="634" minY="963" maxY="972" name="dot-s"/>
+  <symbol minX="634" maxX="643" minY="963" maxY="972" name="cities-s"/>
+  <symbol minX="643" maxX="661" minY="963" maxY="972" name="arrow-xs"/>
+  <symbol minX="661" maxX="670" minY="963" maxY="972" name="cities-xs"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index f981dc2320..fb9cad3e51 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index a12db45743..5a63fc0500 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -637,55 +637,55 @@
   <symbol minX="476" maxX="504" minY="935" maxY="963" name="christian-s"/>
   <symbol minX="504" maxX="532" minY="935" maxY="963" name="viewpoint-s"/>
   <symbol minX="532" maxX="572" minY="935" maxY="962" name="railway-crossing-xl"/>
-  <symbol minX="572" maxX="599" minY="935" maxY="962" name="peakt-l"/>
-  <symbol minX="599" maxX="626" minY="935" maxY="962" name="lightrail-berlin-s"/>
-  <symbol minX="626" maxX="653" minY="935" maxY="962" name="subway-paris-s"/>
-  <symbol minX="653" maxX="692" minY="935" maxY="962" name="subway-kiev-l"/>
-  <symbol minX="692" maxX="731" minY="935" maxY="962" name="subway-kiev-m"/>
-  <symbol minX="731" maxX="767" minY="935" maxY="962" name="subway-madrid-s"/>
-  <symbol minX="767" maxX="792" minY="935" maxY="960" name="subway-moscow-s"/>
-  <symbol minX="792" maxX="822" minY="935" maxY="959" name="subway-london-s"/>
-  <symbol minX="822" maxX="849" minY="935" maxY="959" name="bench"/>
-  <symbol minX="849" maxX="873" minY="935" maxY="959" name="subway-berlin-s"/>
-  <symbol minX="873" maxX="897" minY="935" maxY="959" name="subway-rome-s"/>
-  <symbol minX="897" maxX="931" minY="935" maxY="957" name="railway-crossing-l"/>
-  <symbol minX="931" maxX="953" minY="935" maxY="957" name="parking_pay-s"/>
-  <symbol minX="953" maxX="992" minY="935" maxY="957" name="subway-minsk-l"/>
-  <symbol minX="992" maxX="1014" minY="935" maxY="957" name="star-l"/>
-  <symbol minX="0" maxX="22" minY="963" maxY="985" name="speedcam-s"/>
-  <symbol minX="22" maxX="44" minY="963" maxY="985" name="survey_point-l"/>
-  <symbol minX="44" maxX="66" minY="963" maxY="985" name="subway-xs"/>
-  <symbol minX="66" maxX="88" minY="963" maxY="985" name="bike-parking-s"/>
-  <symbol minX="88" maxX="110" minY="963" maxY="985" name="viator-star-l"/>
-  <symbol minX="110" maxX="132" minY="963" maxY="985" name="subway-newyork-xs"/>
-  <symbol minX="132" maxX="154" minY="963" maxY="985" name="train-xs"/>
-  <symbol minX="154" maxX="176" minY="963" maxY="985" name="parking-s"/>
-  <symbol minX="176" maxX="198" minY="963" maxY="985" name="motorcycle-parking-s"/>
-  <symbol minX="198" maxX="231" minY="963" maxY="984" name="subway-kiev-s"/>
-  <symbol minX="231" maxX="252" minY="963" maxY="984" name="viator-star-m"/>
-  <symbol minX="252" maxX="273" minY="963" maxY="984" name="star-m"/>
-  <symbol minX="273" maxX="306" minY="963" maxY="982" name="subway-minsk-m"/>
-  <symbol minX="306" maxX="336" minY="963" maxY="982" name="railway-crossing"/>
-  <symbol minX="336" maxX="357" minY="963" maxY="982" name="peakt-m"/>
-  <symbol minX="357" maxX="376" minY="963" maxY="982" name="survey_point-m"/>
-  <symbol minX="376" maxX="394" minY="963" maxY="981" name="viator-star-s"/>
-  <symbol minX="394" maxX="424" minY="963" maxY="981" name="subway-minsk-s"/>
-  <symbol minX="424" maxX="442" minY="963" maxY="981" name="star-s"/>
-  <symbol minX="442" maxX="460" minY="963" maxY="981" name="crossing-l"/>
-  <symbol minX="460" maxX="496" minY="963" maxY="979" name="arrow-m"/>
-  <symbol minX="496" maxX="512" minY="963" maxY="979" name="survey_point-s"/>
-  <symbol minX="512" maxX="530" minY="963" maxY="979" name="peakt-s"/>
-  <symbol minX="530" maxX="545" minY="963" maxY="978" name="entrance-s"/>
-  <symbol minX="545" maxX="560" minY="963" maxY="978" name="zero-icon"/>
-  <symbol minX="560" maxX="575" minY="963" maxY="978" name="crossing-m"/>
-  <symbol minX="575" maxX="587" minY="963" maxY="975" name="dot-m"/>
-  <symbol minX="587" maxX="599" minY="963" maxY="975" name="cities-m"/>
-  <symbol minX="599" maxX="611" minY="963" maxY="975" name="crossing-s"/>
-  <symbol minX="611" maxX="638" minY="963" maxY="975" name="arrow-s"/>
-  <symbol minX="638" maxX="648" minY="963" maxY="973" name="entrance-xs"/>
-  <symbol minX="648" maxX="657" minY="963" maxY="972" name="dot-s"/>
-  <symbol minX="657" maxX="675" minY="963" maxY="972" name="arrow-xs"/>
-  <symbol minX="675" maxX="684" minY="963" maxY="972" name="cities-xs"/>
-  <symbol minX="684" maxX="693" minY="963" maxY="972" name="cities-s"/>
+  <symbol minX="572" maxX="599" minY="935" maxY="962" name="subway-paris-s"/>
+  <symbol minX="599" maxX="635" minY="935" maxY="962" name="subway-madrid-s"/>
+  <symbol minX="635" maxX="662" minY="935" maxY="962" name="peakt-l"/>
+  <symbol minX="662" maxX="689" minY="935" maxY="962" name="lightrail-berlin-s"/>
+  <symbol minX="689" maxX="728" minY="935" maxY="962" name="subway-kiev-m"/>
+  <symbol minX="728" maxX="767" minY="935" maxY="962" name="subway-kiev-l"/>
+  <symbol minX="767" maxX="792" minY="935" maxY="960" name="viator-star-l"/>
+  <symbol minX="792" maxX="817" minY="935" maxY="960" name="subway-moscow-s"/>
+  <symbol minX="817" maxX="847" minY="935" maxY="959" name="subway-london-s"/>
+  <symbol minX="847" maxX="871" minY="935" maxY="959" name="subway-berlin-s"/>
+  <symbol minX="871" maxX="898" minY="935" maxY="959" name="bench"/>
+  <symbol minX="898" maxX="922" minY="935" maxY="959" name="viator-star-m"/>
+  <symbol minX="922" maxX="946" minY="935" maxY="959" name="subway-rome-s"/>
+  <symbol minX="946" maxX="980" minY="935" maxY="957" name="railway-crossing-l"/>
+  <symbol minX="980" maxX="1002" minY="935" maxY="957" name="bike-parking-s"/>
+  <symbol minX="1002" maxX="1024" minY="935" maxY="957" name="star-l"/>
+  <symbol minX="0" maxX="22" minY="963" maxY="985" name="survey_point-l"/>
+  <symbol minX="22" maxX="44" minY="963" maxY="985" name="subway-xs"/>
+  <symbol minX="44" maxX="83" minY="963" maxY="985" name="subway-minsk-l"/>
+  <symbol minX="83" maxX="105" minY="963" maxY="985" name="train-xs"/>
+  <symbol minX="105" maxX="127" minY="963" maxY="985" name="subway-newyork-xs"/>
+  <symbol minX="127" maxX="149" minY="963" maxY="985" name="speedcam-s"/>
+  <symbol minX="149" maxX="171" minY="963" maxY="985" name="motorcycle-parking-s"/>
+  <symbol minX="171" maxX="193" minY="963" maxY="985" name="parking-s"/>
+  <symbol minX="193" maxX="215" minY="963" maxY="985" name="parking_pay-s"/>
+  <symbol minX="215" maxX="236" minY="963" maxY="984" name="viator-star-s"/>
+  <symbol minX="236" maxX="257" minY="963" maxY="984" name="star-m"/>
+  <symbol minX="257" maxX="290" minY="963" maxY="984" name="subway-kiev-s"/>
+  <symbol minX="290" maxX="323" minY="963" maxY="982" name="subway-minsk-m"/>
+  <symbol minX="323" maxX="342" minY="963" maxY="982" name="survey_point-m"/>
+  <symbol minX="342" maxX="372" minY="963" maxY="982" name="railway-crossing"/>
+  <symbol minX="372" maxX="393" minY="963" maxY="982" name="peakt-m"/>
+  <symbol minX="393" maxX="411" minY="963" maxY="981" name="crossing-l"/>
+  <symbol minX="411" maxX="441" minY="963" maxY="981" name="subway-minsk-s"/>
+  <symbol minX="441" maxX="459" minY="963" maxY="981" name="star-s"/>
+  <symbol minX="459" maxX="475" minY="963" maxY="979" name="survey_point-s"/>
+  <symbol minX="475" maxX="511" minY="963" maxY="979" name="arrow-m"/>
+  <symbol minX="511" maxX="529" minY="963" maxY="979" name="peakt-s"/>
+  <symbol minX="529" maxX="544" minY="963" maxY="978" name="zero-icon"/>
+  <symbol minX="544" maxX="559" minY="963" maxY="978" name="crossing-m"/>
+  <symbol minX="559" maxX="574" minY="963" maxY="978" name="entrance-s"/>
+  <symbol minX="574" maxX="601" minY="963" maxY="975" name="arrow-s"/>
+  <symbol minX="601" maxX="613" minY="963" maxY="975" name="crossing-s"/>
+  <symbol minX="613" maxX="625" minY="963" maxY="975" name="cities-m"/>
+  <symbol minX="625" maxX="637" minY="963" maxY="975" name="dot-m"/>
+  <symbol minX="637" maxX="647" minY="963" maxY="973" name="entrance-xs"/>
+  <symbol minX="647" maxX="656" minY="963" maxY="972" name="dot-s"/>
+  <symbol minX="656" maxX="665" minY="963" maxY="972" name="cities-s"/>
+  <symbol minX="665" maxX="683" minY="963" maxY="972" name="arrow-xs"/>
+  <symbol minX="683" maxX="692" minY="963" maxY="972" name="cities-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 26ac66280a..6cc7d6c740 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 311fb90f2a..dd1a24f027 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -635,56 +635,56 @@
   <symbol minX="1560" maxX="1600" minY="985" maxY="1025" name="cinema-s"/>
   <symbol minX="1600" maxX="1640" minY="985" maxY="1025" name="christian-s"/>
   <symbol minX="1640" maxX="1680" minY="985" maxY="1025" name="viewpoint-s"/>
-  <symbol minX="1680" maxX="1736" minY="985" maxY="1023" name="subway-kiev-l"/>
-  <symbol minX="1736" maxX="1774" minY="985" maxY="1023" name="peakt-l"/>
-  <symbol minX="1774" maxX="1812" minY="985" maxY="1023" name="lightrail-berlin-s"/>
-  <symbol minX="1812" maxX="1850" minY="985" maxY="1023" name="subway-paris-s"/>
-  <symbol minX="1850" maxX="1901" minY="985" maxY="1023" name="subway-madrid-s"/>
-  <symbol minX="1901" maxX="1957" minY="985" maxY="1023" name="subway-kiev-m"/>
-  <symbol minX="1957" maxX="1993" minY="985" maxY="1021" name="subway-moscow-s"/>
-  <symbol minX="0" maxX="58" minY="1025" maxY="1061" name="railway-crossing-xl"/>
-  <symbol minX="58" maxX="100" minY="1025" maxY="1058" name="subway-london-s"/>
-  <symbol minX="100" maxX="138" minY="1025" maxY="1058" name="bench"/>
-  <symbol minX="138" maxX="171" minY="1025" maxY="1058" name="subway-berlin-s"/>
-  <symbol minX="171" maxX="204" minY="1025" maxY="1058" name="subway-rome-s"/>
-  <symbol minX="204" maxX="253" minY="1025" maxY="1056" name="railway-crossing-l"/>
-  <symbol minX="253" maxX="284" minY="1025" maxY="1056" name="parking_pay-s"/>
-  <symbol minX="284" maxX="340" minY="1025" maxY="1056" name="subway-minsk-l"/>
-  <symbol minX="340" maxX="371" minY="1025" maxY="1056" name="star-l"/>
-  <symbol minX="371" maxX="402" minY="1025" maxY="1056" name="speedcam-s"/>
-  <symbol minX="402" maxX="433" minY="1025" maxY="1056" name="survey_point-l"/>
-  <symbol minX="433" maxX="464" minY="1025" maxY="1056" name="subway-xs"/>
-  <symbol minX="464" maxX="495" minY="1025" maxY="1056" name="bike-parking-s"/>
-  <symbol minX="495" maxX="526" minY="1025" maxY="1056" name="viator-star-l"/>
-  <symbol minX="526" maxX="557" minY="1025" maxY="1056" name="subway-newyork-xs"/>
-  <symbol minX="557" maxX="588" minY="1025" maxY="1056" name="train-xs"/>
-  <symbol minX="588" maxX="619" minY="1025" maxY="1056" name="parking-s"/>
-  <symbol minX="619" maxX="650" minY="1025" maxY="1056" name="motorcycle-parking-s"/>
-  <symbol minX="650" maxX="697" minY="1025" maxY="1054" name="subway-kiev-s"/>
-  <symbol minX="697" maxX="726" minY="1025" maxY="1054" name="viator-star-m"/>
-  <symbol minX="726" maxX="755" minY="1025" maxY="1054" name="star-m"/>
-  <symbol minX="755" maxX="802" minY="1025" maxY="1052" name="subway-minsk-m"/>
-  <symbol minX="802" maxX="844" minY="1025" maxY="1052" name="railway-crossing"/>
-  <symbol minX="844" maxX="873" minY="1025" maxY="1052" name="peakt-m"/>
-  <symbol minX="873" maxX="900" minY="1025" maxY="1052" name="survey_point-m"/>
-  <symbol minX="900" maxX="924" minY="1025" maxY="1049" name="viator-star-s"/>
-  <symbol minX="924" maxX="966" minY="1025" maxY="1049" name="subway-minsk-s"/>
-  <symbol minX="966" maxX="990" minY="1025" maxY="1049" name="star-s"/>
-  <symbol minX="990" maxX="1014" minY="1025" maxY="1049" name="crossing-l"/>
-  <symbol minX="1014" maxX="1065" minY="1025" maxY="1047" name="arrow-m"/>
-  <symbol minX="1065" maxX="1087" minY="1025" maxY="1047" name="survey_point-s"/>
-  <symbol minX="1087" maxX="1111" minY="1025" maxY="1047" name="peakt-s"/>
-  <symbol minX="1111" maxX="1131" minY="1025" maxY="1045" name="entrance-s"/>
-  <symbol minX="1131" maxX="1151" minY="1025" maxY="1045" name="zero-icon"/>
-  <symbol minX="1151" maxX="1171" minY="1025" maxY="1045" name="crossing-m"/>
-  <symbol minX="1171" maxX="1186" minY="1025" maxY="1040" name="dot-m"/>
-  <symbol minX="1186" maxX="1201" minY="1025" maxY="1040" name="cities-m"/>
+  <symbol minX="1680" maxX="1736" minY="985" maxY="1023" name="subway-kiev-m"/>
+  <symbol minX="1736" maxX="1774" minY="985" maxY="1023" name="subway-paris-s"/>
+  <symbol minX="1774" maxX="1825" minY="985" maxY="1023" name="subway-madrid-s"/>
+  <symbol minX="1825" maxX="1863" minY="985" maxY="1023" name="peakt-l"/>
+  <symbol minX="1863" maxX="1901" minY="985" maxY="1023" name="lightrail-berlin-s"/>
+  <symbol minX="1901" maxX="1957" minY="985" maxY="1023" name="subway-kiev-l"/>
+  <symbol minX="1957" maxX="2015" minY="985" maxY="1021" name="railway-crossing-xl"/>
+  <symbol minX="0" maxX="36" minY="1025" maxY="1061" name="viator-star-l"/>
+  <symbol minX="36" maxX="72" minY="1025" maxY="1061" name="subway-moscow-s"/>
+  <symbol minX="72" maxX="114" minY="1025" maxY="1058" name="subway-london-s"/>
+  <symbol minX="114" maxX="147" minY="1025" maxY="1058" name="subway-berlin-s"/>
+  <symbol minX="147" maxX="185" minY="1025" maxY="1058" name="bench"/>
+  <symbol minX="185" maxX="218" minY="1025" maxY="1058" name="viator-star-m"/>
+  <symbol minX="218" maxX="251" minY="1025" maxY="1058" name="subway-rome-s"/>
+  <symbol minX="251" maxX="300" minY="1025" maxY="1056" name="railway-crossing-l"/>
+  <symbol minX="300" maxX="331" minY="1025" maxY="1056" name="bike-parking-s"/>
+  <symbol minX="331" maxX="362" minY="1025" maxY="1056" name="star-l"/>
+  <symbol minX="362" maxX="393" minY="1025" maxY="1056" name="survey_point-l"/>
+  <symbol minX="393" maxX="424" minY="1025" maxY="1056" name="subway-xs"/>
+  <symbol minX="424" maxX="480" minY="1025" maxY="1056" name="subway-minsk-l"/>
+  <symbol minX="480" maxX="511" minY="1025" maxY="1056" name="train-xs"/>
+  <symbol minX="511" maxX="542" minY="1025" maxY="1056" name="subway-newyork-xs"/>
+  <symbol minX="542" maxX="573" minY="1025" maxY="1056" name="speedcam-s"/>
+  <symbol minX="573" maxX="604" minY="1025" maxY="1056" name="motorcycle-parking-s"/>
+  <symbol minX="604" maxX="635" minY="1025" maxY="1056" name="parking-s"/>
+  <symbol minX="635" maxX="666" minY="1025" maxY="1056" name="parking_pay-s"/>
+  <symbol minX="666" maxX="695" minY="1025" maxY="1054" name="viator-star-s"/>
+  <symbol minX="695" maxX="724" minY="1025" maxY="1054" name="star-m"/>
+  <symbol minX="724" maxX="771" minY="1025" maxY="1054" name="subway-kiev-s"/>
+  <symbol minX="771" maxX="818" minY="1025" maxY="1052" name="subway-minsk-m"/>
+  <symbol minX="818" maxX="845" minY="1025" maxY="1052" name="survey_point-m"/>
+  <symbol minX="845" maxX="887" minY="1025" maxY="1052" name="railway-crossing"/>
+  <symbol minX="887" maxX="916" minY="1025" maxY="1052" name="peakt-m"/>
+  <symbol minX="916" maxX="940" minY="1025" maxY="1049" name="crossing-l"/>
+  <symbol minX="940" maxX="982" minY="1025" maxY="1049" name="subway-minsk-s"/>
+  <symbol minX="982" maxX="1006" minY="1025" maxY="1049" name="star-s"/>
+  <symbol minX="1006" maxX="1028" minY="1025" maxY="1047" name="survey_point-s"/>
+  <symbol minX="1028" maxX="1079" minY="1025" maxY="1047" name="arrow-m"/>
+  <symbol minX="1079" maxX="1103" minY="1025" maxY="1047" name="peakt-s"/>
+  <symbol minX="1103" maxX="1123" minY="1025" maxY="1045" name="zero-icon"/>
+  <symbol minX="1123" maxX="1143" minY="1025" maxY="1045" name="crossing-m"/>
+  <symbol minX="1143" maxX="1163" minY="1025" maxY="1045" name="entrance-s"/>
+  <symbol minX="1163" maxX="1201" minY="1025" maxY="1040" name="arrow-s"/>
   <symbol minX="1201" maxX="1216" minY="1025" maxY="1040" name="crossing-s"/>
-  <symbol minX="1216" maxX="1254" minY="1025" maxY="1040" name="arrow-s"/>
-  <symbol minX="1254" maxX="1267" minY="1025" maxY="1038" name="entrance-xs"/>
-  <symbol minX="1267" maxX="1278" minY="1025" maxY="1036" name="dot-s"/>
-  <symbol minX="1278" maxX="1302" minY="1025" maxY="1036" name="arrow-xs"/>
-  <symbol minX="1302" maxX="1313" minY="1025" maxY="1036" name="cities-xs"/>
-  <symbol minX="1313" maxX="1324" minY="1025" maxY="1036" name="cities-s"/>
+  <symbol minX="1216" maxX="1231" minY="1025" maxY="1040" name="cities-m"/>
+  <symbol minX="1231" maxX="1246" minY="1025" maxY="1040" name="dot-m"/>
+  <symbol minX="1246" maxX="1259" minY="1025" maxY="1038" name="entrance-xs"/>
+  <symbol minX="1259" maxX="1270" minY="1025" maxY="1036" name="dot-s"/>
+  <symbol minX="1270" maxX="1281" minY="1025" maxY="1036" name="cities-s"/>
+  <symbol minX="1281" maxX="1305" minY="1025" maxY="1036" name="arrow-xs"/>
+  <symbol minX="1305" maxX="1316" minY="1025" maxY="1036" name="cities-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 152548b73e..a07df88f0d 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index 2c1da361e8..c5ec0175bd 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -637,55 +637,55 @@
   <symbol minX="1640" maxX="1680" minY="986" maxY="1026" name="christian-s"/>
   <symbol minX="1680" maxX="1720" minY="986" maxY="1026" name="viewpoint-s"/>
   <symbol minX="1720" maxX="1778" minY="986" maxY="1025" name="railway-crossing-xl"/>
-  <symbol minX="1778" maxX="1816" minY="986" maxY="1024" name="peakt-l"/>
-  <symbol minX="1816" maxX="1854" minY="986" maxY="1024" name="lightrail-berlin-s"/>
-  <symbol minX="1854" maxX="1892" minY="986" maxY="1024" name="subway-paris-s"/>
-  <symbol minX="1892" maxX="1948" minY="986" maxY="1024" name="subway-kiev-l"/>
-  <symbol minX="1948" maxX="2004" minY="986" maxY="1024" name="subway-kiev-m"/>
-  <symbol minX="0" maxX="51" minY="1026" maxY="1064" name="subway-madrid-s"/>
-  <symbol minX="51" maxX="87" minY="1026" maxY="1062" name="subway-moscow-s"/>
-  <symbol minX="87" maxX="129" minY="1026" maxY="1059" name="subway-london-s"/>
-  <symbol minX="129" maxX="167" minY="1026" maxY="1059" name="bench"/>
-  <symbol minX="167" maxX="200" minY="1026" maxY="1059" name="subway-berlin-s"/>
-  <symbol minX="200" maxX="233" minY="1026" maxY="1059" name="subway-rome-s"/>
-  <symbol minX="233" maxX="282" minY="1026" maxY="1057" name="railway-crossing-l"/>
-  <symbol minX="282" maxX="313" minY="1026" maxY="1057" name="parking_pay-s"/>
-  <symbol minX="313" maxX="369" minY="1026" maxY="1057" name="subway-minsk-l"/>
-  <symbol minX="369" maxX="400" minY="1026" maxY="1057" name="star-l"/>
-  <symbol minX="400" maxX="431" minY="1026" maxY="1057" name="speedcam-s"/>
-  <symbol minX="431" maxX="462" minY="1026" maxY="1057" name="survey_point-l"/>
-  <symbol minX="462" maxX="493" minY="1026" maxY="1057" name="subway-xs"/>
-  <symbol minX="493" maxX="524" minY="1026" maxY="1057" name="bike-parking-s"/>
-  <symbol minX="524" maxX="555" minY="1026" maxY="1057" name="viator-star-l"/>
-  <symbol minX="555" maxX="586" minY="1026" maxY="1057" name="subway-newyork-xs"/>
-  <symbol minX="586" maxX="617" minY="1026" maxY="1057" name="train-xs"/>
-  <symbol minX="617" maxX="648" minY="1026" maxY="1057" name="parking-s"/>
-  <symbol minX="648" maxX="679" minY="1026" maxY="1057" name="motorcycle-parking-s"/>
-  <symbol minX="679" maxX="726" minY="1026" maxY="1055" name="subway-kiev-s"/>
-  <symbol minX="726" maxX="755" minY="1026" maxY="1055" name="viator-star-m"/>
-  <symbol minX="755" maxX="784" minY="1026" maxY="1055" name="star-m"/>
-  <symbol minX="784" maxX="831" minY="1026" maxY="1053" name="subway-minsk-m"/>
-  <symbol minX="831" maxX="873" minY="1026" maxY="1053" name="railway-crossing"/>
-  <symbol minX="873" maxX="902" minY="1026" maxY="1053" name="peakt-m"/>
-  <symbol minX="902" maxX="929" minY="1026" maxY="1053" name="survey_point-m"/>
-  <symbol minX="929" maxX="953" minY="1026" maxY="1050" name="viator-star-s"/>
-  <symbol minX="953" maxX="995" minY="1026" maxY="1050" name="subway-minsk-s"/>
-  <symbol minX="995" maxX="1019" minY="1026" maxY="1050" name="star-s"/>
-  <symbol minX="1019" maxX="1043" minY="1026" maxY="1050" name="crossing-l"/>
-  <symbol minX="1043" maxX="1094" minY="1026" maxY="1048" name="arrow-m"/>
-  <symbol minX="1094" maxX="1116" minY="1026" maxY="1048" name="survey_point-s"/>
-  <symbol minX="1116" maxX="1140" minY="1026" maxY="1048" name="peakt-s"/>
-  <symbol minX="1140" maxX="1160" minY="1026" maxY="1046" name="entrance-s"/>
-  <symbol minX="1160" maxX="1180" minY="1026" maxY="1046" name="zero-icon"/>
-  <symbol minX="1180" maxX="1200" minY="1026" maxY="1046" name="crossing-m"/>
-  <symbol minX="1200" maxX="1215" minY="1026" maxY="1041" name="dot-m"/>
-  <symbol minX="1215" maxX="1230" minY="1026" maxY="1041" name="cities-m"/>
-  <symbol minX="1230" maxX="1245" minY="1026" maxY="1041" name="crossing-s"/>
-  <symbol minX="1245" maxX="1283" minY="1026" maxY="1041" name="arrow-s"/>
-  <symbol minX="1283" maxX="1296" minY="1026" maxY="1039" name="entrance-xs"/>
-  <symbol minX="1296" maxX="1307" minY="1026" maxY="1037" name="dot-s"/>
-  <symbol minX="1307" maxX="1331" minY="1026" maxY="1037" name="arrow-xs"/>
-  <symbol minX="1331" maxX="1342" minY="1026" maxY="1037" name="cities-xs"/>
-  <symbol minX="1342" maxX="1353" minY="1026" maxY="1037" name="cities-s"/>
+  <symbol minX="1778" maxX="1834" minY="986" maxY="1024" name="subway-kiev-m"/>
+  <symbol minX="1834" maxX="1872" minY="986" maxY="1024" name="subway-paris-s"/>
+  <symbol minX="1872" maxX="1910" minY="986" maxY="1024" name="peakt-l"/>
+  <symbol minX="1910" maxX="1948" minY="986" maxY="1024" name="lightrail-berlin-s"/>
+  <symbol minX="1948" maxX="1999" minY="986" maxY="1024" name="subway-madrid-s"/>
+  <symbol minX="0" maxX="56" minY="1026" maxY="1064" name="subway-kiev-l"/>
+  <symbol minX="56" maxX="92" minY="1026" maxY="1062" name="subway-moscow-s"/>
+  <symbol minX="92" maxX="128" minY="1026" maxY="1062" name="viator-star-l"/>
+  <symbol minX="128" maxX="170" minY="1026" maxY="1059" name="subway-london-s"/>
+  <symbol minX="170" maxX="208" minY="1026" maxY="1059" name="bench"/>
+  <symbol minX="208" maxX="241" minY="1026" maxY="1059" name="viator-star-m"/>
+  <symbol minX="241" maxX="274" minY="1026" maxY="1059" name="subway-berlin-s"/>
+  <symbol minX="274" maxX="307" minY="1026" maxY="1059" name="subway-rome-s"/>
+  <symbol minX="307" maxX="356" minY="1026" maxY="1057" name="railway-crossing-l"/>
+  <symbol minX="356" maxX="387" minY="1026" maxY="1057" name="bike-parking-s"/>
+  <symbol minX="387" maxX="418" minY="1026" maxY="1057" name="star-l"/>
+  <symbol minX="418" maxX="449" minY="1026" maxY="1057" name="survey_point-l"/>
+  <symbol minX="449" maxX="480" minY="1026" maxY="1057" name="subway-xs"/>
+  <symbol minX="480" maxX="536" minY="1026" maxY="1057" name="subway-minsk-l"/>
+  <symbol minX="536" maxX="567" minY="1026" maxY="1057" name="train-xs"/>
+  <symbol minX="567" maxX="598" minY="1026" maxY="1057" name="subway-newyork-xs"/>
+  <symbol minX="598" maxX="629" minY="1026" maxY="1057" name="speedcam-s"/>
+  <symbol minX="629" maxX="660" minY="1026" maxY="1057" name="motorcycle-parking-s"/>
+  <symbol minX="660" maxX="691" minY="1026" maxY="1057" name="parking-s"/>
+  <symbol minX="691" maxX="722" minY="1026" maxY="1057" name="parking_pay-s"/>
+  <symbol minX="722" maxX="751" minY="1026" maxY="1055" name="viator-star-s"/>
+  <symbol minX="751" maxX="780" minY="1026" maxY="1055" name="star-m"/>
+  <symbol minX="780" maxX="827" minY="1026" maxY="1055" name="subway-kiev-s"/>
+  <symbol minX="827" maxX="874" minY="1026" maxY="1053" name="subway-minsk-m"/>
+  <symbol minX="874" maxX="901" minY="1026" maxY="1053" name="survey_point-m"/>
+  <symbol minX="901" maxX="943" minY="1026" maxY="1053" name="railway-crossing"/>
+  <symbol minX="943" maxX="972" minY="1026" maxY="1053" name="peakt-m"/>
+  <symbol minX="972" maxX="996" minY="1026" maxY="1050" name="crossing-l"/>
+  <symbol minX="996" maxX="1038" minY="1026" maxY="1050" name="subway-minsk-s"/>
+  <symbol minX="1038" maxX="1062" minY="1026" maxY="1050" name="star-s"/>
+  <symbol minX="1062" maxX="1084" minY="1026" maxY="1048" name="survey_point-s"/>
+  <symbol minX="1084" maxX="1135" minY="1026" maxY="1048" name="arrow-m"/>
+  <symbol minX="1135" maxX="1159" minY="1026" maxY="1048" name="peakt-s"/>
+  <symbol minX="1159" maxX="1179" minY="1026" maxY="1046" name="zero-icon"/>
+  <symbol minX="1179" maxX="1199" minY="1026" maxY="1046" name="crossing-m"/>
+  <symbol minX="1199" maxX="1219" minY="1026" maxY="1046" name="entrance-s"/>
+  <symbol minX="1219" maxX="1257" minY="1026" maxY="1041" name="arrow-s"/>
+  <symbol minX="1257" maxX="1272" minY="1026" maxY="1041" name="crossing-s"/>
+  <symbol minX="1272" maxX="1287" minY="1026" maxY="1041" name="cities-m"/>
+  <symbol minX="1287" maxX="1302" minY="1026" maxY="1041" name="dot-m"/>
+  <symbol minX="1302" maxX="1315" minY="1026" maxY="1039" name="entrance-xs"/>
+  <symbol minX="1315" maxX="1326" minY="1026" maxY="1037" name="dot-s"/>
+  <symbol minX="1326" maxX="1337" minY="1026" maxY="1037" name="cities-s"/>
+  <symbol minX="1337" maxX="1361" minY="1026" maxY="1037" name="arrow-xs"/>
+  <symbol minX="1361" maxX="1372" minY="1026" maxY="1037" name="cities-xs"/>
  </file>
 </root>