diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml
index 97cfb3ee9..e55929c59 100644
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -43,6 +43,7 @@
     <string name="type.amenity.charging_station">Ladestation</string>
     <string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
     <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
+    <string name="type.amenity.charging_station.motorcar.small">Kfz-Ladepunkt</string>
     <string name="type.amenity.childcare">Kindertagesstätte</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlingbahn</string>
@@ -632,7 +633,39 @@
     <string name="type.leisure.sauna">Sauna</string>
     <string name="type.leisure.slipway">Bootsrampe</string>
     <string name="type.leisure.sports_centre">Sportzentrum</string>
-    <string name="type.sport.climbing">Kletterhalle</string>
+    <string name="type.leisure.sports_centre.sport.multi">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.american_football">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.archery">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.athletics">Sportzentrume</string>
+    <string name="type.leisure.sports_centre.sport.australian_football">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.beachvolleyball">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.bowls">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.cricket">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.curling">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.equestrian">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.field_hockey">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.futsal">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.golf">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.handball">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.ice_hockey">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.padel">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Schwimmbad</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Sportzentrum</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Sportzentrum</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Yoga-Studio</string>
     <string name="type.leisure.stadium">Stadion</string>
     <string name="type.leisure.swimming_pool">Schwimmbecken</string>
     <string name="type.leisure.swimming_pool.private">Schwimmbecken</string>
@@ -1196,23 +1229,36 @@
     <string name="type.shop.watches">Uhrengeschäft</string>
     <string name="type.shop.wholesale">Großhandelsgeschäft</string>
     <string name="type.sport">Sport</string>
+    <!-- Used for high diving sites. -->
+    <!-- Used to tag a scuba diving site. -->
+    <string name="type.sport.9pin">Kegeln</string>
+    <string name="type.sport.10pin">Bowling</string>
     <string name="type.sport.american_football">American Football</string>
     <string name="type.sport.archery">Bogenschießen</string>
     <string name="type.sport.athletics">Leichtathletik</string>
     <string name="type.sport.australian_football">Australian Football</string>
+    <string name="type.sport.badminton">Badminton</string>
     <string name="type.sport.baseball">Baseball</string>
     <string name="type.sport.basketball">Basketball</string>
     <string name="type.sport.beachvolleyball">Beachvolleyball</string>
     <string name="type.sport.bowls">Bowls</string>
     <string name="type.sport.chess">Schach</string>
+    <string name="type.sport.climbing">Klettern</string>
     <string name="type.sport.cricket">Cricket</string>
     <string name="type.sport.curling">Curling</string>
+    <!-- Used for high diving. -->
+    <string name="type.sport.diving">Turmspringen</string>
     <string name="type.sport.equestrian">Reitsport</string>
+    <string name="type.sport.field_hockey">Feldhockey</string>
+    <string name="type.sport.futsal">Futsal</string>
     <string name="type.sport.golf">Golf</string>
     <string name="type.sport.gymnastics">Gymnastik</string>
     <string name="type.sport.handball">Handball</string>
+    <string name="type.sport.ice_hockey">Eishockey</string>
     <string name="type.sport.multi">Verschiedene Sportarten</string>
-    <!-- Used to tag a scuba diving site. -->
+    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.pelota">Pelota Vasca</string>
+    <!-- Used to tag a scuba diving. -->
     <string name="type.sport.scuba_diving">Gerätetauchen</string>
     <string name="type.sport.shooting">Schießen</string>
     <string name="type.sport.skateboard">Skateboarden</string>
@@ -1222,14 +1268,7 @@
     <string name="type.sport.table_tennis">Tischtennis</string>
     <string name="type.sport.tennis">Tennisplatz</string>
     <string name="type.sport.volleyball">Volleyball</string>
-    <string name="type.sport.10pin">Bowling</string>
-    <string name="type.sport.9pin">Kegeln</string>
-    <string name="type.sport.padel">Padel</string>
-    <string name="type.sport.futsal">Futsal</string>
-    <string name="type.sport.ice_hockey">Eishockey</string>
-    <string name="type.sport.field_hockey">Feldhockey</string>
-    <string name="type.sport.badminton">Badminton</string>
-    <string name="type.sport.pelota">Pelota Vasca</string>
+    <string name="type.sport.yoga">Yoga</string>
     <string name="type.tourism">Tourismus</string>
     <string name="type.tourism.aquarium">Aquarium</string>
     <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
@@ -1349,7 +1388,6 @@
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
-    <string name="type.sport.yoga">Yoga Studio</string>
     <string name="type.noexit">Sackgasse</string>
     <string name="type.shop.kiosk">Kiosk</string>
     <string name="type.boundary.administrative.2">Landesgrenze</string>
@@ -1368,7 +1406,6 @@
     <string name="type.boundary.administrative.3">Regionale Grenze</string>
     <string name="type.power.pole">Strommast</string>
     <string name="type.man_made.pipeline.overground">Oberirdische Rohrleitung</string>
-    <string name="type.sport.diving">Turmspringen</string>
     <string name="type.amenity.love_hotel">Stundenhotel</string>
     <string name="type.landuse.plant_nursery">Gärtnerei</string>
     <string name="type.leisure.firepit">Feuerstelle</string>
diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
index 32071d119..5e14913f2 100644
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -48,6 +48,7 @@
     <string name="type.amenity.charging_station">Charging Station</string>
     <string name="type.amenity.charging_station.bicycle">Bicycle Charging Station</string>
     <string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
+    <string name="type.amenity.charging_station.motorcar.small">Car Charging Point</string>
     <string name="type.amenity.childcare">Nursery</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.amenity.studio">Studio</string>
@@ -668,8 +669,39 @@
     <string name="type.leisure.sauna">Sauna</string>
     <string name="type.leisure.slipway">Slipway</string>
     <string name="type.leisure.sports_centre">Sports Center</string>
-    <string name="type.sport.climbing">Climbing Centre</string>
-    <string name="type.sport.yoga">Yoga Studio</string>
+    <string name="type.leisure.sports_centre.sport.multi">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.american_football">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.archery">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.athletics">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.australian_football">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.beachvolleyball">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.bowls">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.cricket">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.curling">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.equestrian">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.field_hockey">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.futsal">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.golf">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.handball">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.ice_hockey">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.padel">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Swimming Centre</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Sports Centre</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Sports Centre</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Yoga Studio</string>
     <string name="type.leisure.stadium">Stadium</string>
     <string name="type.leisure.swimming_pool">Swimming Pool</string>
     <string name="type.leisure.swimming_pool.private">Swimming Pool</string>
@@ -1253,26 +1285,35 @@
     <string name="type.shop.wholesale">Wholesale Store</string>
     <string name="type.shop.lighting">Lighting Shop</string>
     <string name="type.sport">Sport</string>
+    <string name="type.sport.multi">Various Sports</string>
+    <string name="type.sport.9pin">Bowling</string>
+    <string name="type.sport.10pin">Bowling</string>
     <string name="type.sport.american_football">American Football</string>
     <string name="type.sport.archery">Archery</string>
     <string name="type.sport.athletics">Athletics</string>
     <string name="type.sport.australian_football">Australian Football</string>
+    <string name="type.sport.badminton">Badminton</string>
     <string name="type.sport.baseball">Baseball</string>
     <string name="type.sport.basketball">Basketball</string>
     <string name="type.sport.beachvolleyball">Beach Volleyball</string>
     <string name="type.sport.bowls">Bowls</string>
     <string name="type.sport.chess">Chess</string>
+    <string name="type.sport.climbing">Climbing</string>
     <string name="type.sport.cricket">Cricket</string>
     <string name="type.sport.curling">Curling</string>
+    <!-- Used for high diving. -->
+    <string name="type.sport.diving">High Diving</string>
     <string name="type.sport.equestrian">Equestrian Sports</string>
+    <string name="type.sport.field_hockey">Field Hockey</string>
+    <string name="type.sport.futsal">Futsal</string>
     <string name="type.sport.golf">Golf</string>
     <string name="type.sport.gymnastics">Gymnastics</string>
     <string name="type.sport.handball">Handball</string>
-    <string name="type.sport.multi">Various Sports</string>
-    <!-- Used to tag a scuba diving site. -->
-    <string name="type.sport.scuba_diving">Scuba Diving Site</string>
-    <!-- Used for high diving sites. -->
-    <string name="type.sport.diving">High Diving</string>
+    <string name="type.sport.ice_hockey">Ice Hockey</string>
+    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.pelota">Basque Pelota</string>
+    <!-- Used to tag a scuba diving. -->
+    <string name="type.sport.scuba_diving">Scuba Diving</string>
     <string name="type.sport.shooting">Shooting</string>
     <string name="type.sport.skateboard">Skateboarding</string>
     <string name="type.sport.skiing">Skiing</string>
@@ -1281,14 +1322,7 @@
     <string name="type.sport.table_tennis">Table Tennis</string>
     <string name="type.sport.tennis">Tennis Court</string>
     <string name="type.sport.volleyball">Volleyball</string>
-    <string name="type.sport.10pin">Bowling</string>
-    <string name="type.sport.9pin">Bowling</string>
-    <string name="type.sport.padel">Padel</string>
-    <string name="type.sport.futsal">Futsal</string>
-    <string name="type.sport.ice_hockey">Ice Hockey</string>
-    <string name="type.sport.field_hockey">Field Hockey</string>
-    <string name="type.sport.badminton">Badminton</string>
-    <string name="type.sport.pelota">Basque Pelota</string>
+    <string name="type.sport.yoga">Yoga</string>
     <string name="type.tourism">Tourism</string>
     <string name="type.tourism.aquarium">Aquarium</string>
     <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
diff --git a/data/categories-strings/ar.json/localize.json b/data/categories-strings/ar.json/localize.json
index 9cd0d4489..e5b0fa9af 100644
--- a/data/categories-strings/ar.json/localize.json
+++ b/data/categories-strings/ar.json/localize.json
@@ -212,7 +212,7 @@
 "aeroway-aerodrome": "مطار|طائرة",
 "leisure-stadium": "استاد|رياضة|ملعب",
 "leisure-playground|@category_children": "ملعب",
-"leisure-sports_centre": "رياضة",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "رياضة",
 "leisure-golf_course": "ملعب جولف",
 "leisure-escape_game": "غرفة الهروب",
 "leisure-hackerspace": "هاكرزبيس",
diff --git a/data/categories-strings/bg.json/localize.json b/data/categories-strings/bg.json/localize.json
index 5b99fb3e2..9c8bfb36c 100644
--- a/data/categories-strings/bg.json/localize.json
+++ b/data/categories-strings/bg.json/localize.json
@@ -209,7 +209,7 @@
 "aeroway-aerodrome": "4Летище|4самолет",
 "leisure-stadium": "4Стадион|спорт|мач|арена|шампионат|спортен комплекс",
 "leisure-playground|@category_children": "4Детска площадка|игрище",
-"leisure-sports_centre": "4Спортен комплекс|спорт|арена",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Спортен комплекс|спорт|арена",
 "leisure-golf_course": "Голф|площадка",
 "leisure-miniature_golf": "Миниголф",
 "leisure-escape_game": "Ескейп стая",
diff --git a/data/categories-strings/cs.json/localize.json b/data/categories-strings/cs.json/localize.json
index b58398eff..2b8e3a079 100644
--- a/data/categories-strings/cs.json/localize.json
+++ b/data/categories-strings/cs.json/localize.json
@@ -209,7 +209,7 @@
 "aeroway-aerodrome": "3Letiště",
 "leisure-stadium": "4Stadion|4sport",
 "leisure-playground|@category_children": "Hřiště",
-"leisure-sports_centre": "4Sportovní centrum|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportovní centrum|sport",
 "leisure-golf_course": "Golf",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Úniková místnost",
diff --git a/data/categories-strings/da.json/localize.json b/data/categories-strings/da.json/localize.json
index 3c7c9e27a..d777c1c13 100644
--- a/data/categories-strings/da.json/localize.json
+++ b/data/categories-strings/da.json/localize.json
@@ -208,7 +208,7 @@
 "aeroway-aerodrome": "3Lufthavn|flyveplads|fly",
 "leisure-stadium": "4Stadium|sport|Stadion",
 "leisure-playground|@category_children": "Legeplads",
-"leisure-sports_centre": "Idrætscenter|sportshal|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Idrætscenter|sportshal|sport",
 "leisure-golf_course": "Golf|golfbane",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escape room",
diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json
index b396a282c..c78c7d276 100644
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -219,7 +219,9 @@
 "aeroway-aerodrome": "3Flughafen|4Flugzeug|Flugplatz",
 "leisure-stadium": "4Stadion|4Sport|Olympiastadion|Sportstadion|Sportkomplex|Arena",
 "leisure-playground|@category_children": "Spielplatz",
-"leisure-sports_centre": "4Sportzentrum|Sport|Fitness-Zentrum|Fitness-Center",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportzentrum|Sport|Fitness-Zentrum|Fitness-Center",
+"leisure-sports_centre-sport-swimming": "4Schwimmmbad|Freibad|Hallenbad|Schwimmhalle",
+"leisure-fitness_centre-sport-yoga": "Yoga-Studio",
 "leisure-golf_course": "Golfplatz",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escape room",
@@ -242,15 +244,16 @@
 "sport-handball": "Handball",
 "sport-scuba_diving": "Gerätetauchen",
 "sport-shooting": "Schießanlage",
-"sport-skateboard": "Skateboarding|skateboard",
+"sport-skateboard": "Skateboarding|Skateboard",
 "sport-skiing": "Skifahren",
 "sport-soccer": "Fußball",
-"sport-swimming": "Schwimmhalle",
+"sport-swimming": "Schwimmen",
 "sport-table_tennis": "Tischtennis",
 "sport-tennis": "Tennis",
 "sport-padel": "Padel",
 "sport-volleyball": "Volleyball",
-"sport-9pin|sport-10pin": "Kegeln|Bowling",
+"sport-9pin": "Kegeln",
+"sport-10pin": "Bowling",
 "building": "Gebäude",
 "building-address": "Adresse",
 "@category_police": "Polizeistation|4Polizei",
diff --git a/data/categories-strings/el.json/localize.json b/data/categories-strings/el.json/localize.json
index 6a3cfb2c4..ebe331564 100644
--- a/data/categories-strings/el.json/localize.json
+++ b/data/categories-strings/el.json/localize.json
@@ -210,7 +210,7 @@
 "aeroway-aerodrome": "3Αεροδρόμιο|αεροπλάνο",
 "leisure-stadium": "Γήπεδο|στάδιο|αθλητισμός|σπορ",
 "leisure-playground|@category_children": "Παιδική χαρά",
-"leisure-sports_centre": "Αθλητικό κέντρο|Αθλητισμός",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Αθλητικό κέντρο|Αθλητισμός",
 "leisure-golf_course": "Γήπεδο γκολφ|Αθλητισμός",
 "leisure-escape_game": "Δωμάτιο απόδρασης",
 "leisure-pitch": "Γήπεδο αθλοπαιδιών|Αθλητισμός",
diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json
index f1a21bf5c..6cf54d797 100644
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -235,7 +235,8 @@
 "aeroway-aerodrome": "3Airport|3plane|U+2708",
 "leisure-stadium": "4Stadium|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|olympic stadium|sports stadium|sports complex|arena",
 "leisure-playground|@category_children": "4Playground",
-"leisure-sports_centre": "4Sports Center|sport|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sports Center|sport|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum",
+"leisure-sports_centre-sport-swimming": "4Swimmming Centre",
 "leisure-golf_course": "Golf Course|U+26F3",
 "leisure-miniature_golf": "4Minigolf|Miniature Golf|Putt Putt",
 "leisure-escape_game": "4Escape Room|Escape Game|quest",
@@ -258,17 +259,18 @@
 "sport-golf": "Golf",
 "sport-gymnastics": "Gymnastics",
 "sport-handball": "Handball",
-"sport-scuba_diving": "Scuba diving site",
-"sport-shooting": "4Shooting Range",
+"sport-scuba_diving": "Scuba Diving",
+"sport-shooting": "4Shooting",
 "sport-skateboard": "Skateboarding|skateboard|skate",
 "sport-skiing": "Skiing",
 "sport-soccer": "Soccer",
 "sport-swimming": "Swimming",
-"sport-table_tennis": "Table tennis",
+"sport-table_tennis": "Table Tennis",
 "sport-tennis": "Tennis",
 "sport-padel": "Padel",
 "sport-volleyball": "Volleyball",
-"sport-9pin|sport-10pin": "Bowling",
+"sport-9pin": "Bowling",
+"sport-10pin": "Bowling",
 "building": "Building|U+1F3E0|U+1F3E1|U+1F3E2",
 "building-address": "Address",
 "@category_police": "4Police|cops",
@@ -346,7 +348,7 @@
 "@charging_station": "4Charging Station|charging",
 "amenity-charging_station|@charging_station": "",
 "amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging|4Bike Charging",
-"amenity-charging_station-motorcar|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
 "amenity-childcare": "Nursery|4Child Care|childcare",
 "amenity-bicycle_parking": "4Bicycle Parking|4Bike Parking",
 "amenity-waste_basket": "4Trash Bin|4litter bin|waste basket",
@@ -404,6 +406,7 @@
 "amenity-public_bookcase": "4Book Exchange|Book swap",
 "sport-climbing": "4Climbing Centre",
 "sport-yoga": "Yoga",
+"leisure-fitness_centre-sport-yoga": "Yoga Studio",
 "tourism-apartment|@category_hotel": "4Holiday Apartment",
 "leisure-resort|@category_hotel": "Resort",
 "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
diff --git a/data/categories-strings/es.json/localize.json b/data/categories-strings/es.json/localize.json
index da1136818..b1cbdf685 100644
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -227,7 +227,7 @@
 "aeroway-aerodrome": "3Aeropuerto|3avión|aeródromo",
 "leisure-stadium": "5Estadio",
 "leisure-playground|@category_children": "Patio de recreo|4Parque infantil|Corral|Corralito",
-"leisure-sports_centre": "Polideportivo|Centro deportivo|deporte",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Polideportivo|Centro deportivo|deporte",
 "leisure-golf_course": "Campo de golf|Golf",
 "leisure-miniature_golf": "5Minigolf|Mini golf",
 "leisure-escape_game": "Escape room|Sala de escape|Cuarto de escape",
diff --git a/data/categories-strings/et.json/localize.json b/data/categories-strings/et.json/localize.json
index 9483ef5bd..fc746505a 100644
--- a/data/categories-strings/et.json/localize.json
+++ b/data/categories-strings/et.json/localize.json
@@ -223,7 +223,7 @@
 "aeroway-aerodrome": "3Lennujaam",
 "leisure-stadium": "4Staadion",
 "leisure-playground|@category_children": "4Mänguplats|Mänguväljak",
-"leisure-sports_centre": "Spordikeskus",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Spordikeskus",
 "leisure-golf_course": "Golfiväljak",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Põgenemistuba",
diff --git a/data/categories-strings/eu.json/localize.json b/data/categories-strings/eu.json/localize.json
index 0f3f484df..7a863d5dc 100644
--- a/data/categories-strings/eu.json/localize.json
+++ b/data/categories-strings/eu.json/localize.json
@@ -209,7 +209,7 @@
 "aeroway-aerodrome": "3Aireportua|3Hegazkina",
 "leisure-stadium": "5Estadioa|4kirola",
 "leisure-playground|@category_children": "Jolastokia",
-"leisure-sports_centre": "Kiroldegia|Kirola",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Kiroldegia|Kirola",
 "leisure-golf_course": "Golf kurtsoa",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Ihes gela",
diff --git a/data/categories-strings/fa.json/localize.json b/data/categories-strings/fa.json/localize.json
index 778bddcdc..cf7d72e25 100644
--- a/data/categories-strings/fa.json/localize.json
+++ b/data/categories-strings/fa.json/localize.json
@@ -208,7 +208,7 @@
 "aeroway-aerodrome": "فرودگاه",
 "leisure-stadium": "استادیوم",
 "leisure-playground|@category_children": "زمین بازی",
-"leisure-sports_centre": "مرکزورزشی",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "مرکزورزشی",
 "leisure-golf_course": "زمین گلف",
 "leisure-escape_game": "اتاق فرار",
 "leisure-hackerspace": "فضای هکرها",
diff --git a/data/categories-strings/fi.json/localize.json b/data/categories-strings/fi.json/localize.json
index 419bdaff5..d94b7818c 100644
--- a/data/categories-strings/fi.json/localize.json
+++ b/data/categories-strings/fi.json/localize.json
@@ -206,7 +206,7 @@
 "aeroway-aerodrome": "6Lentokenttä",
 "leisure-stadium": "4Stadion",
 "leisure-playground|@category_children": "Leikkikenttä",
-"leisure-sports_centre": "Urheilukeskus",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Urheilukeskus",
 "leisure-golf_course": "Golf-rata",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Pakohuone",
diff --git a/data/categories-strings/fr.json/localize.json b/data/categories-strings/fr.json/localize.json
index 179563418..e922d0396 100644
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -223,7 +223,7 @@
 "aeroway-aerodrome": "3Aéroport|3aérodrome|3avion",
 "leisure-stadium": "4Stade|4sport",
 "leisure-playground|@category_children": "Terrain de jeu|aire de jeu",
-"leisure-sports_centre": "Centre sportif|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centre sportif|sport",
 "leisure-golf_course": "Terrain de golf",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Salle d'évasion",
@@ -486,7 +486,7 @@
 "amenity-love_hotel": "Hôtel de passe|Hôtel de sexe|Hôtel pour adultes",
 "healthcare-sample_collection": "Prélèvement d'échantillons",
 "recycling-cardboard|@category_recycling": "5Recyclage de carton|Déchets de carton|Carton",
-"amenity-charging_station-motorcar|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
 "shop-lighting|@shop": "4Lumières|Luminaires|4Lampes",
 "office-security": "Bureau de sécurité",
 "building-guardhouse": "Garde",
diff --git a/data/categories-strings/hu.json/localize.json b/data/categories-strings/hu.json/localize.json
index 8749b02bc..23850bb55 100644
--- a/data/categories-strings/hu.json/localize.json
+++ b/data/categories-strings/hu.json/localize.json
@@ -209,7 +209,7 @@
 "aeroway-aerodrome": "3Repülőtér|3repülő|U+2708",
 "leisure-stadium": "4Stadion|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|aréna|olimpiai stadion",
 "leisure-playground|@category_children": "Játszótér",
-"leisure-sports_centre": "4Sportközpont|sport|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportközpont|sport",
 "leisure-golf_course": "Golfpálya|U+26F3",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Szabadulószoba",
diff --git a/data/categories-strings/id.json/localize.json b/data/categories-strings/id.json/localize.json
index a52349f9c..10de6c58f 100644
--- a/data/categories-strings/id.json/localize.json
+++ b/data/categories-strings/id.json/localize.json
@@ -202,7 +202,7 @@
 "aeroway-aerodrome": "Bandar udara",
 "leisure-stadium": "4Stadion",
 "leisure-playground|@category_children": "Taman bermain",
-"leisure-sports_centre": "Olahraga",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Olahraga",
 "leisure-golf_course": "Lapangan golf",
 "leisure-escape_game": "Ruang petualangan",
 "leisure-pitch": "Lapangan olahraga|lapangan",
diff --git a/data/categories-strings/it.json/localize.json b/data/categories-strings/it.json/localize.json
index dd8ec8260..cb119024f 100644
--- a/data/categories-strings/it.json/localize.json
+++ b/data/categories-strings/it.json/localize.json
@@ -210,7 +210,7 @@
 "aeroway-aerodrome": "3Aeroporto|4aeroplano",
 "leisure-stadium": "4Stadio|4sport",
 "leisure-playground|@category_children": "Campo giochi",
-"leisure-sports_centre": "Centro sportivo|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centro sportivo|sport",
 "leisure-golf_course": "Campo da golf",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escape room",
diff --git a/data/categories-strings/ja.json/localize.json b/data/categories-strings/ja.json/localize.json
index cc3f546aa..0fe19e429 100644
--- a/data/categories-strings/ja.json/localize.json
+++ b/data/categories-strings/ja.json/localize.json
@@ -212,7 +212,7 @@
 "aeroway-aerodrome": "1空港",
 "leisure-stadium": "1スタジアム|競技場|運動場",
 "leisure-playground|@category_children": "1児童公園|公園|遊び場",
-"leisure-sports_centre": "1スポーツセンター|スポーツ|体育館|総合体育館",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "1スポーツセンター|スポーツ|体育館|総合体育館",
 "leisure-golf_course": "1ゴルフコース|ゴルフ場|ゴルフクラブ|ゴルフ",
 "leisure-miniature_golf": "ミニゴルフ",
 "leisure-escape_game": "脱出ゲーム",
diff --git a/data/categories-strings/ko.json/localize.json b/data/categories-strings/ko.json/localize.json
index b45e618ef..f7e010bfc 100644
--- a/data/categories-strings/ko.json/localize.json
+++ b/data/categories-strings/ko.json/localize.json
@@ -205,7 +205,7 @@
 "aeroway-aerodrome": "공항|비행기",
 "leisure-stadium": "경기장|스타디움",
 "leisure-playground|@category_children": "놀이터",
-"leisure-sports_centre": "스포츠 센터|스포츠",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "스포츠 센터|스포츠",
 "leisure-golf_course": "골프장|골프 코스",
 "leisure-miniature_golf": "미니골프",
 "leisure-escape_game": "방탈출",
diff --git a/data/categories-strings/lv.json/localize.json b/data/categories-strings/lv.json/localize.json
index fe4eb1d63..d1d96488b 100644
--- a/data/categories-strings/lv.json/localize.json
+++ b/data/categories-strings/lv.json/localize.json
@@ -217,7 +217,7 @@
 "aeroway-aerodrome": "3Lidosta|U+2708",
 "leisure-stadium": "Stadions|sports|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9",
 "leisure-playground|@category_children": "Rotaļu laukums|bērnu laukums|laukumiņš|bērnu rotaļu laukums",
-"leisure-sports_centre": "4Sporta centrs|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sporta centrs|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9",
 "leisure-golf_course": "Golfa laukums|U+26F3",
 "leisure-miniature_golf": "Minigolfs|minigolfa laukums",
 "leisure-escape_game": "Kvestu istaba",
@@ -321,7 +321,7 @@
 "amenity-veterinary": "4Veterinārārsts|vetārsts|vetklīnika|veterinārā klīnika",
 "@charging_station": "4Uzlādes stacija|uzlāde",
 "amenity-charging_station-bicycle|@charging_station": "4Velosipēdu uzlāde|Riteņu uzlāde|Ričuku uzlāde|Divriteņu uzlāde",
-"amenity-charging_station-motorcar|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
 "amenity-childcare": "Bērnistaba",
 "amenity-bicycle_parking": "4Velonovietne",
 "amenity-waste_basket": "Atkritumu tvertne|4miskaste",
diff --git a/data/categories-strings/mr.json/localize.json b/data/categories-strings/mr.json/localize.json
index e47445965..cc29dbf6a 100644
--- a/data/categories-strings/mr.json/localize.json
+++ b/data/categories-strings/mr.json/localize.json
@@ -206,7 +206,7 @@
 "aeroway-aerodrome": "विमानतळ",
 "leisure-stadium": "स्टेडियम",
 "leisure-playground|@category_children": "खेळाचे मैदान",
-"leisure-sports_centre": "क्रीडा केंद्र",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "क्रीडा केंद्र",
 "leisure-golf_course": "गोल्फचे मैदान",
 "leisure-miniature_golf": "मिनीगोल्फ",
 "leisure-escape_game": "एस्केप रूम",
diff --git a/data/categories-strings/nb.json/localize.json b/data/categories-strings/nb.json/localize.json
index 44e4a9db8..db62f3691 100644
--- a/data/categories-strings/nb.json/localize.json
+++ b/data/categories-strings/nb.json/localize.json
@@ -204,7 +204,7 @@
 "aeroway-aerodrome": "3Flyplass",
 "leisure-stadium": "4Stadion",
 "leisure-playground|@category_children": "Lekeplass",
-"leisure-sports_centre": "4Sportssenter",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportssenter",
 "leisure-golf_course": "Golfbane",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escape room",
diff --git a/data/categories-strings/nl.json/localize.json b/data/categories-strings/nl.json/localize.json
index e782a0958..946a4ebca 100644
--- a/data/categories-strings/nl.json/localize.json
+++ b/data/categories-strings/nl.json/localize.json
@@ -214,7 +214,7 @@
 "aeroway-aerodrome": "3Vliegveld|3vliegtuig",
 "leisure-stadium": "4Stadion|stadium|4sport|arena",
 "leisure-playground|@category_children": "Speeltuin|speelplaats",
-"leisure-sports_centre": "4Sportcentrum|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportcentrum|sport",
 "leisure-golf_course": "Golfbaan",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escaperoom",
diff --git a/data/categories-strings/pl.json/localize.json b/data/categories-strings/pl.json/localize.json
index ae6ce6094..d39a6df85 100644
--- a/data/categories-strings/pl.json/localize.json
+++ b/data/categories-strings/pl.json/localize.json
@@ -219,7 +219,7 @@
 "aeroway-aerodrome": "3Lotnisko",
 "leisure-stadium": "4Stadion|sport",
 "leisure-playground|@category_children": "4Plac zabaw",
-"leisure-sports_centre": "Centrum sportowe|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centrum sportowe|sport",
 "leisure-golf_course": "4Kurs golfowy",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Pokój zagadek",
diff --git a/data/categories-strings/pt-BR.json/localize.json b/data/categories-strings/pt-BR.json/localize.json
index 745af58e4..4cdfafd4b 100644
--- a/data/categories-strings/pt-BR.json/localize.json
+++ b/data/categories-strings/pt-BR.json/localize.json
@@ -185,7 +185,7 @@
 "aeroway-aerodrome": "3Aeroporto|aeródromo",
 "leisure-stadium": "5Estádio|esporte",
 "leisure-playground|@category_children": "Parquinho|parque infantil",
-"leisure-sports_centre": "Centro esportivo|clube|esporte|complexo esportivo",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centro esportivo|clube|esporte|complexo esportivo",
 "leisure-golf_course": "Campo de golfe",
 "leisure-escape_game": "Sala de fuga",
 "leisure-pitch": "Campo de esportes|campo|quadra|esporte",
diff --git a/data/categories-strings/pt.json/localize.json b/data/categories-strings/pt.json/localize.json
index 303d5b346..587f0ae5f 100644
--- a/data/categories-strings/pt.json/localize.json
+++ b/data/categories-strings/pt.json/localize.json
@@ -213,7 +213,7 @@
 "aeroway-aerodrome": "3Aeroporto|aeródromo|3avião",
 "leisure-stadium": "5Estádio|desporto",
 "leisure-playground|@category_children": "Parque infantil",
-"leisure-sports_centre": "Centro desportivo|desporto|complexo desportivo",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centro desportivo|desporto|complexo desportivo",
 "leisure-golf_course": "Campo de golfe",
 "leisure-miniature_golf": "Minigolfe",
 "leisure-escape_game": "Sala de fuga",
diff --git a/data/categories-strings/ro.json/localize.json b/data/categories-strings/ro.json/localize.json
index ddee159bc..ab8dcef67 100644
--- a/data/categories-strings/ro.json/localize.json
+++ b/data/categories-strings/ro.json/localize.json
@@ -203,7 +203,7 @@
 "aeroway-aerodrome": "3Aeroport",
 "leisure-stadium": "4Stadion",
 "leisure-playground|@category_children": "Loc de joacă",
-"leisure-sports_centre": "4Sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sport",
 "leisure-golf_course": "Teren de golf",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Cameră de evadare",
diff --git a/data/categories-strings/ru.json/localize.json b/data/categories-strings/ru.json/localize.json
index 2aba3918e..dedf5efd4 100644
--- a/data/categories-strings/ru.json/localize.json
+++ b/data/categories-strings/ru.json/localize.json
@@ -224,7 +224,7 @@
 "aeroway-aerodrome": "3Аэропорт|4самолёт",
 "leisure-stadium": "4Стадион|4спорт|матч|арена|спортивная арена|соревнования|чемпионат|cпорткомплекс",
 "leisure-playground|@category_children": "4Детская площадка",
-"leisure-sports_centre": "Спорткомплекс|спорт|4спортивный комплекс|арена|занятия спортом|5дворец спорта",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Спорткомплекс|спорт|4спортивный комплекс|арена|занятия спортом|5дворец спорта",
 "leisure-golf_course": "Площадка для гольфа|гольф",
 "leisure-miniature_golf": "Минигольф",
 "leisure-escape_game": "4Квест-комната",
@@ -331,7 +331,7 @@
 "amenity-animal_shelter": "Приют для животных",
 "@charging_station": "4Зарядная станция|зарядка|электрозарядка|зарядить",
 "amenity-charging_station-bicycle|@charging_station": "4Велозарядка|Зарядка для велосипедов",
-"amenity-charging_station-motorcar|@charging_station": "4Автозарядка",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Автозарядка",
 "amenity-childcare": "Детская комната|3ясли",
 "amenity-bicycle_parking": "4Велопарковка|велостоянка",
 "amenity-waste_basket": "3Урна|4Мусорная корзина",
diff --git a/data/categories-strings/sk.json/localize.json b/data/categories-strings/sk.json/localize.json
index 3f03f1f6a..dec6453e9 100644
--- a/data/categories-strings/sk.json/localize.json
+++ b/data/categories-strings/sk.json/localize.json
@@ -209,7 +209,7 @@
 "aeroway-aerodrome": "3Letisko",
 "leisure-stadium": "4Štadión|4šport",
 "leisure-playground|@category_children": "Ihrisko",
-"leisure-sports_centre": "4Športové centrum|šport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Športové centrum|šport",
 "leisure-golf_course": "Golf",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Úniková miestnosť",
diff --git a/data/categories-strings/sr.json/localize.json b/data/categories-strings/sr.json/localize.json
index bfd66445d..6b01c9366 100644
--- a/data/categories-strings/sr.json/localize.json
+++ b/data/categories-strings/sr.json/localize.json
@@ -178,7 +178,7 @@
 "aeroway-aerodrome": "Аеродром|Aerodrom",
 "leisure-stadium": "Стадион|Stadion",
 "leisure-playground|@category_children": "Игралиште|Igralište",
-"leisure-sports_centre": "Спортски центар|Sportski centar",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Спортски центар|Sportski centar",
 "leisure-golf_course": "Голф терен|Golf teren",
 "leisure-miniature_golf": "Мини-голф|Mini-golf",
 "leisure-pitch": "Спортски терен|Sportski teren",
diff --git a/data/categories-strings/sv.json/localize.json b/data/categories-strings/sv.json/localize.json
index a09a0ec53..840690fb0 100644
--- a/data/categories-strings/sv.json/localize.json
+++ b/data/categories-strings/sv.json/localize.json
@@ -211,7 +211,7 @@
 "aeroway-aerodrome": "3Flygplats|3flygplan",
 "leisure-stadium": "4Stadion|4sport",
 "leisure-playground|@category_children": "Lekplats",
-"leisure-sports_centre": "4Sportcenter|sport",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportcenter|sport",
 "leisure-golf_course": "Golfbana",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escaperoom",
diff --git a/data/categories-strings/sw.json/localize.json b/data/categories-strings/sw.json/localize.json
index 604f0e4a1..5bbdbb325 100644
--- a/data/categories-strings/sw.json/localize.json
+++ b/data/categories-strings/sw.json/localize.json
@@ -150,7 +150,7 @@
 "aeroway-aerodrome": "Uwanja wa ndege",
 "leisure-stadium": "Kiwanja cha michezo",
 "leisure-playground|@category_children": "Viwanja vya michezo",
-"leisure-sports_centre": "Viwanja vya michezo",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Viwanja vya michezo",
 "leisure-golf_course": "Uwanja wa gofu|michezo",
 "leisure-miniature_golf": "Minigofu",
 "leisure-escape_game": "Chumba cha kutoroka",
diff --git a/data/categories-strings/th.json/localize.json b/data/categories-strings/th.json/localize.json
index 6d720569d..11f365827 100644
--- a/data/categories-strings/th.json/localize.json
+++ b/data/categories-strings/th.json/localize.json
@@ -207,7 +207,7 @@
 "aeroway-aerodrome": "3สนามบิน|เครื่องบิน",
 "leisure-stadium": "สนามกีฬา",
 "leisure-playground|@category_children": "สนามเด็กเล่น",
-"leisure-sports_centre": "กีฬา",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "กีฬา",
 "leisure-golf_course": "สนามกอล์ฟ",
 "leisure-miniature_golf": "มินิกอล์ฟ",
 "leisure-escape_game": "ห้องเกมปริศนา",
diff --git a/data/categories-strings/tr.json/localize.json b/data/categories-strings/tr.json/localize.json
index 1a506e0ae..fb7b845c0 100644
--- a/data/categories-strings/tr.json/localize.json
+++ b/data/categories-strings/tr.json/localize.json
@@ -226,7 +226,7 @@
 "aeroway-aerodrome": "3Havaalanı|uçak|havalimanı",
 "leisure-stadium": "4Stadyum|arena",
 "leisure-playground|@category_children": "Oyun alanı",
-"leisure-sports_centre": "Spor Merkezi",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Spor Merkezi",
 "leisure-golf_course": "Golf sahası",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Kaçış odası",
@@ -332,7 +332,7 @@
 "amenity-veterinary": "4Veteriner",
 "@charging_station": "Şarj İstasyonu|şarj etme",
 "amenity-charging_station-bicycle|@charging_station": "4Bisiklet Şarjı",
-"amenity-charging_station-motorcar|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
 "amenity-childcare": "Çocuk Yuvası|Kreş",
 "amenity-bicycle_parking": "4Bisiklet park etme|bisiklet park",
 "amenity-waste_basket": "Çöp Kutusu",
diff --git a/data/categories-strings/uk.json/localize.json b/data/categories-strings/uk.json/localize.json
index 19a7281a3..56b898b25 100644
--- a/data/categories-strings/uk.json/localize.json
+++ b/data/categories-strings/uk.json/localize.json
@@ -220,7 +220,7 @@
 "aeroway-aerodrome": "3Аеропорт|літак|аеродром|рейс",
 "leisure-stadium": "4Стадіон|4спорт",
 "leisure-playground|@category_children": "4Дитячий майданчик",
-"leisure-sports_centre": "4Спорткомплекс|спорт|спортцентр",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Спорткомплекс|спорт|спортцентр",
 "leisure-golf_course": "Майданчик для гольфу|гольф",
 "leisure-miniature_golf": "Мінігольф",
 "leisure-escape_game": "4Квест-кімната",
diff --git a/data/categories-strings/vi.json/localize.json b/data/categories-strings/vi.json/localize.json
index 4319dc50e..9f3976e99 100644
--- a/data/categories-strings/vi.json/localize.json
+++ b/data/categories-strings/vi.json/localize.json
@@ -203,7 +203,7 @@
 "aeroway-aerodrome": "Sân bay",
 "leisure-stadium": "Sân vận động",
 "leisure-playground|@category_children": "Sân chơi",
-"leisure-sports_centre": "Thể thao",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Thể thao",
 "leisure-golf_course": "Sân gôn",
 "leisure-escape_game": "Phòng giải đố",
 "leisure-hackerspace": "Không gian tin tặc",
diff --git a/data/categories-strings/zh-Hans.json/localize.json b/data/categories-strings/zh-Hans.json/localize.json
index d6f853fb7..bd7cda567 100644
--- a/data/categories-strings/zh-Hans.json/localize.json
+++ b/data/categories-strings/zh-Hans.json/localize.json
@@ -210,7 +210,7 @@
 "aeroway-aerodrome": "机场|飞机",
 "leisure-stadium": "体育场",
 "leisure-playground|@category_children": "操场|儿童游乐场",
-"leisure-sports_centre": "运动",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "运动",
 "leisure-golf_course": "高尔夫球场",
 "leisure-miniature_golf": "迷你高尔夫",
 "leisure-escape_game": "密室逃脱",
diff --git a/data/categories-strings/zh-Hant.json/localize.json b/data/categories-strings/zh-Hant.json/localize.json
index 4e5597184..8edbd6c17 100644
--- a/data/categories-strings/zh-Hant.json/localize.json
+++ b/data/categories-strings/zh-Hant.json/localize.json
@@ -212,7 +212,7 @@
 "aeroway-aerodrome": "1機場|2航空站|3航空公司|2飛機場",
 "leisure-stadium": "1體育中心|2運動場|2體育館|體育|運動",
 "leisure-playground|@category_children": "1遊樂場",
-"leisure-sports_centre": "1體育中心|2體育館|體育|運動|健身",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "1體育中心|2體育館|體育|運動|健身",
 "leisure-golf_course": "3高爾夫球場|2高爾夫球|高爾夫|體育|運動",
 "leisure-escape_game": "密室逃脫",
 "leisure-hackerspace": "駭客空間",
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 1a2d450c3..d9cd35cb8 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -301,7 +301,7 @@ railway|crossing;197;
 boundary|national_park;198;
 deprecated:natural|wood|deciduous:01.2020;[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];x;name;int_name;199;landuse|forest|deciduous
 waterway|dam;200;
-amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;int_name;201;
+amenity|charging_station|motorcar|small;[amenity=charging_station][motorcar?][!capacity],[amenity=charging_station][motorcar?][capacity=1],[amenity=charging_station][motorcar?][capacity=2];;name;int_name;201;
 leisure|golf_course;202;
 highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
 # ~250K usages.
@@ -410,7 +410,7 @@ man_made|storage_tank;301;
 man_made|silo;302;
 power|generator;303;
 highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;
-deprecated:man_made|pipeline|overground:02.2022;[man_made=pipeline][location=overground];x;name;int_name;305;man_made|pipeline
+amenity|charging_station|motorcar;[amenity=charging_station][motorcar?][capacity?];;name;int_name;305;
 natural|saddle;306;
 mountain_pass;[mountain_pass];;name;int_name;307;
 highway|raceway;308;
@@ -609,7 +609,7 @@ boundary|protected_area|6;[boundary=protected_area][protect_class=6];;name;int_n
 leisure|park|permissive;[leisure=park][access=permissive];;name;int_name;487;
 highway|bridleway|tunnel;[highway=bridleway][tunnel?];;name;int_name;488;
 highway|motorway_link|tunnel;[highway=motorway_link][tunnel?];;name;int_name;489;
-deprecated|deprecated;490;x
+leisure|fitness_centre|sport|yoga;[leisure=fitness_centre][sport=yoga];;name;int_name;490;
 deprecated|deprecated;491;x
 deprecated|deprecated;492;x
 highway|tertiary_link|bridge;[highway=tertiary_link][bridge?];;name;int_name;493;
@@ -878,38 +878,38 @@ landuse|flowerbed;752;
 deprecated|OM;753;x
 # Used for barrier|wicket_gate in OM
 deprecated|OM;754;x
-deprecated|deprecated;755;x
-deprecated|deprecated;756;x
-deprecated|deprecated;757;x
-deprecated|deprecated;758;x
-deprecated|deprecated;759;x
-deprecated|deprecated;760;x
-deprecated|deprecated;761;x
-deprecated|deprecated;762;x
-deprecated|deprecated;763;x
-deprecated|deprecated;764;x
-deprecated|deprecated;765;x
-deprecated|deprecated;766;x
-deprecated|deprecated;767;x
-deprecated|deprecated;768;x
-deprecated|deprecated;769;x
-deprecated|deprecated;770;x
-deprecated|deprecated;771;x
-deprecated|deprecated;772;x
-deprecated|deprecated;773;x
-deprecated|deprecated;774;x
-deprecated|deprecated;775;x
-deprecated|deprecated;776;x
-deprecated|deprecated;777;x
-deprecated|deprecated;778;x
-deprecated|deprecated;779;x
-deprecated|deprecated;780;x
-deprecated|deprecated;781;x
-deprecated|deprecated;782;x
-deprecated|deprecated;783;x
-deprecated|deprecated;784;x
-deprecated|deprecated;785;x
-deprecated|deprecated;786;x
+leisure|sports_centre|sport|american_football;[leisure=sports_centre][sport=american_football];;name;int_name;755;
+leisure|sports_centre|sport|athletics;[leisure=sports_centre][sport=athletics];;name;int_name;756;
+leisure|sports_centre|sport|badminton;[leisure=sports_centre][sport=badminton];;name;int_name;757;
+leisure|sports_centre|sport|baseball;[leisure=sports_centre][sport=baseball];;name;int_name;758;
+leisure|sports_centre|sport|basketball;[leisure=sports_centre][sport=basketball];;name;int_name;759;
+leisure|sports_centre|sport|beachvolleyball;[leisure=sports_centre][sport=beachvolleyball];;name;int_name;760;
+leisure|sports_centre|sport|climbing;[leisure=sports_centre][sport=climbing];;name;int_name;761;
+leisure|sports_centre|sport|field_hockey;[leisure=sports_centre][sport=field_hockey];;name;int_name;762;
+leisure|sports_centre|sport|golf;[leisure=sports_centre][sport=golf];;name;int_name;763;
+leisure|sports_centre|sport|gymnastics;[leisure=sports_centre][sport=gymnastics];;name;int_name;764;
+leisure|sports_centre|sport|handball;[leisure=sports_centre][sport=handball];;name;int_name;765;
+leisure|sports_centre|sport|ice_hockey;[leisure=sports_centre][sport=ice_hockey];;name;int_name;766;
+leisure|sports_centre|sport|padel;[leisure=sports_centre][sport=padel];;name;int_name;767;
+leisure|sports_centre|sport|pelota;[leisure=sports_centre][sport=pelota];;name;int_name;768;
+leisure|sports_centre|sport|skateboard;[leisure=sports_centre][sport=skateboard];;name;int_name;769;
+leisure|sports_centre|sport|skiing;[leisure=sports_centre][sport=skiing];;name;int_name;770;
+leisure|sports_centre|sport|swimming;[leisure=sports_centre][sport=swimming];;name;int_name;771;
+leisure|sports_centre|sport|table_tennis;[leisure=sports_centre][sport=table_tennis];;name;int_name;772;
+leisure|sports_centre|sport|tennis;[leisure=sports_centre][sport=tennis];;name;int_name;773;
+leisure|sports_centre|sport|volleyball;[leisure=sports_centre][sport=volleyball];;name;int_name;774;
+leisure|sports_centre|sport|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;775;
+leisure|sports_centre|sport|archery;[leisure=sports_centre][sport=archery];;name;int_name;776;
+leisure|sports_centre|sport|australian_football;[leisure=sports_centre][sport=australian_football];;name;int_name;777;
+leisure|sports_centre|sport|bowls;[leisure=sports_centre][sport=bowls];;name;int_name;778;
+leisure|sports_centre|sport|cricket;[leisure=sports_centre][sport=cricket];;name;int_name;779;
+leisure|sports_centre|sport|curling;[leisure=sports_centre][sport=curling];;name;int_name;780;
+leisure|sports_centre|sport|equestrian;[leisure=sports_centre][sport=equestrian];;name;int_name;781;
+leisure|sports_centre|sport|futsal;[leisure=sports_centre][sport=futsal];;name;int_name;782;
+leisure|sports_centre|sport|scuba_diving;[leisure=sports_centre][sport=scuba_diving];;name;int_name;783;
+leisure|sports_centre|sport|shooting;[leisure=sports_centre][sport=shooting];;name;int_name;784;
+leisure|sports_centre|sport|multi;[leisure=sports_centre][sport=multi];;name;int_name;785;
+leisure|sports_centre|sport|soccer;[leisure=sports_centre][sport=soccer];;name;int_name;786;
 deprecated|deprecated;787;x
 deprecated|deprecated;788;x
 deprecated|deprecated;789;x
@@ -1230,10 +1230,10 @@ shop|paint;1101;
 traffic_calming|bump;1102;
 traffic_calming|hump;1103;
 shop|car_parts;1104;
-leisure|sports_centre|climbing;[leisure=sports_centre][sport=climbing];x;name;int_name;1105;leisure|sports_centre
-leisure|sports_centre|shooting;[leisure=sports_centre][sport=shooting];x;name;int_name;1106;leisure|sports_centre
-leisure|sports_centre|swimming;[leisure=sports_centre][sport=swimming];x;name;int_name;1107;leisure|sports_centre
-leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];x;name;int_name;1108;leisure|sports_centre
+deprecated|deprecated;1105;x
+deprecated|deprecated;1106;x
+deprecated|deprecated;1107;x
+deprecated|deprecated;1108;x
 amenity|public_bookcase;1109;
 tourism|apartment;1110;
 leisure|resort;[leisure=resort],[tourism=resort],[leisure=summer_camp];;name;int_name;1111;
diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index 7dcf77558..19750c545 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -231,11 +231,16 @@
 @subway_label: #9E9E9E;
 @indigenous_label: #6A512F;
 @shop_label: #6B425C;
+@industry_label: #574469;
 @food_label: #8C491C;
+@entertainment_label: #8C311B;
 @culture_label: #6E4426;
 @hotel_label: #614A43;
+@sport_label: #2B5C4B;
+@nature_label: #3C612E;
+@water_label: #0A6074;
+@neutral_label: #51585E;
 @healthcare_label: #983E44;
-@industry_label: #51585E;
 @public_transport_label: #2F6499;
 
 /* 6.4 Road labels */
diff --git a/data/styles/default/dark/symbols/america-football-centre-m.svg b/data/styles/default/dark/symbols/america-football-centre-m.svg
new file mode 100644
index 000000000..b31aa66ef
--- /dev/null
+++ b/data/styles/default/dark/symbols/america-football-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m3.375 9c.354075.878875.9090625 1.657375 1.607125 2.275125v-4.55025c-.698125.61774375-1.2530625 1.3961875-1.607125 2.275125zm11.25 0c-.354075-.8789375-.9090625-1.657375-1.607125-2.275125v4.55025c.698125-.6177438 1.2530625-1.3961875 1.607125-2.275125zm-5.625-3.790625c-1.18275 0-2.285125.33649375-3.2143125.9165625v5.7480625c.929125.580075 2.0315.9165625 3.2143125.9165625s2.285125-.3364938 3.2143125-.9165625v-5.7480625c-.8576538-.53545385-1.862929-.86335385-2.9428259-.91063163zm2.4106875 2.5865v2.4106875h-.8035625v-.8035625h-1.205375v.8035625h-.8035625v-.8035625h-1.205375v.8035625h-.8035625v-2.4106875h.8035625v.8035625h1.205375v-.8035625h.8035625v.8035625h1.205375v-.8035625z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/america-football-m.svg b/data/styles/default/dark/symbols/america-football-m.svg
index bb0ea1eb9..9a31e7c03 100644
--- a/data/styles/default/dark/symbols/america-football-m.svg
+++ b/data/styles/default/dark/symbols/america-football-m.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>america-football-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="america-football-m" fill="#777777" fill-rule="nonzero" stroke-width="1.5">
-   <g id="Group" transform="translate(6 9.6071)">
-    <path id="Path" d="m-3 2.3929c0.56652 1.4062 1.4545 2.6518 2.5714 3.6402v-7.2804c-1.117 0.98839-2.0049 2.2339-2.5714 3.6402z"/>
-    <path d="m15 2.3929c-0.56652-1.4063-1.4545-2.6518-2.5714-3.6402v7.2804c1.117-0.98839 2.0049-2.2339 2.5714-3.6402z"/>
-   </g>
-   <path id="Shape" d="m12 5.935c-1.8924 0-3.6562 0.53839-5.1429 1.4665v9.1969c1.4866 0.92812 3.2504 1.4665 5.1429 1.4665s3.6562-0.53839 5.1429-1.4665v-9.1969c-1.4866-0.92812-3.2504-1.4665-5.1429-1.4665zm3.8571 5.4241v2.5714h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-3.8571h1.2857v1.2857h1.9286v-1.2857h1.2857v1.2857h1.9286v-1.2857h1.2857z"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m2.25 9c.42489 1.05465 1.090875 1.98885 1.92855 2.73015v-5.4603c-.83775.7412925-1.503675 1.675425-1.92855 2.73015zm13.5 0c-.42489-1.054725-1.090875-1.98885-1.92855-2.73015v5.4603c.83775-.7412925 1.503675-1.675425 1.92855-2.73015zm-6.75-4.54875c-1.4193 0-2.74215.4037925-3.857175 1.099875v6.897675c1.11495.69609 2.4378 1.099875 3.857175 1.099875s2.74215-.4037925 3.857175-1.099875v-6.897675c-1.0291846-.64254462-2.2355148-1.03602462-3.53139108-1.09275796zm2.892825 3.1038v2.892825h-.964275v-.964275h-1.44645v.964275h-.964275v-.964275h-1.44645v.964275h-.964275v-2.892825h.964275v.964275h1.44645v-.964275h.964275v.964275h1.44645v-.964275z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/animal-m.svg b/data/styles/default/dark/symbols/animal-m.svg
index 4fb78817a..cb5dc0bba 100644
--- a/data/styles/default/dark/symbols/animal-m.svg
+++ b/data/styles/default/dark/symbols/animal-m.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="0 0 24 24"
-   width="18"
-   height="18"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <title
-     id="title1">animal-m</title>
-  <path
-     id="Path"
-     d="M 16.069622,1.670709 C 13.882633,4.8501398 13.571882,7.5052255 11.149025,9.6194413 8.8344727,11.63888 4.5882073,10.945616 4.5882073,13.858771 v 1.059733 c 0,1.059883 1.0934782,2.068306 1.0934782,3.179442 v 1.059883 c 0,1.589704 -0.5467534,1.589704 -1.0934782,3.179426 h 1.0934782 l 2.1869842,-3.179426 v 3.179426 h 1.640192 v -6.359018 h 1.6402033 v 6.359018 h 1.640205 v -4.769297 l 1.640205,4.769297 h 1.093492 l -1.674454,-6.657053 c 0.644611,-0.381233 0.58092,-1.085969 0.58092,-1.821488 v -3.179419 l 2.460359,-5.8292145 2.460373,0.7948732 c 0,-0.074715 -8.44e-4,-0.734467 0,-0.7948732 0,0 -0.399405,-0.3871019 -0.546738,-0.5298655 L 16.069669,1.670589 Z"
-     fill="#6E4426"
-     style="stroke-width:1.47601" />
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.069622 1.670709c-2.186989 3.1794308-2.49774 5.8345165-4.920597 7.9487323-2.3145523 2.0194387-6.5608177 1.3261747-6.5608177 4.2393297v1.059733c0 1.059883 1.0934782 2.068306 1.0934782 3.179442v1.059883c0 1.589704-.5467534 1.589704-1.0934782 3.179426h1.0934782l2.1869842-3.179426v3.179426h1.640192v-6.359018h1.6402033v6.359018h1.640205v-4.769297l1.640205 4.769297h1.093492l-1.674454-6.657053c.644611-.381233.58092-1.085969.58092-1.821488v-3.179419l2.460359-5.8292145 2.460373.7948732c0-.074715-.000844-.734467 0-.7948732 0 0-.399405-.3871019-.546738-.5298655l-2.733758-2.649626z" fill="#51585E" stroke-width="1.47601"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/aquarium-m.svg b/data/styles/default/dark/symbols/aquarium-m.svg
index c46ae89ce..2dc21030c 100644
--- a/data/styles/default/dark/symbols/aquarium-m.svg
+++ b/data/styles/default/dark/symbols/aquarium-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
+ <circle cx="12" cy="12" r="11" fill="#802D19"/>
  <path d="m12.95 8c-2.1868 0-4.0964 1.3312-5.1593 2.4702l-2.1226-1.6054c-0.29483-0.22312-0.735 0.014583-0.65965 0.35632l0.58771 2.6678-0.58795 2.668c-0.075347 0.34174 0.36483 0.5792 0.65965 0.35632l2.1226-1.6054c1.0629 1.1387 2.9728 2.4699 5.1596 2.4699 3.341 0 6.0496-3.1111 6.0496-3.8889s-2.7086-3.8889-6.0496-3.8889zm2.125 4.4722c-0.32205 0-0.58333-0.26128-0.58333-0.58333 0-0.32229 0.26128-0.58333 0.58333-0.58333 0.32229 0 0.58333 0.26104 0.58333 0.58333 0 0.32205-0.26128 0.58333-0.58333 0.58333z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/arcade-m.svg b/data/styles/default/dark/symbols/arcade-m.svg
index b1132ee88..c6c01731a 100644
--- a/data/styles/default/dark/symbols/arcade-m.svg
+++ b/data/styles/default/dark/symbols/arcade-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
- <path d="m4.4472 4.9836v2.158h4.3159v-2.158zm10.79 0v2.158h4.3159v-2.158zm-6.4738 2.1622v2.1579h2.1579v-2.1579zm4.3159 0v2.1579h2.1579v-2.1579zm-6.4738 2.16v2.1579h-2.1579v7.5528h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-7.5528h-2.1579v-2.1579zm2.1579 2.1579h2.1579v2.1579h-2.1579zm4.3159 0h2.1579v2.1579h-2.1579z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m4.4472 4.9836v2.158h4.3159v-2.158zm10.79 0v2.158h4.3159v-2.158zm-6.4738 2.1622v2.1579h2.1579v-2.1579zm4.3159 0v2.1579h2.1579v-2.1579zm-6.4738 2.16v2.1579h-2.1579v7.5528h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-7.5528h-2.1579v-2.1579zm2.1579 2.1579h2.1579v2.1579h-2.1579zm4.3159 0h2.1579v2.1579h-2.1579z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/archery-centre-m.svg b/data/styles/default/dark/symbols/archery-centre-m.svg
new file mode 100644
index 000000000..896935e73
--- /dev/null
+++ b/data/styles/default/dark/symbols/archery-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9 3.375c-3.106625 0-5.625 2.5184375-5.625 5.625s2.518375 5.625 5.625 5.625c3.1065625 0 5.625-2.5184375 5.625-5.625s-2.5184375-5.625-5.625-5.625zm0 1.125c2.4853125 0 4.5 2.0146875 4.5 4.5s-2.0146875 4.5-4.5 4.5-4.5-2.0146875-4.5-4.5 2.0146875-4.5 4.5-4.5zm0 1.125c-1.8639375 0-3.375 1.5110625-3.375 3.375s1.5110625 3.375 3.375 3.375 3.375-1.5110625 3.375-3.375-1.5110625-3.375-3.375-3.375zm0 1.125c1.242625 0 2.25 1.007375 2.25 2.25s-1.007375 2.25-2.25 2.25-2.25-1.007375-2.25-2.25 1.007375-2.25 2.25-2.25zm0 1.125c-.6213375 0-1.125.5036625-1.125 1.125s.5036625 1.125 1.125 1.125 1.125-.5036625 1.125-1.125-.5036625-1.125-1.125-1.125z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/archery-m.svg b/data/styles/default/dark/symbols/archery-m.svg
index 9cfe66bca..a56c2328f 100644
--- a/data/styles/default/dark/symbols/archery-m.svg
+++ b/data/styles/default/dark/symbols/archery-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>archery-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="archery-m" fill-rule="nonzero">
-   <path id="Shape" d="m12 3c-4.9706 0-9 4.0295-9 9s4.0294 9 9 9c4.9705 0 9-4.0295 9-9s-4.0295-9-9-9zm0 1.8c3.9765 0 7.2 3.2235 7.2 7.2s-3.2235 7.2-7.2 7.2c-3.9765 0-7.2-3.2235-7.2-7.2s3.2235-7.2 7.2-7.2zm0 1.8c-2.9823 0-5.4 2.4177-5.4 5.4s2.4177 5.4 5.4 5.4c2.9823 0 5.4-2.4177 5.4-5.4s-2.4177-5.4-5.4-5.4zm0 1.8c1.9882 0 3.6 1.6118 3.6 3.6s-1.6118 3.6-3.6 3.6c-1.9882 0-3.6-1.6118-3.6-3.6s1.6118-3.6 3.6-3.6zm0 1.8c-0.99414 0-1.8 0.80586-1.8 1.8s0.80586 1.8 1.8 1.8 1.8-0.80586 1.8-1.8-0.80586-1.8-1.8-1.8z" fill="#777777" stroke-width="1.2857"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c-3.72795 0-6.75 3.022125-6.75 6.75s3.02205 6.75 6.75 6.75c3.727875 0 6.75-3.022125 6.75-6.75s-3.022125-6.75-6.75-6.75zm0 1.35c2.982375 0 5.4 2.417625 5.4 5.4s-2.417625 5.4-5.4 5.4-5.4-2.417625-5.4-5.4 2.417625-5.4 5.4-5.4zm0 1.35c-2.236725 0-4.05 1.813275-4.05 4.05s1.813275 4.05 4.05 4.05 4.05-1.813275 4.05-4.05-1.813275-4.05-4.05-4.05zm0 1.35c1.49115 0 2.7 1.20885 2.7 2.7s-1.20885 2.7-2.7 2.7-2.7-1.20885-2.7-2.7 1.20885-2.7 2.7-2.7zm0 1.35c-.745605 0-1.35.604395-1.35 1.35s.604395 1.35 1.35 1.35 1.35-.604395 1.35-1.35-.604395-1.35-1.35-1.35z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/atm-m.svg b/data/styles/default/dark/symbols/atm-m.svg
index 673324e83..d1d02f4a8 100644
--- a/data/styles/default/dark/symbols/atm-m.svg
+++ b/data/styles/default/dark/symbols/atm-m.svg
@@ -1,13 +1,7 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>atm-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="atm-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <g id="bx-credit-card" transform="translate(7 8)" fill="#000">
-    <path id="Shape" d="m9 0h-8c-0.5515 0-1 0.4485-1 1v6c0 0.5515 0.4485 1 1 1h8c0.5515 0 1-0.4485 1-1v-6c0-0.5515-0.4485-1-1-1zm-8 1h8v1h-8v-1zm0 6v-3h8.0005l5e-4 3h-8.001z"/>
-    <polygon id="Path" points="2 5 5 5 5 6 2 6"/>
-   </g>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>atm-m</title>
+    <g id="atm-m" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M13.8,4.2 C14.4618,4.2 15,4.7382 15,5.4 L15,12.6 C15,13.2618 14.4618,13.8 13.8,13.8 L4.2,13.8 C3.5382,13.8 3,13.2618 3,12.6 L3,5.4 C3,4.7382 3.5382,4.2 4.2,4.2 L13.8,4.2 Z M13.8006,9 L4.2,9 L4.2,12.6 L13.8012,12.6 L13.8006,9 Z M9,10.2 L9,11.4 L5.4,11.4 L5.4,10.2 L9,10.2 Z M13.8,5.4 L4.2,5.4 L4.2,6.6 L13.8,6.6 L13.8,5.4 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/australian-football-centre-m.svg b/data/styles/default/dark/symbols/australian-football-centre-m.svg
new file mode 100644
index 000000000..e4e5294bd
--- /dev/null
+++ b/data/styles/default/dark/symbols/australian-football-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m13.5900833 5.15308333c-.0943529-.35776-.3754508-.63884166-.7332-.73520416-.4698091-.1258075-1.2030416-.27519917-2.0600666-.29289542l3.0783458 3.08224583c-.0157219-.855075-.1611892-1.584375-.2850304-2.0541625zm-9.18016663 7.69383337c.09435291.35776.37545625.6388416.7332.7352041.46980916.1258075 1.20304166.2751992 2.06006666.2928954l-3.07834583-3.0822458c.01572621.855075.16118917 1.584375.28503042 2.0541625zm-.20246959-3.30833753 4.24991667 4.25777083c2.60460415-.3813496 4.89070835-2.3333375 5.33693335-5.33498333l-4.25186668-4.25777084c-2.60460417.38134959-4.89070834 2.3333375-5.33498334 5.33498334zm6.23729162-2.42964584c.0609376-.0609375.1611892-.0609375.2221267 0l.2221267.22212667c.0609375.0609375.0609375.16118917 0 .22212667l-.5562917.55629166.5562917.55629167c.0609375.0609375.0609375.16118917 0 .22212667l-.2221267.22212666c-.0609375.0609375-.1611891.0609375-.2221267 0l-.55629162-.55629166-.44425333.44621958.55629165.55629167c.0609375.0609375.0609375.16118916 0 .22212666l-.22212665.22212672c-.0609375.0609375-.16118917.0609375-.22212667 0l-.55629166-.55629172-.44425334.44425334.55629167.55629168c.0609375.0609375.0609375.1611892 0 .2221267l-.22212667.2221266c-.0609375.0609375-.16118916.0609375-.22212666 0l-.55629167-.5562916-.55629167.5562916c-.0609375.0609375-.16118916.0609375-.22212666 0l-.22212667-.2221266c-.0609375-.0609375-.0609375-.1611892 0-.2221267l.55629167-.55629168-.55629167-.55434167c-.0609375-.0609375-.0609375-.16118917 0-.22212667l.22212667-.22212666c.0609375-.0609375.16118916-.0609375.22212666 0l.55629167.55629166.44425333-.44425333-.55629166-.55629167c-.0609375-.0609375-.0609375-.16118916 0-.22212666l.22212666-.22212667c.0609375-.0609375.16118917-.0609375.22212667 0l.55629167.55629167.44425333-.44425334-.55629167-.55629166c-.0609375-.0609375-.0609375-.16118917 0-.22212667l.22212667-.22212667c.0609375-.0609375.16118917-.0609375.22212667 0l.55629166.55629167z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/australian-football-m.svg b/data/styles/default/dark/symbols/australian-football-m.svg
index 83377725c..0533aebe9 100644
--- a/data/styles/default/dark/symbols/australian-football-m.svg
+++ b/data/styles/default/dark/symbols/australian-football-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>australian-football-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="australian-football-m" fill-rule="nonzero">
-   <path id="Shape" d="m20.474 4.898c-0.17419-0.66048-0.69314-1.1794-1.3536-1.3573-0.86734-0.23226-2.221-0.50806-3.8032-0.54073l5.6831 5.6903c-0.029025-1.5786-0.29758-2.925-0.52621-3.7923zm-16.948 14.204c0.17419 0.66048 0.69315 1.1794 1.3536 1.3573 0.86734 0.23226 2.221 0.50806 3.8032 0.54073l-5.6831-5.6903c0.029033 1.5786 0.29758 2.925 0.52621 3.7923zm-0.37379-6.1077 7.846 7.8605c4.8085-0.70403 9.029-4.3077 9.8528-9.8492l-7.8496-7.8605c-4.8085 0.70403-9.029 4.3077-9.8492 9.8492zm11.515-4.4855c0.1125-0.1125 0.29758-0.1125 0.41008 0l0.41008 0.41008c0.1125 0.1125 0.1125 0.29758 0 0.41008l-1.027 1.027 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82379 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82016 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-1.027 1.027c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-0.41008-0.41008c-0.1125-0.1125-0.1125-0.29758 0-0.41008l1.027-1.027-1.027-1.0234c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027z" fill="#777777" stroke-width="1.5"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m15.3555 3.6735c-.1306425-.49536-.519855-.88455-1.0152-1.017975-.650505-.174195-1.66575-.381045-2.8524-.4055475l4.262325 4.267725c-.0217687-1.18395-.223185-2.19375-.3946575-2.844225zm-12.711 10.653c.1306425.49536.5198625.88455 1.0152 1.017975.650505.174195 1.66575.381045 2.8524.4055475l-4.262325-4.267725c.02177475 1.18395.223185 2.19375.3946575 2.844225zm-.2803425-4.580775 5.8845 5.895375c3.606375-.5280225 6.77175-3.230775 7.3896-7.3869l-5.8872-5.895375c-3.606375.5280225-6.77175 3.230775-7.3869 7.3869zm8.63625-3.364125c.084375-.084375.223185-.084375.30756 0l.30756.30756c.084375.084375.084375.223185 0 .30756l-.77025.77025.77025.77025c.084375.084375.084375.223185 0 .30756l-.30756.30756c-.084375.084375-.223185.084375-.30756 0l-.77025-.77025-.61512.6178425.77025.77025c.084375.084375.084375.223185 0 .30756l-.30756.30756c-.084375.084375-.223185.084375-.30756 0l-.77025-.77025-.61512.61512.77025.77025c.084375.084375.084375.223185 0 .30756l-.30756.30756c-.084375.084375-.223185.084375-.30756 0l-.77025-.77025-.77025.77025c-.084375.084375-.223185.084375-.30756 0l-.30756-.30756c-.084375-.084375-.084375-.223185 0-.30756l.77025-.77025-.77025-.76755c-.084375-.084375-.084375-.223185 0-.30756l.30756-.30756c.084375-.084375.223185-.084375.30756 0l.77025.77025.61512-.61512-.77025-.77025c-.084375-.084375-.084375-.223185 0-.30756l.30756-.30756c.084375-.084375.223185-.084375.30756 0l.77025.77025.61512-.61512-.77025-.77025c-.084375-.084375-.084375-.223185 0-.30756l.30756-.30756c.084375-.084375.223185-.084375.30756 0l.77025.77025z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/badminton-centre-m.svg b/data/styles/default/dark/symbols/badminton-centre-m.svg
new file mode 100644
index 000000000..859cfeafe
--- /dev/null
+++ b/data/styles/default/dark/symbols/badminton-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m12.7313508 9.82556299c.1056601-.04571972.1933655-.04626856.2727698-.00191111.2382375.13307232.4073221.67024232.8039762 1.59928862l.67281 1.5725036-.0631696.1272899-.0065015.0212053c-.0132124.0323449-.0513542.092849-.1552474.117571l-.058347.0112987c-.0455174.0073375-.1053065.0144405-.1855655.0222397l-2.2990448.1808494-.2344888.1004951c-.6929012.2982318-1.3148903.0737004-1.55525454-.5857318-.21353741-.585729.05236021-1.0929947.68808144-1.414016l.2033508-.0959897c.1161228-.0638878.2576594-.1934694.9892017-.8578153l.5179985-.4843062c.1681828-.15611166.2964157-.26406541.4094307-.31297121zm-1.8528836 2.28265391-.0775275.0335081c-.5620782.2442796-.4176666 1.0364509.1741907.9896139.0429559-.0033812.1113398-.0205996.1792193-.0446945l.1241773-.051013zm-.1787822-8.82937389c1.6767328.00719254 2.9148895 1.37226679 2.6310156 3.18140547-.4214251 2.68423767-3.61705232 4.33764022-5.55987095 2.87603019l-.14164783-.10623833-1.46719633 1.46626526.04402422.0708239c.05256053.0850446.0588378.2396929.0133974.3254088-.01778806.0335379-.24163156.2656084-.53102621.5571036l-.85946905.8506962c-.28614068.2782313-.50990651.4893976-.53708347.5006188-.07919852.0326996-.14653833.0349195-.24118746.0076591-.16189584-.0466115-.42303238-.3740784-.42303238-.5302115 0-.0804628.1999662-.3232331.44313338-.5761763l.84128207-.8527488c.66496545-.6640648.72938656-.7172411.92178802-.6260929l.12143017.0604719 1.41133314-1.42298819c.02749365-.02927165.04248539-.04615148.04248539-.0480794 0-.00449602-.00809283-.01863336-.02123173-.03773776l-.0515082-.0675401c-.97011074-1.1709737-.65757013-3.19655826.69197019-4.485874.1378354-.13168456.25317808-.23377606.34901869-.30724547l.19804252-.14357402c.05926658-.04134743.14115535-.09480839.26550515-.16650456l.20745508-.11474155c.07492791-.0406859.1558354-.08220607.24333256-.1197472.10914909-.04632246.25359009-.09525677.43834579-.14930699.26696789-.07810477.52855404-.12274643.78149194-.13681348zm2.9525703 9.28394759-.2796376-.6526925-1.6251328.70058.1177197.2708587 1.8567696-.1464305zm-.8807074-2.0289934-1.3800937 1.2499664.1186802.2756414 1.6241527-.7005898-.2625083-.6074548c-.0438536-.0990676-.0752525-.1668059-.1002309-.2175632zm-2.0414076-6.53811121h-.1359341c-.68584483.02097325-1.44073476.32488934-2.0883573.9542338-1.62327062 1.57745289-1.24119488 3.99098374.66516559 4.20067702 1.71426901.18856323 3.47528681-1.43201223 3.47328111-3.19665626-.0013755-1.226445-.8604456-1.9324604-1.9141553-1.95825456z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/badminton-m.svg b/data/styles/default/dark/symbols/badminton-m.svg
index d931824a0..2a0cd275f 100644
--- a/data/styles/default/dark/symbols/badminton-m.svg
+++ b/data/styles/default/dark/symbols/badminton-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(.84005 0 0 .84005 -30.981 -1.1458)" fill="#777777"><path d="m54.633 4.9941c-0.63366-0.00271-1.2975 0.089825-1.9785 0.28906-0.37703 0.1103-0.67179 0.21016-0.89453 0.30469-0.35711 0.15322-0.66043 0.33892-0.91992 0.47852-0.50752 0.29262-0.66844 0.43639-0.80664 0.53125-0.22008 0.15106-0.49996 0.39261-0.85156 0.72852-2.754 2.6311-3.3918 6.7647-1.4121 9.1543 0.08238 0.09944 0.14844 0.19649 0.14844 0.21484 0 0.01836-0.66626 0.70121-1.4824 1.5176l-1.4844 1.4844-0.17969-0.08984c-0.44992-0.22778-0.51682-0.18634-1.9492 1.2441-0.57055 0.57351-1.129 1.1393-1.7168 1.7402-0.49623 0.51618-0.9043 1.0116-0.9043 1.1758 0 0.31862 0.5329 0.98688 0.86328 1.082 0.19315 0.05563 0.33057 0.0511 0.49219-0.01563 0.16382-0.06764 3.828-3.6954 3.9336-3.8945 0.09273-0.17492 0.07992-0.49051-0.02734-0.66406l-0.08984-0.14453 1.498-1.4961 1.4961-1.4961 0.28906 0.2168c3.9647 2.9827 10.486-0.39139 11.346-5.8691 0.5793-3.6919-1.9474-6.4776-5.3691-6.4922zm-0.21484 1.4629c0.09331-0.0029 0.18539-0.0023 0.27734 0 2.1503 0.052538 3.9034 1.4933 3.9062 3.9961 0.0041 3.6011-3.5896 6.9082-7.0879 6.5234-3.8903-0.42792-4.67-5.3532-1.3574-8.5723 1.3216-1.2843 2.8621-1.9045 4.2617-1.9473z" stroke-width=".038977"/><path d="m59.336 18.35c-0.16204-0.09052-0.34102-0.0894-0.55664 0.0039-0.42282 0.18297-0.95002 0.77095-1.8926 1.627-1.8246 1.657-1.8506 1.6838-2.1816 1.8281-1.4777 0.64466-2.1192 1.7339-1.6562 3.0039 0.49051 1.3457 1.7598 1.8039 3.1738 1.1953l0.47852-0.20508 2.4824-0.19336c1.8068-0.13958 2.4393-0.18043 2.707-0.24414 0.29682-0.07063 0.33065-0.28438 0.33008-0.2832l0.12891-0.25976-1.373-3.209c-0.80945-1.8959-1.1545-2.9921-1.6406-3.2637zm-0.47461 1.4492c0.07646 0.15536 0.1824 0.3887 0.35938 0.79883l0.38086 0.88477-1.6582 0.7168-1.6562 0.71289-0.10742-0.25-0.13477-0.3125 1.418-1.2871c0.75068-0.68216 1.2596-1.1386 1.3984-1.2637zm1.2266 2.8086 0.37891 0.88086c0.14357 0.33271 0.25641 0.60261 0.32812 0.78906 0.0019 0.0049 4e-3 0.0089 0.0059 0.01367-0.23363 0.01817-0.86052 0.0678-1.8594 0.14648l-1.9297 0.15234-0.13281-0.30469-0.10742-0.24805 1.6582-0.71484zm-5.0898 0.4043 0.4082 0.94726 0.4082 0.94531-0.11719 0.05078c-0.17594 0.07593-0.38507 0.13533-0.50195 0.14453-1.2078 0.09558-1.5025-1.521-0.35547-2.0195z" stroke-width=".048325"/></g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.797451 10.7042953c.1358487-.0587825.2486128-.0594882.3507041-.0024572.3063053.171093.5236998.8617401 1.0336836 2.0562282l.8650415 2.0217903-.0812181.1636586-.008359.0272639c-.0169874.0415863-.0660268.1193773-.1996038.1511627l-.0750177.0145269c-.0585223.009434-.135394.0185663-.2385841.0285939l-2.9559148.2325206-.3014855.1292081c-.8908731.3834408-1.6905734.0947576-1.9996131-.7530838-.27454807-.7530801.0673203-1.4052789.8846762-1.8180206l.261451-.1234153c.1493008-.0821415.3312764-.2487463 1.2718308-1.1029053l.665998-.6226794c.216235-.2007151.381106-.3395127.5264109-.4023916zm-2.3822789 2.9348407-.0996782.0430819c-.7226719.3140737-.5369999 1.3325797.2239594 1.2723607.0552291-.0043472.1431512-.0264852.2304248-.0574644l.1596566-.0655882zm-.2298628-11.35205214c2.1557993.00924757 3.747715 1.76434303 3.3827343 4.09037848-.5418323 3.45116271-4.65049581 5.57696596-7.14840548 3.69775306l-.18211864-.1365921-1.88639528 1.8851982.05660257.0910593c.06757782.109343.0756486.3081766.01722522.4183827-.02287036.0431202-.31066914.3414965-.68274798.7162761l-1.10503163 1.0937522c-.36789517.3577261-.65559408.6292256-.6905359.6436528-.10182666.0420424-.18840641.0448964-.31009815.0098475-.20815179-.0599292-.54389878-.4809581-.54389878-.6817006 0-.1034522.25709941-.4155854.56974291-.7407981l1.08164838-1.0963913c.85495559-.8537976.93778272-.9221671 1.18515603-.8049767l.15612451.0777496 1.81457118-1.82955616c.03534897-.03763498.05462407-.05933762.05462407-.06181637 0-.00578059-.01040507-.02395717-.02729795-.04851997l-.06622481-.08683728c-1.24728524-1.50553761-.84544733-4.10986062.88967595-5.76755229.17721695-.16930872.32551467-.30056922.44873831-.39502988l.2546261-.18459517c.07619989-.05316099.18148546-.1218965.34136377-.21407729l.26672795-.14752486c.09633589-.05231044.2003598-.10569351.31285615-.15396069.14033455-.05955744.32604441-.12247299.56358744-.19196612.34324446-.10042042.67956956-.15781683 1.00477536-.17590304zm3.7961617 11.93650404-.359534-.8391761-2.0894564.9007457.1513539.3482469 2.3872751-.1882678zm-1.132338-2.6087057-1.7744061 1.6070996.1525888.3543961 2.0881963-.9007583-.3375107-.7810134c-.0563832-.1273726-.0967532-.2144647-.1288683-.279724zm-2.6246669-8.40614307h-.1747724c-.8818005.02696561-1.85237327.41771487-2.68503083 1.22687203-2.08706223 2.02815371-1.59582199 5.13126481.8552129 5.40087046 2.20406023.24243838 4.46822593-1.84115859 4.46564723-4.10998663-.0017685-1.57685785-1.1062873-2.48459194-2.4610569-2.51775586z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bank-m.svg b/data/styles/default/dark/symbols/bank-m.svg
index 4d962e452..d6645ed0a 100644
--- a/data/styles/default/dark/symbols/bank-m.svg
+++ b/data/styles/default/dark/symbols/bank-m.svg
@@ -1,7 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <g fill-rule="evenodd" opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#51585E"/>
-  <path d="m6 7.7692 6-2.7692 6 2.7692v0.92308h-0.92308v6.9231h0.92308v1.3846h-12v-1.3846h0.92308v-6.9231h-0.92308zm8.3077 4.9242c0-1.0203-1.0379-1.847-2.3097-1.847-0.42256 0-0.77128-0.27557-0.77128-0.61675s0.34462-0.61675 0.77128-0.61675c0.42667 0 0.77128 0.27885 0.77128 0.61675h1.5385c0-0.80046-0.6441-1.4763-1.5385-1.7322v-0.72829h-1.5385v0.72829c-0.89436 0.25589-1.5385 0.93169-1.5385 1.7322 0 1.0203 1.0379 1.847 2.3097 1.847 0.42667 0 0.77128 0.27557 0.77128 0.61675s-0.34462 0.61675-0.77128 0.61675c-0.42667 0-0.77128-0.27885-0.77128-0.61675h-1.5385c0 0.80046 0.6441 1.4763 1.5385 1.7322v0.72829h1.5385v-0.72829c0.89436-0.25589 1.5385-0.93169 1.5385-1.7322z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#51585E" r="11"/><path d="m6 7.7692 6-2.7692 6 2.7692v.92308h-.92308v6.9231h.92308v1.3846h-12v-1.3846h.92308v-6.9231h-.92308zm8.3077 4.9242c0-1.0203-1.0379-1.847-2.3097-1.847-.42256 0-.77128-.27557-.77128-.61675s.34462-.61675.77128-.61675c.42667 0 .77128.27885.77128.61675h1.5385c0-.80046-.6441-1.4763-1.5385-1.7322v-.72829h-1.5385v.72829c-.89436.25589-1.5385.93169-1.5385 1.7322 0 1.0203 1.0379 1.847 2.3097 1.847.42667 0 .77128.27557.77128.61675s-.34462.61675-.77128.61675c-.42667 0-.77128-.27885-.77128-.61675h-1.5385c0 .80046.6441 1.4763 1.5385 1.7322v.72829h1.5385v-.72829c.89436-.25589 1.5385-.93169 1.5385-1.7322z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/banknote-m.svg b/data/styles/default/dark/symbols/banknote-m.svg
index 1286f953d..a6a03c31c 100644
--- a/data/styles/default/dark/symbols/banknote-m.svg
+++ b/data/styles/default/dark/symbols/banknote-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>banknote-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="banknote-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11.143" fill="#51585E"/>
-   <path id="Shape" d="m18.286 8.8571h-0.81943l-1.548-2.58c-0.082286-0.136-0.21714-0.23257-0.37314-0.26514-0.15486-0.032-0.31886 0.0022857-0.44857 0.094286l-3.8509 2.7509h1.9663l2.0451-1.4606 0.87657 1.4606h-2.4194v1.1429h4v4.5714h-6.8571v-1.1429h-1.1429v1.7143c0 0.316 0.256 0.57143 0.57143 0.57143h3.9326l-0.128 0.256c-0.097143 0.19486-0.29257 0.31543-0.51029 0.31543h-3.6291l-1.3794-1.3794v-2.9549l1.3794-1.38h2.0491v0.57143c0 0.31486-0.256 0.57143-0.57143 0.57143h-1.1429v1.1429h1.1429c0.94514 0 1.7143-0.76914 1.7143-1.7143v-1.1429c0-0.31543-0.25543-0.57143-0.57143-0.57143h-2.8571c-0.15143 0-0.29714 0.059429-0.404 0.168l-1.0474 1.0469c-0.08-0.041714-0.16629-0.072-0.26286-0.072h-2.2857c-0.31543 0-0.57143 0.256-0.57143 0.57143v4.5714c0 0.316 0.256 0.57143 0.57143 0.57143h2.2857c0.096571 0 0.18286-0.029714 0.26286-0.072l1.0474 1.048c0.10686 0.10629 0.25257 0.16686 0.404 0.16686h3.8657c0.65371 0 1.2411-0.36286 1.5331-0.948l0.38286-0.76629h2.7897c0.316 0 0.57143-0.25543 0.57143-0.57143v-5.7143c0-0.31543-0.25543-0.57143-0.57143-0.57143zm-10.857 6.2857h-1.1429v-3.4286h1.1429v3.4286z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#51585E" r="11.143"/><path d="m18.286 8.8571h-.81943l-1.548-2.58c-.082286-.136-.21714-.23257-.37314-.26514-.15486-.032-.31886.0022857-.44857.094286l-3.8509 2.7509h1.9663l2.0451-1.4606.87657 1.4606h-2.4194v1.1429h4v4.5714h-6.8571v-1.1429h-1.1429v1.7143c0 .316.256.57143.57143.57143h3.9326l-.128.256c-.097143.19486-.29257.31543-.51029.31543h-3.6291l-1.3794-1.3794v-2.9549l1.3794-1.38h2.0491v.57143c0 .31486-.256.57143-.57143.57143h-1.1429v1.1429h1.1429c.94514 0 1.7143-.76914 1.7143-1.7143v-1.1429c0-.31543-.25543-.57143-.57143-.57143h-2.8571c-.15143 0-.29714.059429-.404.168l-1.0474 1.0469c-.08-.041714-.16629-.072-.26286-.072h-2.2857c-.31543 0-.57143.256-.57143.57143v4.5714c0 .316.256.57143.57143.57143h2.2857c.096571 0 .18286-.029714.26286-.072l1.0474 1.048c.10686.10629.25257.16686.404.16686h3.8657c.65371 0 1.2411-.36286 1.5331-.948l.38286-.76629h2.7897c.316 0 .57143-.25543.57143-.57143v-5.7143c0-.31543-.25543-.57143-.57143-.57143zm-10.857 6.2857h-1.1429v-3.4286h1.1429z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/baseball-centre-m.svg b/data/styles/default/dark/symbols/baseball-centre-m.svg
new file mode 100644
index 000000000..4995cbebd
--- /dev/null
+++ b/data/styles/default/dark/symbols/baseball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9 3.375c1.47875 0 2.8169375.57375 3.81775 1.501875-1.585625.6975-2.69325 2.278125-2.69325 4.123125s1.1076875 3.425625 2.69325 4.123125c-1.0008125.928125-2.339 1.501875-3.81775 1.501875s-2.8169375-.57375-3.81775-1.501875c1.585625-.6975 2.69325-2.278125 2.69325-4.123125s-1.1076875-3.425625-2.69325-4.123125c1.0008125-.928125 2.339-1.501875 3.81775-1.501875zm-4.6073125 2.4075c1.3606875.433125 2.355875 1.71 2.355875 3.2175s-.9951875 2.784375-2.355875 3.2175c-.640975-.91125-1.0176875-2.019375-1.0176875-3.2175s.3766875-2.30625 1.0176875-3.2175zm9.2148125 0c.640975.91125 1.0176875 2.019375 1.0176875 3.2175s-.3766875 2.30625-1.0176875 3.2175c-1.3606875-.433125-2.355875-1.71-2.355875-3.2175s.9951875-2.784375 2.355875-3.2175z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/baseball-m.svg b/data/styles/default/dark/symbols/baseball-m.svg
index db954b5fa..f5cb3c74d 100644
--- a/data/styles/default/dark/symbols/baseball-m.svg
+++ b/data/styles/default/dark/symbols/baseball-m.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>baseball-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="baseball-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5,5)" fill="#777777" stroke-width="1.2854">
-    <path id="Path" d="m-0.3717 1.852c-1.0256 1.458-1.6283 3.231-1.6283 5.148s0.60274 3.69 1.6283 5.148c2.1771-0.693 3.7694-2.736 3.7694-5.148s-1.5923-4.455-3.7694-5.148z" />
-    <path d="m14.372 1.852c-2.1771 0.693-3.7694 2.736-3.7694 5.148s1.5923 4.455 3.7694 5.148c1.0256-1.458 1.6283-3.231 1.6283-5.148s-0.60274-3.69-1.6283-5.148z" />
-    <path d="m8.7992 7c0-2.952 1.7722-5.481 4.3092-6.597-1.6013-1.485-3.7424-2.403-6.1084-2.403s-4.5071 0.918-6.1084 2.403c2.5369 1.116 4.3092 3.645 4.3092 6.597s-1.7722 5.481-4.3092 6.597c1.6013 1.485 3.7424 2.403 6.1084 2.403s4.5071-0.918 6.1084-2.403c-2.5369-1.116-4.3092-3.645-4.3092-6.597z" />
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c1.7745 0 3.380325.6885 4.5813 1.80225-1.90275.837-3.2319 2.73375-3.2319 4.94775s1.329225 4.11075 3.2319 4.94775c-1.200975 1.11375-2.8068 1.80225-4.5813 1.80225s-3.380325-.6885-4.5813-1.80225c1.90275-.837 3.2319-2.73375 3.2319-4.94775s-1.329225-4.11075-3.2319-4.94775c1.200975-1.11375 2.8068-1.80225 4.5813-1.80225zm-5.528775 2.889c1.632825.51975 2.82705 2.052 2.82705 3.861s-1.194225 3.34125-2.82705 3.861c-.76917-1.0935-1.221225-2.42325-1.221225-3.861s.452025-2.7675 1.221225-3.861zm11.057775 0c.76917 1.0935 1.221225 2.42325 1.221225 3.861s-.452025 2.7675-1.221225 3.861c-1.632825-.51975-2.82705-2.052-2.82705-3.861s1.194225-3.34125 2.82705-3.861z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/basketball-centre-m.svg b/data/styles/default/dark/symbols/basketball-centre-m.svg
new file mode 100644
index 000000000..6aefc745d
--- /dev/null
+++ b/data/styles/default/dark/symbols/basketball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m13.7546134 5.9473025c.4692301.72928538.7801657 1.57729163.8706197 2.487485h-2.7475402c.1865613-1.10240812.8988866-2.01825487 1.8769205-2.487485zm-4.1891509-2.57228562c1.3511566.135681 2.5609789.7462455 3.4655189 1.66774562-1.2324358.68405838-2.1143623 1.92780088-2.2952703 3.392025h-1.1702486zm-5.31982588 2.57228562c.97803388.46923013 1.69035913 1.38507688 1.8769205 2.487485h-2.74754025c.090454-.91019337.40138963-1.75819962.87061975-2.487485zm4.18915088-2.57228562v5.05977062h-1.17024863c-.180908-1.46422412-1.0628345-2.70796662-2.29527025-3.392025.89888663-.92150012 2.11436225-1.53206462 3.46551888-1.66774562zm2.3009236 6.19044562c.180908 1.4642241 1.0628345 2.7079666 2.2952703 3.392025-.8988867.9215001-2.1143623 1.5320646-3.4655189 1.6677456v-5.0597706zm3.889522 0c-.090454.9101934-.4013896 1.7581996-.8706197 2.487485-.9780339-.4692301-1.6903592-1.3850769-1.8769205-2.487485zm-6.1904456 0v5.0597706c-1.35115663-.135681-2.56097888-.7462455-3.46551888-1.6677456 1.23243576-.6840584 2.11436225-1.9278009 2.29527025-3.392025zm-2.31223038 0c-.18656137 1.0967548-.90454 2.0182549-1.8769205 2.487485-.46923012-.7292854-.78016575-1.5772916-.87061975-2.487485z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/basketball-m.svg b/data/styles/default/dark/symbols/basketball-m.svg
index 368610f40..d2fc5a9e9 100644
--- a/data/styles/default/dark/symbols/basketball-m.svg
+++ b/data/styles/default/dark/symbols/basketball-m.svg
@@ -1,17 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>basketball-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="basketball-m" fill-rule="nonzero">
-   <g id="Group" transform="matrix(1.2922 0 0 1.2922 2.9548 2.9548)" fill="#777777">
-    <path id="Path" d="m10.563 6.3h3.402c-0.112-1.127-0.497-2.177-1.078-3.08-1.211 0.581-2.093 1.715-2.324 3.08z" />
-    <path d="m3.437 6.3c-0.231-1.365-1.113-2.499-2.324-3.08-0.581 0.903-0.966 1.953-1.078 3.08z" />
-    <path d="m9.149 6.3c0.224-1.813 1.316-3.353 2.842-4.2-1.12-1.141-2.618-1.897-4.291-2.065v6.265z" />
-    <path d="m4.851 6.3h1.449v-6.265c-1.673 0.168-3.178 0.924-4.291 2.065 1.526 0.847 2.618 2.387 2.842 4.2z" />
-    <path d="m9.149 7.7h-1.449v6.265c1.673-0.168 3.178-0.924 4.291-2.065-1.526-0.847-2.618-2.387-2.842-4.2z" />
-    <path d="m1.113 10.78c1.204-0.581 2.093-1.722 2.324-3.08h-3.402c0.112 1.127 0.497 2.177 1.078 3.08z" />
-    <path d="m10.563 7.7c0.231 1.365 1.113 2.499 2.324 3.08 0.581-0.903 0.966-1.953 1.078-3.08z" />
-    <path d="m4.851 7.7c-0.224 1.813-1.316 3.353-2.842 4.2 1.12 1.141 2.618 1.897 4.291 2.065v-6.265z" />
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m14.705536 5.336763c.5630762.87514245.9361989 1.89274995 1.0447437 2.984982h-3.2970483c.2238737-1.32288975 1.078664-2.42190585 2.2523046-2.984982zm-5.026981-3.08674275c1.6213879.1628172 3.0731746.8954946 4.1586226 2.00129475-1.4789229.82087005-2.5372347 2.31336105-2.7543243 4.07043h-1.4042983zm-6.38379105 3.08674275c1.17364065.56307615 2.02843095 1.66209225 2.2523046 2.984982h-3.2970483c.1085448-1.09223205.48166755-2.10983955 1.0447437-2.984982zm5.02698105-3.08674275v6.07172475h-1.40429835c-.2170896-1.75706895-1.2754014-3.24955995-2.7543243-4.07043 1.07866395-1.10580015 2.5372347-1.83847755 4.15862265-2.00129475zm2.7611083 7.42853475c.2170896 1.757069 1.2754014 3.24956 2.7543243 4.07043-1.0786639 1.1058002-2.5372347 1.8384776-4.1586226 2.0012948v-6.0717248zm4.6674264 0c-.1085448 1.0922321-.4816675 2.1098396-1.0447437 2.984982-1.1736406-.5630761-2.0284309-1.6620922-2.2523046-2.984982zm-7.4285347 0v6.0717248c-1.62138795-.1628172-3.07317465-.8954946-4.15862265-2.0012948 1.4789229-.82087 2.5372347-2.313361 2.7543243-4.07043zm-2.77467645 0c-.22387365 1.3161057-1.085448 2.4219059-2.2523046 2.984982-.56307615-.8751424-.9361989-1.8927499-1.0447437-2.984982z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/beach-m.svg b/data/styles/default/dark/symbols/beach-m.svg
index 5af72a4f6..c57bd8189 100644
--- a/data/styles/default/dark/symbols/beach-m.svg
+++ b/data/styles/default/dark/symbols/beach-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>beach-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="2">
-  <g id="beach-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m12.877 13.991 1.1125-1.1123 5.0101 5.0116-1.1102 1.11-5.0124-5.0092zm3.3398-4.457 2.225-2.2246c-3.0729-3.0724-8.0519-3.0802-11.125-0.015557 3.0574-1.0112 6.4649-0.19446 8.8999 2.2402zm-8.9232-2.2168c-3.0652 3.0724-3.0574 8.0506 0.015559 11.123l2.225-2.2246c-2.435-2.4346-3.2519-5.8415-2.2405-8.8984zm0.015559-0.015557-0.0077796 0.0077783c-0.29563 2.3413 0.91021 5.3515 3.3452 7.7939l4.4577-4.457c-2.435-2.4346-5.4535-3.6403-7.7952-3.3447z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0a6074" r="11"/><path d="m12.877 13.991 1.1125-1.1123 5.0101 5.0116-1.1102 1.11-5.0124-5.0092zm3.3398-4.457 2.225-2.2246c-3.0729-3.0724-8.0519-3.0802-11.125-.015557 3.0574-1.0112 6.4649-.19446 8.8999 2.2402zm-8.9232-2.2168c-3.0652 3.0724-3.0574 8.0506.015559 11.123l2.225-2.2246c-2.435-2.4346-3.2519-5.8415-2.2405-8.8984zm.015559-.015557-.0077796.0077783c-.29563 2.3413.91021 5.3515 3.3452 7.7939l4.4577-4.457c-2.435-2.4346-5.4535-3.6403-7.7952-3.3447z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/beekeeper-m.svg b/data/styles/default/dark/symbols/beekeeper-m.svg
index df46b8afe..74d4c6314 100644
--- a/data/styles/default/dark/symbols/beekeeper-m.svg
+++ b/data/styles/default/dark/symbols/beekeeper-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m8.7793 3.5527-0.42383 0.42383-0.42578 0.42383 1.7461 1.75c-0.30791 0.35129-0.54092 0.75567-0.69922 1.2168-0.19425 0.56584-0.17202 1.1453 0.058594 1.7383l0.095703 0.24414 2.8613-1.0078 2.9023 0.9707 0.072266-0.27734c0.17553-0.65417 0.17628-1.2439-0.029297-1.7578-0.15692-0.39225-0.3816-0.75007-0.66406-1.0762l1.7969-1.8008-0.42578-0.42383-0.42383-0.42383-1.8809 1.8848c-0.41314-0.21581-0.87309-0.32422-1.3867-0.32422-0.48309 1e-7 -0.92392 0.10036-1.3223 0.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-0.99908 0.47052-1.4656 1.0767-1.6582 1.7129-0.24708 0.63952 0.012657 1.2548 0.38477 1.627 0.36513 0.3651 1.0132 0.70427 1.7793 0.53711 0.76007-0.16583 1.4524-0.56602 2.1113-1.2285 0.52525-0.52518 0.94732-1.355 1.2422-2.2012 0.28737-0.82465 0.46828-1.4059 0.5332-1.7305l0.076172-0.38281zm0.33594 0 0.076172 0.38281c0.06492 0.32459 0.24584 0.90582 0.5332 1.7305 0.29486 0.84615 0.71694 1.676 1.2422 2.2012 0.65896 0.6625 1.3513 1.0627 2.1113 1.2285 0.76614 0.16716 1.4142-0.17201 1.7793-0.53711 0.37211-0.37213 0.63184-0.98743 0.38477-1.627-0.19263-0.63623-0.65912-1.2424-1.6582-1.7129-0.99908-0.47052-4.4688-1.666-4.4688-1.666zm-0.16797 2.6465c-0.20461 0.67674-0.39347 1.1835-0.82031 1.7852-0.28707 0.37547-0.59242 0.76378-0.96484 1.0625-0.14229 0.11958-0.28868 0.22136-0.4375 0.3125h4.5195c-0.16494-0.092973-0.3145-0.19036-0.46484-0.30859-0.33436-0.28315-0.69887-0.69528-0.96289-1.0938-0.29132-0.5025-0.62864-1.1279-0.86914-1.7578zm-3.9512 4.1602c0.19439 0.39663 0.41526 0.75984 0.65625 1.0898h6.5898c0.24102-0.32994 0.46192-0.69335 0.65625-1.0898h-7.9023zm1.5762 2.0898c0.53884 0.45196 1.1388 0.75512 1.7754 0.87695v1.7559h0.59961 0.59961v-1.7559c0.63593-0.12187 1.2345-0.425 1.7734-0.87695h-4.748z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m8.7793 3.5527-.42383.42383-.42578.42383 1.7461 1.75c-.30791.35129-.54092.75567-.69922 1.2168-.19425.56584-.17202 1.1453.058594 1.7383l.095703.24414 2.8613-1.0078 2.9023.9707.072266-.27734c.17553-.65417.17628-1.2439-.029297-1.7578-.15692-.39225-.3816-.75007-.66406-1.0762l1.7969-1.8008-.42578-.42383-.42383-.42383-1.8809 1.8848c-.41314-.21581-.87309-.32422-1.3867-.32422-.48309.0000001-.92392.10036-1.3223.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-.99908.47052-1.4656 1.0767-1.6582 1.7129-.24708.63952.012657 1.2548.38477 1.627.36513.3651 1.0132.70427 1.7793.53711.76007-.16583 1.4524-.56602 2.1113-1.2285.52525-.52518.94732-1.355 1.2422-2.2012.28737-.82465.46828-1.4059.5332-1.7305l.076172-.38281zm.33594 0 .076172.38281c.06492.32459.24584.90582.5332 1.7305.29486.84615.71694 1.676 1.2422 2.2012.65896.6625 1.3513 1.0627 2.1113 1.2285.76614.16716 1.4142-.17201 1.7793-.53711.37211-.37213.63184-.98743.38477-1.627-.19263-.63623-.65912-1.2424-1.6582-1.7129-.99908-.47052-4.4688-1.666-4.4688-1.666zm-.16797 2.6465c-.20461.67674-.39347 1.1835-.82031 1.7852-.28707.37547-.59242.76378-.96484 1.0625-.14229.11958-.28868.22136-.4375.3125h4.5195c-.16494-.092973-.3145-.19036-.46484-.30859-.33436-.28315-.69887-.69528-.96289-1.0938-.29132-.5025-.62864-1.1279-.86914-1.7578zm-3.9512 4.1602c.19439.39663.41526.75984.65625 1.0898h6.5898c.24102-.32994.46192-.69335.65625-1.0898zm1.5762 2.0898c.53884.45196 1.1388.75512 1.7754.87695v1.7559h.59961.59961v-1.7559c.63593-.12187 1.2345-.425 1.7734-.87695h-4.748z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/blacksmith-m.svg b/data/styles/default/dark/symbols/blacksmith-m.svg
index 2cda989c0..0ef61a5bb 100644
--- a/data/styles/default/dark/symbols/blacksmith-m.svg
+++ b/data/styles/default/dark/symbols/blacksmith-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m8.1094 4.2692-0.93172 3.4792a0.39995 0.39995 59.988 0 0 0.28292 0.48981l2.3503 0.62909a0.40048 0.40048 150.02 0 0 0.49029-0.28285l0.17307-0.64347a0.40037 0.40037 150.03 0 1 0.49026-0.28274l5.153 1.3808a0.39587 0.39587 149.7 0 0 0.48589-0.28389l0.1662-0.64703a0.40416 0.40416 59.702 0 0-0.28686-0.49094l-5.1394-1.3769a0.40013 0.40013 59.99 0 1-0.28298-0.48992l0.17211-0.64321a0.40026 0.40026 59.999 0 0-0.28294-0.49006l-2.3504-0.63059a0.39982 0.39982 150.01 0 0-0.48981 0.28273zm1.5586 6.9218v0.09258a0.4 0.4 135 0 1-0.4 0.4h-3.7957c-0.22091 0-0.40013 0.17995-0.36889 0.39847 0.1296 0.90626 0.68265 2.3106 2.0042 2.5892 0.21573 0.04548 0.57545 0.04748 0.79636 0.04748h2.0789c0.22091 0 0.40047 0.17909 0.39908 0.4-0.01175 1.8714-0.1716 2.6553-2.2986 2.7373-0.22064 0.0085-0.39974 0.18634-0.39974 0.40725v1.4539a0.4 0.4 45 0 0 0.4 0.4h2.4559a0.4 0.4 135 0 0 0.4-0.4 0.36954 0.36954 139.94 0 1 0.4-0.33633h2.3465a0.4 0.4 45 0 1 0.4 0.4 0.36954 0.36954 40.058 0 0 0.4 0.33633h2.3016a0.4 0.4 135 0 0 0.4-0.4v-1.409a0.4 0.4 45 0 0-0.4-0.4h-0.07109c-0.22091 0-0.58149 0.0054-0.79726-0.04008-1.8741-0.39502-1.8741-3.5854-1.7e-5 -3.9804 0.21578-0.04548 0.57637-0.04008 0.79728-0.04008h1.8113a0.4 0.4 135 0 0 0.4-0.4v-1.2977a0.55355 0.55355 54.148 0 0-0.37978-0.52557l-2.1408-0.70784a2.484 2.484 9.148 0 0-0.77978-0.12557h-5.5594a0.4 0.4 135 0 0-0.4 0.4z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m8.1094 4.2692-.93172 3.4792a.39995.39995 59.988 0 0 .28292.48981l2.3503.62909a.40048.40048 150.02 0 0 .49029-.28285l.17307-.64347a.40037.40037 150.03 0 1 .49026-.28274l5.153 1.3808a.39587.39587 149.7 0 0 .48589-.28389l.1662-.64703a.40416.40416 59.702 0 0 -.28686-.49094l-5.1394-1.3769a.40013.40013 59.99 0 1 -.28298-.48992l.17211-.64321a.40026.40026 59.999 0 0 -.28294-.49006l-2.3504-.63059a.39982.39982 150.01 0 0 -.48981.28273zm1.5586 6.9218v.09258a.4.4 135 0 1 -.4.4h-3.7957c-.22091 0-.40013.17995-.36889.39847.1296.90626.68265 2.3106 2.0042 2.5892.21573.04548.57545.04748.79636.04748h2.0789c.22091 0 .40047.17909.39908.4-.01175 1.8714-.1716 2.6553-2.2986 2.7373-.22064.0085-.39974.18634-.39974.40725v1.4539a.4.4 45 0 0 .4.4h2.4559a.4.4 135 0 0 .4-.4.36954.36954 139.94 0 1 .4-.33633h2.3465a.4.4 45 0 1 .4.4.36954.36954 40.058 0 0 .4.33633h2.3016a.4.4 135 0 0 .4-.4v-1.409a.4.4 45 0 0 -.4-.4h-.07109c-.22091 0-.58149.0054-.79726-.04008-1.8741-.39502-1.8741-3.5854-.000017-3.9804.21578-.04548.57637-.04008.79728-.04008h1.8113a.4.4 135 0 0 .4-.4v-1.2977a.55355.55355 54.148 0 0 -.37978-.52557l-2.1408-.70784a2.484 2.484 9.148 0 0 -.77978-.12557h-5.5594a.4.4 135 0 0 -.4.4z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bowling-m.svg b/data/styles/default/dark/symbols/bowling-m.svg
index 1c5eb14c7..48daf7d6e 100644
--- a/data/styles/default/dark/symbols/bowling-m.svg
+++ b/data/styles/default/dark/symbols/bowling-m.svg
@@ -1,15 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>bowls-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="bowls-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(6,5)" fill="#777777">
-    <g transform="matrix(1.2857 0 0 1.2857 -1.8253 -2)" >
-     <path id="Shape" d="m7.9124 5.4783c-0.91974 0-1.7695 0.29522-2.4664 0.79313-0.32809-0.73957-0.57704-1.2369-0.57704-2.0105v-2.4348c0-1.0068-0.8193-1.8261-1.8261-1.8261s-1.8261 0.8193-1.8261 1.8261v2.4348c0 0.71765-0.21609 1.2003-0.49 1.8115-0.34087 0.76087-0.72739 1.6234-0.72739 3.0581 0 2.6229 1.3385 4.8696 2.4348 4.8696h1.2174c0.60139 0 1.0926-0.56548 1.4231-1.0914 0.75417 0.67565 1.747 1.0914 2.8377 1.0914 2.3496 0 4.2609-1.9113 4.2609-4.2609 0-2.3496-1.9119-4.2609-4.2609-4.2609zm-5.4783-3.6522c0-0.33539 0.2733-0.6087 0.6087-0.6087s0.6087 0.2733 0.6087 0.6087v1.8261h-1.2174zm1.1638 10.957h-1.1127c-0.32443-0.18139-1.2691-1.5564-1.2691-3.6522 0-1.1748 0.30191-1.8474 0.62087-2.5602 0.22887-0.51009 0.46261-1.0323 0.55574-1.7007h1.3002c0.092522 0.66835 0.32687 1.1912 0.55513 1.7007 0.08887 0.19783 0.17652 0.40478 0.2593 0.61843-0.53504 0.71217-0.85583 1.5936-0.85583 2.5504 0 0.79009 0.21974 1.5272 0.59591 2.1621-0.29096 0.58009-0.55757 0.82478-0.64948 0.88139zm4.3144 0c-1.6782 0-3.0435-1.3653-3.0435-3.0435 0-1.6782 1.3653-3.0435 3.0435-3.0435s3.0435 1.3653 3.0435 3.0435c0 1.6782-1.3659 3.0435-3.0435 3.0435z" />
-     <circle cx="7.9124" cy="9.7391" r="1" />
-     <circle cx="9.1298" cy="8.5217" r="1" />
-     <circle cx="6.695" cy="8.5217" r="1" />
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#51585E" transform="matrix(1.2857 0 0 1.2857 4.1747 3)"><path d="m7.9124 5.4783c-.91974 0-1.7695.29522-2.4664.79313-.32809-.73957-.57704-1.2369-.57704-2.0105v-2.4348c0-1.0068-.8193-1.8261-1.8261-1.8261s-1.8261.8193-1.8261 1.8261v2.4348c0 .71765-.21609 1.2003-.49 1.8115-.34087.76087-.72739 1.6234-.72739 3.0581 0 2.6229 1.3385 4.8696 2.4348 4.8696h1.2174c.60139 0 1.0926-.56548 1.4231-1.0914.75417.67565 1.747 1.0914 2.8377 1.0914 2.3496 0 4.2609-1.9113 4.2609-4.2609s-1.9119-4.2609-4.2609-4.2609zm-5.4783-3.6522c0-.33539.2733-.6087.6087-.6087s.6087.2733.6087.6087v1.8261h-1.2174zm1.1638 10.957h-1.1127c-.32443-.18139-1.2691-1.5564-1.2691-3.6522 0-1.1748.30191-1.8474.62087-2.5602.22887-.51009.46261-1.0323.55574-1.7007h1.3002c.092522.66835.32687 1.1912.55513 1.7007.08887.19783.17652.40478.2593.61843-.53504.71217-.85583 1.5936-.85583 2.5504 0 .79009.21974 1.5272.59591 2.1621-.29096.58009-.55757.82478-.64948.88139zm4.3144 0c-1.6782 0-3.0435-1.3653-3.0435-3.0435s1.3653-3.0435 3.0435-3.0435 3.0435 1.3653 3.0435 3.0435-1.3659 3.0435-3.0435 3.0435z"/><circle cx="7.9124" cy="9.7391" r="1"/><circle cx="9.1298" cy="8.5217" r="1"/><circle cx="6.695" cy="8.5217" r="1"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bowling_alley-m.svg b/data/styles/default/dark/symbols/bowling_alley-m.svg
index 0bd625875..a58023dcf 100644
--- a/data/styles/default/dark/symbols/bowling_alley-m.svg
+++ b/data/styles/default/dark/symbols/bowling_alley-m.svg
@@ -1,5 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
- <path d="m17.814453 3.8535156c-.603341-.0348572-1.292607.2159125-1.726562.7011719-1.070067 1.1965695-.839929 1.9874104-.775391 3.5136719.02518.16606.05859.5019531.05859.5019531l3.320312.6835937s.165185-.2948914.253906-.4375c.662226-1.3766255 1.18416-2.0131914.673833-3.5351562-.236532-.7053955-.89885-1.2598998-1.552735-1.3945312-.081735-.016829-.165761-.0282236-.251953-.0332032zm-7.400391 3.3710938c-2.8975029-.0408224-5.6930185 1.8219273-6.7910151 4.4999996-1.146727 2.630925-.5519058 5.899022 1.4570312 7.951172 1.6254447 1.748763 4.1338307 2.557928 6.4765629 2.195313-.321854-.982015-.590771-2.383672-.416016-3.56836.366972-2.487752 2.212752-5.362092 3-6.921875.353016-.702272.721364-1.5366287.652344-2.7128902-.323073-.2396476-.663199-.4562423-1.025391-.6367188-1.032783-.5308062-2.19257-.8082401-3.353516-.8066406zm-2.0839839 2.5585937c.8368725-.078164 1.3385167 1.0530239.75 1.6308589-.5026045.609137-1.6070395.269157-1.6796875-.517578-.0940179-.556561.3641095-1.107381.9296875-1.1132809zm6.9941409.1191407-.208985.8750002 2.941407.605468.152343-.884765zm-.867188 2.0820312s-2.464867 4.071428-2.732422 6.365234c-.155335 1.331731.148701 2.916223.69336 3.962891 2.507839-.246004 4.359101-1.105793 5.849609-2.160156.904451-2.336395-.083984-7.402344-.083984-7.402344zm-8.4824216.621094c.8360984-.07468 1.338813 1.054191.75 1.632812-.5020198.608577-1.6071071.2708-1.6796875-.515625-.093664-.555925.364611-1.108905.9296875-1.117187zm3.0117187.160156c.8367309-.07827 1.3388649 1.053328.75 1.630859-.5032491.607309-1.6068595.266135-1.6796875-.519531-.094269-.556267.3644171-1.105487.9296875-1.111328z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m17.814453 3.8535156c-.603341-.0348572-1.292607.2159125-1.726562.7011719-1.070067 1.1965695-.839929 1.9874104-.775391 3.5136719.02518.16606.05859.5019531.05859.5019531l3.320312.6835937s.165185-.2948914.253906-.4375c.662226-1.3766255 1.18416-2.0131914.673833-3.5351562-.236532-.7053955-.89885-1.2598998-1.552735-1.3945312-.081735-.016829-.165761-.0282236-.251953-.0332032zm-7.400391 3.3710938c-2.8975029-.0408224-5.6930185 1.8219273-6.7910151 4.4999996-1.146727 2.630925-.5519058 5.899022 1.4570312 7.951172 1.6254447 1.748763 4.1338307 2.557928 6.4765629 2.195313-.321854-.982015-.590771-2.383672-.416016-3.56836.366972-2.487752 2.212752-5.362092 3-6.921875.353016-.702272.721364-1.5366287.652344-2.7128902-.323073-.2396476-.663199-.4562423-1.025391-.6367188-1.032783-.5308062-2.19257-.8082401-3.353516-.8066406zm-2.0839839 2.5585937c.8368725-.078164 1.3385167 1.0530239.75 1.6308589-.5026045.609137-1.6070395.269157-1.6796875-.517578-.0940179-.556561.3641095-1.107381.9296875-1.1132809zm6.9941409.1191407-.208985.8750002 2.941407.605468.152343-.884765zm-.867188 2.0820312s-2.464867 4.071428-2.732422 6.365234c-.155335 1.331731.148701 2.916223.69336 3.962891 2.507839-.246004 4.359101-1.105793 5.849609-2.160156.904451-2.336395-.083984-7.402344-.083984-7.402344zm-8.4824216.621094c.8360984-.07468 1.338813 1.054191.75 1.632812-.5020198.608577-1.6071071.2708-1.6796875-.515625-.093664-.555925.364611-1.108905.9296875-1.117187zm3.0117187.160156c.8367309-.07827 1.3388649 1.053328.75 1.630859-.5032491.607309-1.6068595.266135-1.6796875-.519531-.094269-.556267.3644171-1.105487.9296875-1.111328z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/car-part-m.svg b/data/styles/default/dark/symbols/car-part-m.svg
index 18061ece3..98f1c9b64 100644
--- a/data/styles/default/dark/symbols/car-part-m.svg
+++ b/data/styles/default/dark/symbols/car-part-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car-part-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="car-part-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m12 5c-3.85 0-7 3.15-7 7s3.15 7 7 7 7-3.15 7-7-3.15-7-7-7zm0 1.4c2.87 0 5.25 2.17 5.6 4.9h-2.1c-0.35-0.77-1.82-1.4-3.5-1.4s-3.15 0.63-3.5 1.4h-2.1c0.35-2.73 2.73-4.9 5.6-4.9zm-5.6 6.3h2.1c0.14 0.91 0.84 2.52 2.8 2.8v2.1c-2.52-0.28-4.62-2.38-4.9-4.9zm6.3 4.9v-2.1c1.96-0.28 2.59-1.89 2.8-2.8h2.1c-0.28 2.52-2.38 4.62-4.9 4.9z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m12 5c-3.85 0-7 3.15-7 7s3.15 7 7 7 7-3.15 7-7-3.15-7-7-7zm0 1.4c2.87 0 5.25 2.17 5.6 4.9h-2.1c-.35-.77-1.82-1.4-3.5-1.4s-3.15.63-3.5 1.4h-2.1c.35-2.73 2.73-4.9 5.6-4.9zm-5.6 6.3h2.1c.14.91.84 2.52 2.8 2.8v2.1c-2.52-.28-4.62-2.38-4.9-4.9zm6.3 4.9v-2.1c1.96-.28 2.59-1.89 2.8-2.8h2.1c-.28 2.52-2.38 4.62-4.9 4.9z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/car-repair-m.svg b/data/styles/default/dark/symbols/car-repair-m.svg
index 95b0dd4b2..ded4c936d 100644
--- a/data/styles/default/dark/symbols/car-repair-m.svg
+++ b/data/styles/default/dark/symbols/car-repair-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car-repair-m</title>
- <g id="Page-2:-Night" transform="scale(1.5)" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="car-repair-m" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle cx="8" cy="8" r="7.3333" fill="#51585E"/>
-   <g id="Group" transform="translate(4 3.3333)" fill="#000">
-    <path id="Shape" d="m1.4737 5.8947v-0.49123h4.9123v0.49123c0 0.27018 0.22105 0.49123 0.49123 0.49123 0.27018 0 0.49123-0.22105 0.49123-0.49123v-3.0996s-0.65825-1.9796-0.76632-2.3039c-0.024561-0.078596-0.058947-0.14246-0.093333-0.19649-0.00982-0.009825-0.014737-0.019649-0.024561-0.034386-0.18667-0.25544-0.45193-0.26035-0.45193-0.26035h-4.2049s-0.26526 0.0049123-0.45193 0.26526c-0.00982 0.009825-0.014737 0.019649-0.024561 0.029474-0.034386 0.054035-0.068772 0.11789-0.093333 0.19649-0.10807 0.32421-0.76632 2.3039-0.76632 2.3039v3.0996c0 0.27018 0.22105 0.49123 0.49123 0.49123 0.27018 0 0.49123-0.22105 0.49123-0.49123zm0.98246-1.7193c-0.27018 0-0.49123-0.22105-0.49123-0.49123 0-0.27018 0.22105-0.49123 0.49123-0.49123 0.27018 0 0.49123 0.22105 0.49123 0.49123 0 0.27018-0.22105 0.49123-0.49123 0.49123zm2.9474 0c-0.27018 0-0.49123-0.22105-0.49123-0.49123 0-0.27018 0.22105-0.49123 0.49123-0.49123 0.27018 0 0.49123 0.22105 0.49123 0.49123 0 0.27018-0.22105 0.49123-0.49123 0.49123zm-3.2765-3.193h3.6056l0.11298 0.33895 0.21123 0.64351h-4.254z"/>
-    <path id="Path" d="m0 7.3733c0 0.26526 0.22105 0.48632 0.48632 0.48632h2.9523v0.98737c0 0.27018 0.22105 0.48632 0.48632 0.48632h0.00491c0.27018 0 0.48632-0.22105 0.48632-0.48632v-0.98737h2.9523c0.27018 0 0.48632-0.22105 0.48632-0.48632 0-0.27018-0.22105-0.48632-0.48632-0.48632h-6.8821c-0.26526-0.0049122-0.48632 0.21614-0.48632 0.48632z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12" stroke-width="1.5"/><circle cx="12" cy="12" fill="#574469" r="10.99995" stroke-width="1.5"/><g fill="#000" transform="matrix(1.5 0 0 1.5 6 4.99995)"><path d="m1.4737 5.8947v-.49123h4.9123v.49123c0 .27018.22105.49123.49123.49123s.49123-.22105.49123-.49123v-3.0996s-.65825-1.9796-.76632-2.3039c-.024561-.078596-.058947-.14246-.093333-.19649-.00982-.009825-.014737-.019649-.024561-.034386-.18667-.25544-.45193-.26035-.45193-.26035h-4.2049s-.26526.0049123-.45193.26526c-.00982.009825-.014737.019649-.024561.029474-.034386.054035-.068772.11789-.093333.19649-.10807.32421-.76632 2.3039-.76632 2.3039v3.0996c0 .27018.22105.49123.49123.49123s.49123-.22105.49123-.49123zm.98246-1.7193c-.27018 0-.49123-.22105-.49123-.49123s.22105-.49123.49123-.49123.49123.22105.49123.49123-.22105.49123-.49123.49123zm2.9474 0c-.27018 0-.49123-.22105-.49123-.49123s.22105-.49123.49123-.49123.49123.22105.49123.49123-.22105.49123-.49123.49123zm-3.2765-3.193h3.6056l.11298.33895.21123.64351h-4.254z"/><path d="m0 7.3733c0 .26526.22105.48632.48632.48632h2.9523v.98737c0 .27018.22105.48632.48632.48632h.00491c.27018 0 .48632-.22105.48632-.48632v-.98737h2.9523c.27018 0 .48632-.22105.48632-.48632 0-.27018-.22105-.48632-.48632-.48632h-6.8821c-.26526-.0049122-.48632.21614-.48632.48632z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/car-repair-s.svg b/data/styles/default/dark/symbols/car-repair-s.svg
index 1893451b3..208f149ee 100644
--- a/data/styles/default/dark/symbols/car-repair-s.svg
+++ b/data/styles/default/dark/symbols/car-repair-s.svg
@@ -1,7 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <g fill-rule="evenodd" opacity="1">
-  <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#51585E"/>
-  <path d="m5.1625 4-0.1625 0.8h-0.075c-0.52 0-0.925 0.405-0.925 0.925v1.475 0.4 0.525c0 0.16 0.115 0.275 0.275 0.275h1.05c0.16 0 0.275-0.115 0.275-0.275v-0.525h4.8v0.525c0 0.16 0.115 0.275 0.275 0.275h1.05c0.16 0 0.275-0.115 0.275-0.275v-0.525-0.4-1.475c0-0.52-0.405-0.925-0.925-0.925h-0.075l-0.1625-0.8h-5.675zm-0.0875 1.6h0.6875c0.12 0 0.2375 0.115 0.2375 0.275v0.25c0 0.16-0.115 0.275-0.275 0.275h-0.65c-0.16 0-0.275-0.115-0.275-0.275v-0.25c0-0.16 0.115-0.275 0.275-0.275zm5.2 0h0.6875c0.12 0 0.2375 0.115 0.2375 0.275v0.25c0 0.16-0.115 0.275-0.275 0.275h-0.6875c-0.12 0-0.2375-0.115-0.2375-0.275v-0.25c0-0.16 0.115-0.275 0.275-0.275zm-6.275 3.4v1h1v1h1v-1h4.0012v1h0.99882v-1h1v-1h-8z" fill="#000" />
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><circle cx="8" cy="8" fill="#000" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#574469" r="7"/><path d="m5.1625 4-.1625.8h-.075c-.52 0-.925.405-.925.925v1.475.4.525c0 .16.115.275.275.275h1.05c.16 0 .275-.115.275-.275v-.525h4.8v.525c0 .16.115.275.275.275h1.05c.16 0 .275-.115.275-.275v-.525-.4-1.475c0-.52-.405-.925-.925-.925h-.075l-.1625-.8zm-.0875 1.6h.6875c.12 0 .2375.115.2375.275v.25c0 .16-.115.275-.275.275h-.65c-.16 0-.275-.115-.275-.275v-.25c0-.16.115-.275.275-.275zm5.2 0h.6875c.12 0 .2375.115.2375.275v.25c0 .16-.115.275-.275.275h-.6875c-.12 0-.2375-.115-.2375-.275v-.25c0-.16.115-.275.275-.275zm-6.275 3.4v1h1v1h1v-1h4.0012v1h.99882v-1h1v-1h-8z" fill="#000" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/car-wash-m.svg b/data/styles/default/dark/symbols/car-wash-m.svg
index d8da69897..0389bec71 100644
--- a/data/styles/default/dark/symbols/car-wash-m.svg
+++ b/data/styles/default/dark/symbols/car-wash-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car-wash-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="car-wash-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m14.944 7.501c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm-3.1942 0c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm-3.1942 0c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm7.6149 1.9229c-0.12777-0.37691-0.48551-0.64522-0.90714-0.64522h-7.0272c-0.42163 0-0.77299 0.26831-0.90714 0.64522l-1.2585 3.6222c-0.044718 0.13415-0.070272 0.2747-0.070272 0.42163v4.574c0 0.53023 0.42802 0.95825 0.95825 0.95825 0.53023 0 0.95825-0.42802 0.95825-0.95825v-0.31942h7.666v0.31942c0 0.52384 0.42802 0.95825 0.95825 0.95825 0.52384 0 0.95825-0.42802 0.95825-0.95825v-4.574c0-0.14054-0.025553-0.28747-0.070272-0.42163l-1.2585-3.6222zm-7.9343 6.3819c-0.53023 0-0.95825-0.42802-0.95825-0.95825 0-0.53023 0.42802-0.95825 0.95825-0.95825 0.53023 0 0.95825 0.42802 0.95825 0.95825 0 0.53023-0.42802 0.95825-0.95825 0.95825zm7.0272 0c-0.53023 0-0.95825-0.42802-0.95825-0.95825 0-0.53023 0.42802-0.95825 0.95825-0.95825 0.53023 0 0.95825 0.42802 0.95825 0.95825 0 0.53023-0.42802 0.95825-0.95825 0.95825zm-7.9854-3.1942 0.81132-2.4403c0.089436-0.25553 0.33219-0.43441 0.60689-0.43441h6.1072c0.2747 0 0.51745 0.17887 0.60689 0.43441l0.81132 2.4403h-8.9436z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m14.944 7.501c.53023 0 .95825-.42802.95825-.95825 0-.42163-.42163-1.0477-.7091-1.4182-.12777-.1661-.37691-.1661-.50468 0-.28109.37052-.70272.99658-.70272 1.4182 0 .53023.42802.95825.95825.95825zm-3.1942 0c.53023 0 .95825-.42802.95825-.95825 0-.42163-.42163-1.0477-.7091-1.4182-.12777-.1661-.37691-.1661-.50468 0-.28109.37052-.70272.99658-.70272 1.4182 0 .53023.42802.95825.95825.95825zm-3.1942 0c.53023 0 .95825-.42802.95825-.95825 0-.42163-.42163-1.0477-.7091-1.4182-.12777-.1661-.37691-.1661-.50468 0-.28109.37052-.70272.99658-.70272 1.4182 0 .53023.42802.95825.95825.95825zm7.6149 1.9229c-.12777-.37691-.48551-.64522-.90714-.64522h-7.0272c-.42163 0-.77299.26831-.90714.64522l-1.2585 3.6222c-.044718.13415-.070272.2747-.070272.42163v4.574c0 .53023.42802.95825.95825.95825s.95825-.42802.95825-.95825v-.31942h7.666v.31942c0 .52384.42802.95825.95825.95825.52384 0 .95825-.42802.95825-.95825v-4.574c0-.14054-.025553-.28747-.070272-.42163l-1.2585-3.6222zm-7.9343 6.3819c-.53023 0-.95825-.42802-.95825-.95825s.42802-.95825.95825-.95825.95825.42802.95825.95825-.42802.95825-.95825.95825zm7.0272 0c-.53023 0-.95825-.42802-.95825-.95825s.42802-.95825.95825-.95825.95825.42802.95825.95825-.42802.95825-.95825.95825zm-7.9854-3.1942.81132-2.4403c.089436-.25553.33219-.43441.60689-.43441h6.1072c.2747 0 .51745.17887.60689.43441l.81132 2.4403h-8.9436z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/car_sharing-m.svg b/data/styles/default/dark/symbols/car_sharing-m.svg
index d85831f08..22ea0a802 100644
--- a/data/styles/default/dark/symbols/car_sharing-m.svg
+++ b/data/styles/default/dark/symbols/car_sharing-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car_sharing-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="car_sharing-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m9.9298 8.8554c0.83557 0 1.549-0.53991 1.819-1.2855h3.323v0.64275c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-0.64275c0.35351 0 0.64275-0.28924 0.64275-0.64275 0-0.35351-0.28924-0.64275-0.64275-0.64275h-4.6085c-0.30852-0.86771-1.2084-1.4398-2.2046-1.2469-0.75201 0.14783-1.3626 0.76487-1.5105 1.5169-0.22496 1.2212 0.70702 2.301 1.8961 2.301zm0-2.571c0.35351 0 0.64275 0.28924 0.64275 0.64275 0 0.35351-0.28924 0.64275-0.64275 0.64275-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275zm5.3926 3.8565h-5.6433c-0.27638 0-0.52062 0.17997-0.61061 0.43707l-1.067 3.2202v4.0557c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-0.64275h6.4275v0.64275c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-4.0557l-1.067-3.2202c-0.089984-0.2571-0.33423-0.43707-0.61061-0.43707zm-4.7499 5.4633c-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275 0.35351 0 0.64275 0.28924 0.64275 0.64275 0 0.35351-0.28924 0.64275-0.64275 0.64275zm3.8565 0c-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275s0.64275 0.28924 0.64275 0.64275c0 0.35351-0.28924 0.64275-0.64275 0.64275zm-4.7113-2.8924 0.42421-1.2855h4.7178l0.42421 1.2855h-5.5662z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#6B425C" r="11"/><path d="m9.9298 8.8554c.83557 0 1.549-.53991 1.819-1.2855h3.323v.64275c0 .35351.28924.64275.64275.64275s.64275-.28924.64275-.64275v-.64275c.35351 0 .64275-.28924.64275-.64275s-.28924-.64275-.64275-.64275h-4.6085c-.30852-.86771-1.2084-1.4398-2.2046-1.2469-.75201.14783-1.3626.76487-1.5105 1.5169-.22496 1.2212.70702 2.301 1.8961 2.301zm0-2.571c.35351 0 .64275.28924.64275.64275s-.28924.64275-.64275.64275-.64275-.28924-.64275-.64275.28924-.64275.64275-.64275zm5.3926 3.8565h-5.6433c-.27638 0-.52062.17997-.61061.43707l-1.067 3.2202v4.0557c0 .35351.28924.64275.64275.64275s.64275-.28924.64275-.64275v-.64275h6.4275v.64275c0 .35351.28924.64275.64275.64275s.64275-.28924.64275-.64275v-4.0557l-1.067-3.2202c-.089984-.2571-.33423-.43707-.61061-.43707zm-4.7499 5.4633c-.35351 0-.64275-.28924-.64275-.64275s.28924-.64275.64275-.64275.64275.28924.64275.64275-.28924.64275-.64275.64275zm3.8565 0c-.35351 0-.64275-.28924-.64275-.64275s.28924-.64275.64275-.64275.64275.28924.64275.64275-.28924.64275-.64275.64275zm-4.7113-2.8924.42421-1.2855h4.7178l.42421 1.2855h-5.5662z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/carpenter-m.svg b/data/styles/default/dark/symbols/carpenter-m.svg
index 79498ca5c..3b116da88 100644
--- a/data/styles/default/dark/symbols/carpenter-m.svg
+++ b/data/styles/default/dark/symbols/carpenter-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m8.0041 4.7771a1.8905 1.8905 0 0 0-1.3379 0.55472l-1.95 1.95a1.8905 1.8905 0 0 0 3.381e-4 2.6737l1.8869 1.8869 2.0503-0.29964 3.4484-3.4506-2.762-2.7604a1.8905 1.8905 0 0 0-1.3359-0.55505zm0.57393 1.992 1.1497 1.1497-2.2237 2.2237-1.1497-1.1497zm4.0813 1.8978-3.4906 3.4906 2.2642 0.40984 0.62677 1.9912 1.7174-0.13698 0.62748 1.9364 1.7174-0.13698 0.76439 2.0179 1.6879-0.05738 1.7988-1.7988-7.714-7.7155z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m8.0041 4.7771a1.8905 1.8905 0 0 0 -1.3379.55472l-1.95 1.95a1.8905 1.8905 0 0 0 .0003381 2.6737l1.8869 1.8869 2.0503-.29964 3.4484-3.4506-2.762-2.7604a1.8905 1.8905 0 0 0 -1.3359-.55505zm.57393 1.992 1.1497 1.1497-2.2237 2.2237-1.1497-1.1497zm4.0813 1.8978-3.4906 3.4906 2.2642.40984.62677 1.9912 1.7174-.13698.62748 1.9364 1.7174-.13698.76439 2.0179 1.6879-.05738 1.7988-1.7988-7.714-7.7155z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/casino-m.svg b/data/styles/default/dark/symbols/casino-m.svg
index 9acbf622b..39d49d8d4 100644
--- a/data/styles/default/dark/symbols/casino-m.svg
+++ b/data/styles/default/dark/symbols/casino-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>casino-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="casino-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
-   <path id="Shape" d="m16.667 6h-9.3333c-0.73333 0-1.3333 0.6-1.3333 1.3333v9.3333c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-9.3333c0-0.73333-0.6-1.3333-1.3333-1.3333zm-7.6667 10c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm0-6c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm3 3c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm3 3c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm0-6c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m16.667 6h-9.3333c-.73333 0-1.3333.6-1.3333 1.3333v9.3333c0 .73333.6 1.3333 1.3333 1.3333h9.3333c.73333 0 1.3333-.6 1.3333-1.3333v-9.3333c0-.73333-.6-1.3333-1.3333-1.3333zm-7.6667 10c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm0-6c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm3 3c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm3 3c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm0-6c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/castle-m.svg b/data/styles/default/dark/symbols/castle-m.svg
new file mode 100644
index 000000000..e7ebd582d
--- /dev/null
+++ b/data/styles/default/dark/symbols/castle-m.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>castle-m</title>
+    <g id="castle-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#6E4426" cx="9" cy="9" r="8.25"></circle>
+        <path d="M11.4229281,7.01921423 L6.57676192,7.01921423 C6.19440065,7.01921423 5.88445961,6.7092682 5.88445961,6.32691192 L5.88445961,4.59615615 C5.88445961,4.40501052 6.03947013,4.25 6.23061577,4.25 C6.42176141,4.25 6.57677192,4.40501052 6.57677192,4.59615615 L6.57677192,5.63460962 L7.26907423,5.63460962 L7.26907423,4.94230731 C7.26907423,4.55994603 7.57902026,4.25 7.96137654,4.25 C8.34373281,4.25 8.65367885,4.55995103 8.65367885,4.94230731 L8.65367885,5.63460962 L9.34598115,5.63460962 L9.34598115,4.94230731 C9.34598115,4.55994603 9.65592719,4.25 10.0382835,4.25 C10.4206447,4.25 10.7305858,4.55995103 10.7305858,4.94230731 L10.7305858,5.63460962 L11.4228881,5.63460962 L11.4228881,4.59615615 C11.4228881,4.40501052 11.5778986,4.25 11.7690442,4.25 C11.9601899,4.25 12.1152004,4.40501052 12.1152004,4.59615615 L12.1152004,6.32691192 C12.1152004,6.7092732 11.8052544,7.01921423 11.4228981,7.01921423 L11.4229281,7.01921423 Z M13.1536838,13.250235 L4.84615615,13.250235 C4.65501052,13.250235 4.5,13.0952245 4.5,12.9040788 C4.5,12.7129332 4.65501052,12.5579227 4.84615615,12.5579227 L5.19231231,12.5579227 C5.57467358,12.5579227 5.88461462,12.2479767 5.88461462,11.8656204 C5.88461462,11.8656204 6.57691692,9.09636115 6.57691692,8.40405885 C6.57691692,8.02169757 6.88686296,7.71175654 7.26921923,7.71175654 L10.7307808,7.71175654 C11.113142,7.71175654 11.4230831,8.02170257 11.4230831,8.40405885 C11.4230831,9.09636115 12.1153854,11.8656204 12.1153854,11.8656204 C12.1153854,12.2479817 12.4253314,12.5579227 12.8076877,12.5579227 L13.1538438,12.5579227 C13.3423595,12.5578537 13.49626,12.7087082 13.5,12.8971538 C13.5,13.0952245 13.3449895,13.250235 13.1538438,13.250235 L13.1536838,13.250235 Z M10.0382735,10.8271269 C10.0382735,10.253625 9.57331691,9.78867346 8.99982,9.78867346 C8.42632309,9.78867346 7.96136654,10.25363 7.96136654,10.8271269 L7.96136654,12.5578827 L10.0382735,12.5578827 L10.0382735,10.1347746 L10.0382735,10.8271269 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/castle-s.svg b/data/styles/default/dark/symbols/castle-s.svg
new file mode 100644
index 000000000..530236c2a
--- /dev/null
+++ b/data/styles/default/dark/symbols/castle-s.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>castle-s</title>
+    <g id="castle-s" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="6" cy="6" r="6"></circle>
+        <circle id="Oval" fill="#6E4426" cx="6" cy="6" r="5.25"></circle>
+        <path d="M7.61524321,4.84609462 L4.38455013,4.84609462 C4.12964927,4.84609462 3.92302731,4.63946932 3.92302731,4.3845718 L3.92302731,3.23076474 C3.92302731,3.10333765 4.02636496,3 4.15379205,3 C4.28121915,3 4.3845568,3.10333765 4.3845568,3.23076474 L4.3845568,3.92304897 L4.84607962,3.92304897 L4.84607962,3.46152615 C4.84607962,3.20662529 5.05270491,3 5.30760244,3 C5.56249997,3 5.76912526,3.20662863 5.76912526,3.46152615 L5.76912526,3.92304897 L6.23064808,3.92304897 L6.23064808,3.46152615 C6.23064808,3.20662529 6.43727337,3 6.6921709,3 C6.94707176,3 7.15369372,3.20662863 7.15369372,3.46152615 L7.15369372,3.92304897 L7.61521654,3.92304897 L7.61521654,3.23076474 C7.61521654,3.10333765 7.71855419,3 7.84598129,3 C7.97340838,3 8.07674603,3.10333765 8.07674603,3.23076474 L8.07674603,4.3845718 C8.07674603,4.63947266 7.87012074,4.84609462 7.61522321,4.84609462 L7.61524321,4.84609462 Z M8.76905026,9 L3.23084308,9 C3.10341598,9 3.00007833,8.89666235 3.00007833,8.76923526 C3.00007833,8.64180816 3.10341598,8.53847051 3.23084308,8.53847051 L3.46160782,8.53847051 C3.71650868,8.53847051 3.92313064,8.33184522 3.92313064,8.07694769 C3.92313064,8.07694769 4.38465346,6.23082308 4.38465346,5.76930025 C4.38465346,5.51439939 4.59127875,5.30777743 4.84617628,5.30777743 L7.15382372,5.30777743 C7.40872458,5.30777743 7.61534654,5.51440273 7.61534654,5.76930025 C7.61534654,6.23082308 8.07686936,8.07694769 8.07686936,8.07694769 C8.07686936,8.33184855 8.28349465,8.53847051 8.53839218,8.53847051 L8.76915692,8.53847051 C8.89483073,8.53842451 8.99742839,8.63899156 8.99992167,8.76461869 C8.99992167,8.89666235 8.89658402,9 8.76915692,9 L8.76905026,9 Z M6.69216423,7.38463679 C6.69216423,7.00231217 6.38220129,6.69235256 5.99988,6.69235256 C5.61755871,6.69235256 5.30759577,7.0023155 5.30759577,7.38463679 L5.30759577,8.53844385 L6.69216423,8.53844385 L6.69216423,6.92308064 L6.69216423,7.38463679 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/caterer-m.svg b/data/styles/default/dark/symbols/caterer-m.svg
index ddfc46a75..341e53532 100644
--- a/data/styles/default/dark/symbols/caterer-m.svg
+++ b/data/styles/default/dark/symbols/caterer-m.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
- <path d="m12 6.668c-3.1385 0-5.5288 2.7084-5.9375 5.998h11.875c-0.40868-3.2897-2.799-5.998-5.9375-5.998z" fill="#000"/>
- <rect x="3.9999" y="12.666" width="16" height=".66675" fill="#6B425C"/>
- <path d="m12 9.2229v-2.5564" stroke="#000" stroke-width="2.667" stroke-linecap="round"/>
- <path d="m5.3333 14h13.333" stroke="#000" stroke-width="1.333" stroke-linecap="round"/>
- <path d="m8.1773 11.312a4.3334 5 0 0 1 3.8226-2.645" fill="none" stroke="#6B425C" stroke-linecap="round" stroke-width="1.333"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m12 6.668c-3.1385 0-5.5288 2.7084-5.9375 5.998h11.875c-.40868-3.2897-2.799-5.998-5.9375-5.998z" fill="#000"/><path d="m3.9999 12.666h16v.66675h-16z" fill="#574469"/><g stroke-linecap="round"><path d="m12 9.2229v-2.5564" stroke="#000" stroke-width="2.667"/><g stroke-width="1.333"><path d="m5.3333 14h13.333" stroke="#000"/><path d="m8.1773 11.312a4.3334 5 0 0 1 3.8226-2.645" fill="none" stroke="#574469"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/charging-point-m.svg b/data/styles/default/dark/symbols/charging-point-m.svg
new file mode 100644
index 000000000..e8963edd9
--- /dev/null
+++ b/data/styles/default/dark/symbols/charging-point-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m3.85038523 3.00000538c-.31869573-.0009545-.62461528.12522209-.84996822.35057503-.22535293.22535293-.35152952.53127248-.35057503.84996821v9.59890278c-.00095449.3186957.1252221.6246153.35057503.8499682.22535294.2253529.53127249.3515295.84996822.350575h4.79945675c.31853461.0007145.62422228-.125568.84938017-.3508948.22515788-.2253268.35121114-.5311091.35025231-.8496484v-2.3992757h.60026894c.3383824 0 .6002689.2609864.6002689.5993689v1.2005378c0 .9863489.8126579 1.7999122 1.7999067 1.7999122.9863489 0 1.7999068-.8135633 1.7999068-1.7999122v-4.20007702c-.000212-.03379448-.0032222-.06750797-.0089995-.10080016.5120734-.17999067.9197523-.58766956 1.1033428-1.09884308h.1052945c.31854.00071996.6242277-.12556257.8493856-.35088937.2251579-.22532679.3512111-.53110908.3502577-.84964844h-1.1996433v-2.39927571c.0085169-.21983635-.1039086-.42671845-.2929997-.53916908-.189091-.11245063-.4245474-.11245063-.6136384 0s-.3015166.31933273-.2929997.53916908v2.39927571h-1.2005378v-2.39927571c.0085169-.21983635-.1039087-.42671845-.2929997-.53916908s-.4245474-.11245063-.6136385 0c-.189091.11245063-.3015166.31933273-.2929997.53916908v2.39927571h-1.1996378c-.0009589.31853936.1250944.62432165.3502523.84964844.2251579.2253268.5308455.35160933.8493855.35088937h.1052946c.1847635.51328337.5900599.91659781 1.1042428 1.09884308-.0057693.03329326-.0087793.06700608-.0089996.10080016v4.20007702c0 .3383825-.2618864.599369-.6002689.599369-.1597823.0024475-.3137516-.0598843-.4268328-.1727959-.1130811-.1129117-.1756439-.2667873-.1734361-.4265731v-1.2005378c0-.9863489-.8126579-1.7999067-1.7999067-1.7999067h-.60026894v-5.99908928c.00095883-.31853935-.12509443-.62432164-.35025231-.84964844-.22515789-.22532679-.53084556-.35160932-.84938017-.3508948zm.59936895 1.20054324h3.59981352c.33298275 0 .60026891.26728616.60026891.59936895v3.00044457h-4.79945138v-3.00044457c0-.33208279.26728615-.59936895.59936895-.59936895zm3.16873585 4.4997669c.06838564.00122217.1341039.02674382.1853904.07199627.0926952.09359516.09359515.23398788.00179991.32848299l-1.4363256 1.66131392 1.07994406 1.0853438c.04521547.0436508.06897825.1049573.0649932.1676785s-.03531576.1205273-.08569213.1581046l-2.35787786 1.8656034c-.11171816.08556-.26822272.0806693-.3743806-.0116994-.04461171-.0428224-.07005363-.1018365-.07056963-.1636726-.00050048-.0618362.02396797-.1212605.06786977-.1648104l1.43722554-1.6586141-1.08084401-1.0880436c-.04521547-.0436508-.06897825-.1049573-.0649932-.1676785.00398505-.0627213.03531576-.1205274.08569213-.1581046l2.35787786-1.8656034c.05421755-.04184026.12146681-.06319428.18989016-.06029688z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/charging-point-s.svg b/data/styles/default/dark/symbols/charging-point-s.svg
new file mode 100644
index 000000000..dcdc75c73
--- /dev/null
+++ b/data/styles/default/dark/symbols/charging-point-s.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>car-charger-s</title>
+    <g id="car-charger-s" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M3.50053103,2.50000004 C3.31462519,2.49944325 3.13617212,2.57304626 3.00471624,2.70450214 C2.87326036,2.83595802 2.79965735,3.01441108 2.80021414,3.20031693 L2.80021414,8.79967687 C2.79965735,8.98558271 2.87326036,9.16403578 3.00471624,9.29549166 C3.13617212,9.42694754 3.31462519,9.50055055 3.50053103,9.50000004 L6.30021414,9.50000004 C6.48602599,9.50041057 6.6643438,9.42674576 6.7956859,9.29530512 C6.927028,9.16386449 7.00055907,8.98549149 6.99999975,8.79967687 L6.99999975,7.40009937 L7.35015661,7.40009937 C7.54754639,7.40009937 7.70031347,7.55234148 7.70031347,7.74973126 L7.70031347,8.45004498 C7.70031347,9.02541518 8.17436391,9.50000004 8.75025908,9.50000004 C9.32562928,9.50000004 9.80021414,9.02541518 9.80021414,8.45004498 L9.80021414,6.00000004 C9.80008102,5.98028659 9.79832511,5.96062039 9.79495496,5.94119994 C10.0936645,5.83620538 10.3314772,5.5983927 10.4385716,5.30020815 L10.4999934,5.30020815 C10.6858084,5.30062812 10.8641262,5.22696331 10.9954683,5.09552268 C11.1268104,4.96408205 11.2003415,4.78570905 11.1997854,4.59989443 L10.4999934,4.59989443 L10.4999934,3.20031693 C10.5049616,3.07207906 10.43938,2.95139783 10.3290769,2.88580163 C10.2187738,2.82020543 10.0814243,2.82020543 9.97112119,2.88580163 C9.86081809,2.95139783 9.79523651,3.07207906 9.80021414,3.20031693 L9.80021414,4.59989443 L9.09989097,4.59989443 L9.09989097,3.20031693 C9.10485915,3.07207906 9.03927757,2.95139783 8.92897447,2.88580163 C8.81867138,2.82020543 8.68132181,2.82020543 8.57101872,2.88580163 C8.46071562,2.95139783 8.39513404,3.07207906 8.40010222,3.20031693 L8.40010222,4.59989443 L7.70031347,4.59989443 C7.69975415,4.78570905 7.77328522,4.96408205 7.90462732,5.09552268 C8.03596942,5.22696331 8.21428723,5.30062812 8.40010222,5.30020815 L8.46152404,5.30020815 C8.56930279,5.59962345 8.80572565,5.8348902 9.10566567,5.94119994 C9.10230029,5.96062101 9.10054441,5.98028682 9.10041594,6.00000004 L9.10041594,8.45004498 C9.10041594,8.64743476 8.94764886,8.79967687 8.75025908,8.79967687 C8.65705272,8.8011046 8.5672373,8.76474437 8.50127329,8.69887926 C8.43530928,8.63301414 8.39881434,8.54325338 8.40010222,8.45004498 L8.40010222,7.74973126 C8.40010222,7.17436106 7.92605178,6.69978565 7.35015661,6.69978565 L6.99999975,6.69978565 L6.99999975,3.20031693 C7.00055907,3.01450231 6.927028,2.8361293 6.7956859,2.70468867 C6.6643438,2.57324804 6.48602599,2.49958323 6.30021414,2.50000004 L3.50053103,2.50000004 Z M3.85016292,3.20031693 L5.95005414,3.20031693 C6.14429408,3.20031693 6.300211,3.35623385 6.300211,3.54994882 L6.300211,5.30020815 L3.50053103,5.30020815 L3.50053103,3.54994882 C3.50053103,3.35623385 3.65644795,3.20031693 3.85016292,3.20031693 Z M5.69859217,5.82518095 C5.73848379,5.82589388 5.77681944,5.84078151 5.80673656,5.86717878 C5.86080876,5.92177595 5.86133373,6.00367171 5.80778651,6.05879385 L4.96992991,7.02789365 L5.59989728,7.66101085 C5.62627297,7.68647382 5.64013459,7.72223596 5.63780998,7.75882333 C5.63548537,7.7954107 5.61720912,7.82913093 5.5878229,7.85105101 L4.21239415,8.93931963 C4.14722523,8.98922968 4.0559309,8.98637673 3.99400547,8.93249499 C3.96798197,8.90751525 3.95314085,8.87309035 3.95283985,8.83701929 C3.9525479,8.80094823 3.96682117,8.76628403 3.99243055,8.74087991 L4.83081212,7.77335503 L4.20031978,7.13866291 C4.17394409,7.11319995 4.16008247,7.07743781 4.16240708,7.04085044 C4.16473169,7.00426307 4.18300794,6.97054283 4.21239415,6.94862276 L5.5878229,5.86035413 C5.61944981,5.83594732 5.65867854,5.8234908 5.69859217,5.82518095 L5.69859217,5.82518095 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/charging-station-m.svg b/data/styles/default/dark/symbols/charging-station-m.svg
index 787a8bfcc..20bb7b2cb 100644
--- a/data/styles/default/dark/symbols/charging-station-m.svg
+++ b/data/styles/default/dark/symbols/charging-station-m.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path d="M6.667 5.333a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2V12a.68.68 0 0 0-.01-.112 2.023 2.023 0 0 0 1.226-1.221H20a1.33 1.33 0 0 0 1.333-1.334H20V6.667a.667.667 0 1 0-1.333 0v2.666h-1.334V6.667a.667.667 0 1 0-1.333 0v2.666h-1.333A1.33 1.33 0 0 0 16 10.667h.117a2.022 2.022 0 0 0 1.227 1.221.682.682 0 0 0-.01.112v4.667a.657.657 0 0 1-.667.666.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333Zm.666 1.334h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zm3.521 5a.32.32 0 0 1 .206.08c.103.104.104.26.002.365l-1.596 1.846 1.2 1.206a.238.238 0 0 1-.023.362l-2.62 2.073a.329.329 0 0 1-.416-.013.255.255 0 0 1-.003-.365l1.597-1.843L8 14.169a.238.238 0 0 1 .023-.362l2.62-2.073a.323.323 0 0 1 .211-.067z" style="fill:#777;fill-opacity:1;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>car-charging-station-m</title>
+    <g id="car-charging-station-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#51585E" cx="9" cy="9" r="8.25"></circle>
+        <path d="M5.50068347,4.50000005 C5.26166167,4.49928417 5.03222201,4.59391662 4.8632073,4.76293132 C4.6941926,4.93194602 4.59956016,5.16138568 4.60027603,5.40040748 L4.60027603,12.5995845 C4.59956016,12.8386063 4.6941926,13.068046 4.8632073,13.2370607 C5.03222201,13.4060754 5.26166167,13.5007079 5.50068347,13.5 L9.10027603,13.5 C9.33917699,13.5005279 9.56844274,13.405816 9.73731116,13.2368209 C9.90617957,13.0678258 10.0007195,12.8384891 10.0000004,12.5995845 L10.0000004,10.8001278 L10.4502021,10.8001278 C10.7039889,10.8001278 10.9004037,10.9958676 10.9004037,11.2496545 L10.9004037,12.1500578 C10.9004037,12.8898195 11.5098972,13.5 12.2503338,13.5 C12.9900955,13.5 13.6002639,12.8898195 13.6002639,12.1500578 L13.6002639,9.00000005 C13.6001049,8.97465419 13.5978473,8.94936907 13.5935142,8.92439993 C13.9775693,8.78940692 14.2833285,8.48364776 14.4210214,8.10026762 L14.4999923,8.10026762 C14.7388973,8.10080759 14.968163,8.00609569 15.1370314,7.83710059 C15.3058999,7.6681055 15.4004398,7.43876878 15.3997247,7.19986426 L14.4999923,7.19986426 L14.4999923,5.40040748 C14.5063799,5.23553022 14.4220608,5.08036864 14.2802425,4.99603067 C14.1384242,4.9116927 13.9618319,4.9116927 13.8200137,4.99603067 C13.6781954,5.08036864 13.5938762,5.23553022 13.6002639,5.40040748 L13.6002639,7.19986426 L12.6998605,7.19986426 L12.6998605,5.40040748 C12.7062482,5.23553022 12.621929,5.08036864 12.4801107,4.99603067 C12.3382925,4.9116927 12.1617002,4.9116927 12.0198819,4.99603067 C11.8780637,5.08036864 11.7937445,5.23553022 11.8001321,5.40040748 L11.8001321,7.19986426 L10.9004037,7.19986426 C10.8996846,7.43876878 10.9942246,7.6681055 11.163093,7.83710059 C11.3319614,8.00609569 11.5612272,8.10080759 11.8001321,8.10026762 L11.879103,8.10026762 C12.0176757,8.48523015 12.321648,8.78771597 12.7072851,8.92439993 C12.7029582,8.94936987 12.7007007,8.97465448 12.7005355,9.00000005 L12.7005355,12.1500578 C12.7005355,12.4038447 12.5041207,12.5995845 12.2503338,12.5995845 C12.1304971,12.6014202 12.0150201,12.5546713 11.9302092,12.4699876 C11.8453984,12.3853039 11.7984763,12.2698972 11.8001321,12.1500578 L11.8001321,11.2496545 C11.8001321,10.5098928 11.1906387,9.8997244 10.4502021,9.8997244 L10.0000004,9.8997244 L10.0000004,5.40040748 C10.0007195,5.16150297 9.90617957,4.93216625 9.73731116,4.76317115 C9.56844274,4.59417605 9.33917699,4.49946416 9.10027603,4.50000005 L5.50068347,4.50000005 Z M5.95021018,5.40040748 L8.65007032,5.40040748 C8.89980738,5.40040748 9.100272,5.6008721 9.100272,5.84993419 L9.100272,8.10026762 L5.50068347,8.10026762 L5.50068347,5.84993419 C5.50068347,5.6008721 5.70114808,5.40040748 5.95021018,5.40040748 Z M8.32676207,8.77523266 C8.3780513,8.77614928 8.42733999,8.79529052 8.46580487,8.82922986 C8.53532627,8.89942622 8.53600123,9.00472077 8.4671548,9.0755921 L7.3899106,10.3215776 L8.19986864,11.1355854 C8.23378025,11.1683235 8.25160233,11.2143034 8.24861354,11.2613443 C8.24562476,11.3083852 8.22212673,11.3517398 8.18434445,11.3799227 L6.41593605,12.7791252 C6.33214744,12.8432953 6.21476901,12.8396272 6.1351506,12.7703507 C6.10169182,12.7382339 6.08261038,12.6939733 6.08222338,12.6475962 C6.08184802,12.6012191 6.10019936,12.5566509 6.13312571,12.5239885 L7.21104487,11.2800279 L6.40041186,10.4639952 C6.36650026,10.4312571 6.34867817,10.3852772 6.35166696,10.3382363 C6.35465574,10.2911954 6.37815378,10.2478408 6.41593605,10.2196578 L8.18434445,8.82045531 C8.22500761,8.78907512 8.27544455,8.7730596 8.32676207,8.77523266 L8.32676207,8.77523266 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/charging-station-s.svg b/data/styles/default/dark/symbols/charging-station-s.svg
index d0337a288..3537128b2 100644
--- a/data/styles/default/dark/symbols/charging-station-s.svg
+++ b/data/styles/default/dark/symbols/charging-station-s.svg
@@ -1,7 +1,9 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <g fill-rule="evenodd" opacity="1">
-  <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#51585E"/>
-  <path d="m4.9543 4h3.4248c0.29547 0 0.50983 0.22388 0.50983 0.50004v6.6111h0.44444v0.88889h-5.3333v-0.88889h0.44444v-6.6111c0-0.27942 0.22826-0.50004 0.50983-0.50004zm6.5584 4.0394 0.45533 2.0732c0.079682 0.33803 0.011383 0.70986-0.21628 1.0141-0.22766 0.29296-0.56916 0.4507-0.93342 0.4507-0.66022 0-1.1839-0.51831-1.1839-1.1718v-0.033803l0.18213-1.6789c0-0.22535-0.18213-0.40563-0.40979-0.40563h-0.51793v-0.48451h0.51793c0.48948 0 0.89927 0.42817 0.89927 0.91268v0.033803l-0.19351 1.6563c0.022766 0.37183 0.31873 0.66479 0.69437 0.66479 0.21628 0 0.40979-0.10141 0.54639-0.25915 0.12522-0.16901 0.15936-0.37183 0.11383-0.58592l-0.44394-2.0732c-0.045533-0.14648-0.079682-0.32676-0.079682-0.48451v-0.50704l-0.22766-0.32676c0.011383-0.84507-0.92204-1.7014-0.92204-1.7014l0.25043-0.39437c1.9124 0.72113 1.7758 2.0169 1.7758 2.0169l-0.3415 0.40563h-0.03415v0.50704c0 0.12394 0.03415 0.23662 0.068299 0.37183zm-5.1794 2.1828 1.6667-2.6843h-1.3333l0.33333-1.7602-1.6667 2.6843h1.3l-0.3 1.7602z" fill="#000"/>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>car-charging-station-s</title>
+    <g id="car-charging-station-s" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="6" cy="6" r="6"></circle>
+        <circle id="Oval" fill="#51585E" cx="6" cy="6" r="5.25"></circle>
+        <path d="M3.60027378,3.00000535 C3.44092605,2.9995281 3.28796642,3.06261634 3.17529005,3.17529271 C3.06261368,3.28796907 2.99952544,3.44092871 3.00000269,3.60027644 L3.00000269,8.39972356 C2.99952544,8.55907129 3.06261368,8.71203093 3.17529005,8.82470729 C3.28796642,8.93738366 3.44092605,9.0004719 3.60027378,8.99999465 L6.00000269,8.99999465 C6.15926719,9.00035191 6.31211089,8.9372107 6.42468974,8.82454741 C6.53726858,8.71188411 6.60029515,8.5589931 6.59981574,8.39972356 L6.59981574,7.20008677 L6.89994992,7.20008677 C7.06914101,7.20008677 7.20008411,7.33057989 7.20008411,7.49977098 L7.20008411,8.10003935 C7.20008411,8.59321337 7.6064127,8.99999465 8.10003669,8.99999465 C8.59321071,8.99999465 8.99998928,8.59321337 8.99998928,8.10003935 L8.99998928,6.00000535 C8.99988327,5.98310547 8.9983782,5.96624873 8.99548951,5.94960266 C9.25152602,5.8596074 9.45536528,5.65576814 9.54716045,5.4001816 L9.59980767,5.4001816 C9.75907752,5.40054158 9.91192123,5.33740037 10.0245001,5.22473707 C10.1370789,5.11207378 10.2001055,4.95918277 10.1996288,4.79991323 L9.59980767,4.79991323 L9.59980767,3.60027644 C9.60406611,3.49035836 9.54785337,3.3869174 9.45330795,3.33069214 C9.35876252,3.27446687 9.24103443,3.27446687 9.146489,3.33069214 C9.05194358,3.3869174 8.99573084,3.49035836 8.99998928,3.60027644 L8.99998928,4.79991323 L8.3997209,4.79991323 L8.3997209,3.60027644 C8.40397934,3.49035836 8.3477666,3.3869174 8.25322118,3.33069214 C8.15867575,3.27446687 8.04094766,3.27446687 7.94640223,3.33069214 C7.85185681,3.3869174 7.79564407,3.49035836 7.79990251,3.60027644 L7.79990251,4.79991323 L7.20008411,4.79991323 C7.1996047,4.95918277 7.26263127,5.11207378 7.37521011,5.22473707 C7.48778896,5.33740037 7.64063266,5.40054158 7.79990251,5.4001816 L7.85254973,5.4001816 C7.94493144,5.65682306 8.14757942,5.8584801 8.40467064,5.94960266 C8.40178603,5.96624927 8.400281,5.98310566 8.40017088,6.00000535 L8.40017088,8.10003935 C8.40017088,8.26923044 8.26922778,8.39972356 8.10003669,8.39972356 C8.0201456,8.40094733 7.94316102,8.36978145 7.88662049,8.31332569 C7.83007996,8.25686992 7.79879861,8.17993219 7.79990251,8.10003935 L7.79990251,7.49977098 C7.79990251,7.00659696 7.39357392,6.5998184 6.89994992,6.5998184 L6.59981574,6.5998184 L6.59981574,3.60027644 C6.60029515,3.4410069 6.53726858,3.28811589 6.42468974,3.17545259 C6.31211089,3.0627893 6.15926719,2.99964809 6.00000269,3.00000535 L3.60027378,3.00000535 Z M3.89995799,3.60027644 L5.69986316,3.60027644 C5.86635438,3.60027644 5.99999734,3.7339194 5.99999734,3.89996065 L5.99999734,5.4001816 L3.60027378,5.4001816 L3.60027378,3.89996065 C3.60027378,3.7339194 3.73391674,3.60027644 3.89995799,3.60027644 Z M5.48432451,5.85015789 C5.5185173,5.85076898 5.5513764,5.86352979 5.57701963,5.886156 C5.62336719,5.93295353 5.62381716,6.00314983 5.57791958,6.05039734 L4.85975742,6.88105358 L5.39972897,7.42372499 C5.42233669,7.44555036 5.43421806,7.4762036 5.43222554,7.50756418 C5.43023302,7.53892475 5.41456768,7.56782778 5.38937951,7.5866164 L4.21044163,8.51941726 C4.1545826,8.56219725 4.07633039,8.55975187 4.02325149,8.51356756 C4.00094566,8.49215638 3.98822471,8.46264935 3.98796671,8.43173132 C3.98771647,8.4008133 3.99995069,8.37110116 4.02190156,8.34932622 L4.7405137,7.52001991 L4.20009218,6.97599858 C4.17748446,6.9541732 4.16560308,6.92351996 4.1675956,6.89215939 C4.16958813,6.86079881 4.18525347,6.83189578 4.21044163,6.81310716 L5.38937951,5.88030631 C5.41648827,5.8593862 5.45011287,5.84870919 5.48432451,5.85015789 L5.48432451,5.85015789 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/cinema-m.svg b/data/styles/default/dark/symbols/cinema-m.svg
index d9e424791..81c131804 100644
--- a/data/styles/default/dark/symbols/cinema-m.svg
+++ b/data/styles/default/dark/symbols/cinema-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>cinema-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="cinema-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
-   <path id="Shape" d="m16.333 6.6667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667h-4c-0.36667 0-0.66667 0.3-0.66667 0.66667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667-0.36667 0-0.66667 0.3-0.66667 0.66667v10.667c0 0.36667 0.3 0.66667 0.66667 0.66667 0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667h4c0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667s0.66667-0.3 0.66667-0.66667v-10.667c0-0.36667-0.3-0.66667-0.66667-0.66667s-0.66667 0.3-0.66667 0.66667zm-6.6667 8.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm6.6667 5.3333h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m16.333 6.6667v.66667h-1.3333v-.66667c0-.36667-.3-.66667-.66667-.66667h-4c-.36667 0-.66667.3-.66667.66667v.66667h-1.3333v-.66667c0-.36667-.3-.66667-.66667-.66667s-.66667.3-.66667.66667v10.667c0 .36667.3.66667.66667.66667s.66667-.3.66667-.66667v-.66667h1.3333v.66667c0 .36667.3.66667.66667.66667h4c.36667 0 .66667-.3.66667-.66667v-.66667h1.3333v.66667c0 .36667.3.66667.66667.66667s.66667-.3.66667-.66667v-10.667c0-.36667-.3-.66667-.66667-.66667s-.66667.3-.66667.66667zm-6.6667 8.6667h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333zm6.6667 5.3333h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/climbing-centre-m.svg b/data/styles/default/dark/symbols/climbing-centre-m.svg
new file mode 100644
index 000000000..e370c0a8c
--- /dev/null
+++ b/data/styles/default/dark/symbols/climbing-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m7.12322426 4.4275468c.1310725 0 .24663999.06564985.31633037.1657106h5.86540697c.3161032 0 .5703839.25407967.5703839.57061102l-.0074275 8.78535278c-.0004456.2840341-.1550937.3681389-.3456556.1877919-.1903173-.1803732-.4221147-.543645-.5179112-.8112951l-.656848-1.8391219c-.0794474-.014466-.1573988-.0427025-.2298662-.0883778l-2.86367197-1.81378127-2.53162164.82529367-.04269818.0095752c-.12149547.595244-.10387933 1.4949431.76306914 2.2382814.05416178.0462948.0603152.1274462.01401777.1814131-.0252769.0297447-.06139961.0448268-.09750047.0448268-.02974734 0-.0594938-.0101712-.08370901-.0310117-.92324149-.7911537-.96998019-1.7589755-.85208485-2.4217829-.16132403-.0254955-.30829964-.1112351-.40934102-.2437041l-.07416359-.1172529-.14531571-.31121856c-.36499322-.11855071-1.00760673-.39687005-1.299278-.94835323-.30767959-.58171723-.16409578-1.38265176-.06563831-1.76845029l.06563831-.22568672.0036211.00679829c.01252179-.17929844.12087506-.34394123.30144053-.41956307l1.00121914-.41807759c.26233724-.1093931.57866761.00744492.70698759.26087797l.27130434.53708434.32503359-.03718877-.66535896-1.79892637c-.04396347-.11854197-.02677025-.2508815.04525322-.3543414.07224716-.10365737.19056193-.1654834.3167498-.1654834zm2.19545563 1.4150955c-.04736086 1.32855086-.85440919 2.3333876-1.30434613 2.79289283l1.12844684-.36793798c.18268011-.05969479.3811064-.03443275.54383728.06817954l2.80032022 1.77341091.4289217-.96853837c.1153438-.25982939.1459361-.6619773.0694684-.89819616-.0766949-.23623633-.3596542-.49434168-.6317956-.57656171l-1.3079288-.39493018c-.2449273-.07399567-.4724536-.31885221-.5424584-.57057715l-.034709-.16757672c-.0705526-.24977992-.3010158-.48350903-.54958427-.54411092zm-1.89554253-.46187764.57676269 1.55906369c.04121007.11109706.02888052.23495183-.03314561.33607863-.06202351.10112593-.16697763.16781737-.28487297.18141308l-.53005545.06059919.54193236 1.07217305.10801774-.10447479c.41951113-.41999312 1.23646105-1.40275639 1.26090345-2.70545747zm-3.28577087-.40707623c-.11237282-.74142471.55998541-1.35537704 1.28503479-1.17309888.81873127.20499739 1.06410772 1.3105415.40829958 1.83143235-.62797709.49816288-1.57372634.13065307-1.69333437-.65833347z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/climbing-m.svg b/data/styles/default/dark/symbols/climbing-m.svg
index 7f3bb6913..82b38eb03 100644
--- a/data/styles/default/dark/symbols/climbing-m.svg
+++ b/data/styles/default/dark/symbols/climbing-m.svg
@@ -1,13 +1,4 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>climbing-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="climbing-m" fill-rule="nonzero">
-   <g id="climbing-silhouette" transform="translate(6,6)" fill="#777777">
-    <g transform="matrix(1.6132 0 0 1.6132 -3.0024 -3.6586)" >
-     <path id="Path" d="m1.9535 2.1329c0.75051-0.59611 0.4697-1.8613-0.46726-2.0959-0.82975-0.2086-1.5992 0.49401-1.4706 1.3425 0.13688 0.90292 1.2192 1.3235 1.9378 0.75341z" />
-     <path id="Shape" d="m2.7293 2.836c-0.14685-0.29003-0.50886-0.42374-0.80908-0.29855l-1.1458 0.47845c-0.20664 0.086542-0.33064 0.27496-0.34497 0.48015l-0.004144-0.00778s-0.48015 1.3743 0 2.2821c0.33379 0.63112 1.0692 0.94963 1.4869 1.0853l0.1663 0.35616c0.00534 0.011161 0.012661 0.020441 0.018229 0.031119l0.011186 0.023848 0.00219-9.661e-4c0.11329 0.19716 0.30633 0.32504 0.52172 0.35908-0.13492 0.75852-0.081432 1.8661 0.97513 2.7715 0.027712 0.02385 0.061754 0.03549 0.095797 0.03549 0.041314 0 0.082653-0.01726 0.11158-0.0513 0.052983-0.06176 0.045941-0.15463-0.016042-0.20761-0.99214-0.85068-1.0123-1.8803-0.87326-2.5615 0.016297-0.00412 0.032568-0.00582 0.048864-0.010958l2.8972-0.94447 3.2772 2.0757c0.082932 0.052271 0.17214 0.084585 0.26306 0.10114l0.7517 2.1047c0.10963 0.3063 0.3749 0.72203 0.5927 0.92845 0.21808 0.20639 0.39506 0.11014 0.39557-0.21491l0.0085-10.054c0-0.36224-0.291-0.65301-0.65275-0.65301h-6.7124c-0.079754-0.11451-0.21201-0.18964-0.36201-0.18964h-0.36808c-0.14441 0-0.27981 0.070754-0.36249 0.18938-0.082424 0.1184-0.1021 0.26985-0.051788 0.40551l0.76144 2.0587-0.37197 0.042559zm3.9027-0.29492c0.31607 0.077059 0.60656 0.39872 0.64886 0.7184 0.042305 0.31945 0.32916 0.65494 0.6406 0.74903l1.4968 0.45196c0.31144 0.094093 0.63526 0.38947 0.72303 0.65982 0.08751 0.27033 0.0525 0.73055-0.0795 1.0279l-0.49086 1.1084-3.2047-2.0295c-0.18623-0.11743-0.41331-0.14634-0.62237-0.078025l-1.2914 0.42107c0.51491-0.52586 1.4385-1.6758 1.4927-3.1962zm-2.56 1.6807c0.13492-0.015559 0.25503-0.091881 0.32601-0.20761 0.070983-0.11573 0.085093-0.25747 0.037932-0.38461l-0.66005-1.7842 1.8763 0.45707c-0.030636 1.6328-1.1492 2.8264-1.5666 3.2157l-0.62019-1.227z" />
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+
+
+
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.40138743 2.66891096c.181485 0 .34150154.09089979.4379959.22944544h8.12133277c.4376813 0 .7897622.35180262.7897622.79007679l-.0102841 12.16433461c-.0006171.393278-.2147452.5097309-.4786002.2600196-.2635162-.2497476-.5844664-.7527393-.7171077-1.1233317l-.9094818-2.5464765c-.1100041-.0200299-.2179369-.0591266-.3182763-.1223693l-3.96508431-2.5113894-3.50532228 1.1427143-.05912055.013258c-.1682245.8241839-.14383292 2.0699212 1.05655727 3.0991589.07499323.0641005.08351335.1764639.01940922.2511873-.03499878.041185-.08501484.0620679-.13500065.0620679-.04118862 0-.08237604-.0140832-.11590479-.0429394-1.27833436-1.0954434-1.34304949-2.4355045-1.17980978-3.3532378-.22337174-.0353014-.42687643-.1540178-.56677988-.3374364l-.10268804-.1623502-.20120637-.430918c-.50537523-.1641471-1.39514779-.54951235-1.79900031-1.31310444-.42601789-.80545462-.22720954-1.9144409-.09088382-2.44862347l.09088382-.31248932.00501382.00941303c.01733787-.24825939.16736547-.47622632.41737921-.58093349l1.38630342-.57887665c.36323618-.15146739.80123207.01030834.97890589.36121564l.37565217.74365523.4500465-.05149213-.92126625-2.49082113c-.06087249-.16413503-.0370665-.34737439.0626583-.49062655.10003453-.1435256.26385499-.22913086.43857665-.22913086zm3.03986165 1.959363c-.06557658 1.83953196-1.18302812 3.23084436-1.80601773 3.86708238l1.56246486-.5094526c.2529417-.08265431.52768579-.04767611.75300547.09440245l3.87736652 2.45549201.5938915-1.34105312c.1597068-.35976376.2020654-.91658394.0961871-1.24365621-.106193-.32709646-.4979828-.6844731-.874794-.79831622l-1.8109783-.5468264c-.3391302-.10245554-.6541665-.44148767-.7510962-.7900299l-.0480586-.23202931c-.0976882-.34584911-.4167911-.66947403-.7609629-.75338435zm-2.62459735-.6395229.7985945 2.15870358c.05706009.15382669.0399884.32531792-.04589393.46533964-.0858787.14002052-.23119979.23236251-.3944395.25118734l-.73392292.08390657.75036788 1.4845473.14956302-.14465741c.58086156-.58152892 1.712023-1.94227806 1.74586632-3.74601802zm-4.54952889-.56364401c-.15559314-1.02658805.77536441-1.87667589 1.77927894-1.62429075 1.1336279.28384254 1.47337992 1.81459592.56533787 2.53582941-.86950673.68976399-2.1790057.18090425-2.34461681-.91153866z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/craft-m.svg b/data/styles/default/dark/symbols/craft-m.svg
index 2b6ee4ecc..2705e1ec0 100644
--- a/data/styles/default/dark/symbols/craft-m.svg
+++ b/data/styles/default/dark/symbols/craft-m.svg
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#6B425C"/>
- <path d="m12.5 12.44c0-0.36313-0.29312-0.65625-0.65625-0.65625h-2.1875c-0.1225 0-0.21875-0.09625-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h3.5c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-3.5c-0.1225 0-0.21875-0.096248-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h3.9375c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-3.9332c-0.1225 0-0.21875-0.096247-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h2.6206c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-4.9918l1.0281-1.8025c0.14438-0.25375 0.105-0.56875-0.096248-0.77872-0.25375-0.2625-0.67375-0.27125-0.93188-0.013125l-3.0144 2.9662c-0.33688 0.32812-0.525 0.77438-0.525 1.2469v3.1937c0 0.9669 0.78315 1.75 1.75 1.75h6.3437c0.36313 0 0.65625-0.29312 0.65625-0.65625z" fill="#000"/>
-</svg>
+
+
+
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#574469" r="8.25"/><path d="m12.5 12.44c0-.36313-.29312-.65625-.65625-.65625h-2.1875c-.1225 0-.21875-.09625-.21875-.21875s.096248-.21875.21875-.21875h3.5c.36313 0 .65625-.29312.65625-.65625s-.29312-.65625-.65625-.65625h-3.5c-.1225 0-.21875-.096248-.21875-.21875 0-.1225.096248-.21875.21875-.21875h3.9375c.36313 0 .65625-.29312.65625-.65625s-.29312-.65625-.65625-.65625h-3.9332c-.1225 0-.21875-.096247-.21875-.21875 0-.1225.096248-.21875.21875-.21875h2.6206c.36313 0 .65625-.29312.65625-.65625s-.29312-.65625-.65625-.65625h-4.9918l1.0281-1.8025c.14438-.25375.105-.56875-.096248-.77872-.25375-.2625-.67375-.27125-.93188-.013125l-3.0144 2.9662c-.33688.32812-.525.77438-.525 1.2469v3.1937c0 .9669.78315 1.75 1.75 1.75h6.3437c.36313 0 .65625-.29312.65625-.65625z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/cricket-centre-m.svg b/data/styles/default/dark/symbols/cricket-centre-m.svg
new file mode 100644
index 000000000..20ba73764
--- /dev/null
+++ b/data/styles/default/dark/symbols/cricket-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m10.81025 11.5622656 1.9883828 1.9883828c.2196797.2196797.2196797.5801797 0 .7998594s-.5801797.2196797-.7998594 0l-1.9883828-1.9883828zm-5.97641406-6.7706406c.21967968-.21967969.57454687-.21967969.79422656 0l4.7822578 4.78225781c.2196797.21967969.2196797.57454689 0 .79422659l-1.59408593 1.5940859c-.21967968.2196797-.57454687.2196797-.79422656 0l-4.78225781-4.7822578c-.21967969-.21967969-.21967969-.57454687 0-.79422656zm7.51980466-1.3068125c1.0888208 0 1.9714844.88266362 1.9714844 1.97148438 0 1.08882075-.8826636 1.97148437-1.9714844 1.97148437-1.0888207 0-1.9714844-.88266362-1.9714844-1.97148437 0-1.08882076.8826637-1.97148438 1.9714844-1.97148438z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/cricket-m.svg b/data/styles/default/dark/symbols/cricket-m.svg
index 07eaa4807..eb2b14e92 100644
--- a/data/styles/default/dark/symbols/cricket-m.svg
+++ b/data/styles/default/dark/symbols/cricket-m.svg
@@ -1,14 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>cricket-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="cricket-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5,5)" fill="#777777">
-    <g transform="matrix(1.2875 0 0 1.2875 -2.0248 -1.8243)" >
-     <path transform="translate(0,1.4)" d="m9.135 6.167-5.943-5.943c-0.273-0.273-0.714-0.273-0.987 0l-1.981 1.981c-0.273 0.273-0.273 0.714 0 0.987l5.943 5.943c0.273 0.273 0.714 0.273 0.987 0l1.981-1.981c0.273-0.273 0.273-0.714 0-0.987z" />
-     <path transform="translate(0,1.4)" d="m8.638 9.632 2.471 2.471c0.273 0.273 0.721 0.273 0.994 0s0.273-0.721 0-0.994l-2.471-2.471z" />
-     <circle cx="11.55" cy="2.45" r="2.45" />
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m11.5323 12.0747188 2.3860594 2.3860593c.2636156.2636157.2636156.6962157 0 .9598313-.2636157.2636156-.6962157.2636156-.9598313 0l-2.3860594-2.3860594zm-7.17169688-8.1247688c.26361563-.26361562.68945625-.26361562.95307188 0l5.7387094 5.73870938c.2636156.26361562.2636156.68945622 0 .95307192l-1.91290315 1.9129031c-.26361563.2636156-.68945625.2636156-.95307188 0l-5.73870937-5.7387094c-.26361563-.26361562-.26361563-.68945625 0-.95307187zm9.02376558-1.568175c1.306585 0 2.3657813 1.05919634 2.3657813 2.36578125s-1.0591963 2.36578125-2.3657813 2.36578125c-1.3065849 0-2.3657812-1.05919634-2.3657812-2.36578125s1.0591963-2.36578125 2.3657812-2.36578125z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/curling-centre-m.svg b/data/styles/default/dark/symbols/curling-centre-m.svg
new file mode 100644
index 000000000..3547182b5
--- /dev/null
+++ b/data/styles/default/dark/symbols/curling-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m3.45464554 9.81835887c-.04866535.21277533-.07964991.43189873-.07964991.65917033 0 .2272796.03098456.4464031.07964991.6591704h11.09076966c.0486637-.2127753.0796491-.4318988.0796491-.6591704 0-.2272796-.0310657-.4464031-.0796491-.65917033zm2.57903385-2.28324249c-1.01650657.11466837-1.89528252.74552118-2.33563477 1.62408017h10.60381078c-.4403925-.87853488-1.3192086-1.5094118-2.3357151-1.62408017v-1.34219044h-4.94383797c-.54605286 0-.98878366.44270669-.98878366.98878365zm-2.33563477 4.26105092c.48734459.9724713 1.50531364 1.6479459 2.66517575 1.6479459h5.27337893c1.1599424 0 2.1778151-.6754826 2.6651757-1.6479459zm2.33559459-7.91040591c0 .54605287.44274687.98878366.98882383.98878366h2.96627062c.36409414 0 .65917034.29508422.65917034.65917036h1.3183246v-.3295892c0-.91011489-.7377909-1.64794597-1.6479459-1.64794597h-3.9550543c-.15929119 0-.29216452.11296192-.32289393.26315973z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/curling-m.svg b/data/styles/default/dark/symbols/curling-m.svg
index 6b2ed51fc..ec59ed42c 100644
--- a/data/styles/default/dark/symbols/curling-m.svg
+++ b/data/styles/default/dark/symbols/curling-m.svg
@@ -1,15 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>curling-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="curling-m" fill-rule="nonzero">
-   <g id="curling" transform="translate(5,6)" fill="#777777">
-    <g transform="matrix(1.2857 0 0 1.2857 .57142 -1.9277)" >
-     <path id="Path" d="m-1.9009 7.8067c-0.060562 0.26479-0.099121 0.53748-0.099121 0.82031 0 0.28284 0.038559 0.55553 0.099121 0.82031h13.802c0.06056-0.26479 0.09912-0.53748 0.09912-0.82031 0-0.28284-0.03866-0.55553-0.09912-0.82031z" />
-     <path d="m1.3086 4.9653c-1.265 0.1427-2.3586 0.92777-2.9066 2.0211h13.196c-0.54805-1.0933-1.6417-1.8784-2.9067-2.0211v-1.6703h-6.1524c-0.67954 0-1.2305 0.55093-1.2305 1.2305z" />
-     <path d="m-1.598 10.268c0.60648 1.2102 1.8733 2.0508 3.3167 2.0508h6.5625c1.4435 0 2.7102-0.84061 3.3167-2.0508z" />
-     <path d="m1.3086 0.42383c0 0.67954 0.55093 1.2305 1.2305 1.2305h3.6914c0.4531 0 0.82031 0.36722 0.82031 0.82031h1.6406v-0.41016c0-1.1326-0.91815-2.0508-2.0508-2.0508h-4.9219c-0.22655 0-0.41016 0.18361-0.41016 0.41016z" />
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m2.34557465 10.5820306c-.05839842.2553304-.0955799.5182786-.0955799.7910045 0 .2727355.03718148.5356837.0955799.7910044h13.30892355c.0583965-.2553304.0955789-.5182785.0955789-.7910044 0-.2727356-.0372788-.5356837-.0955789-.7910045zm3.09484061-2.73989094c-1.21980787.13760204-2.27433901.89462541-2.80276171 1.9488962h12.72457285c-.5284709-1.05424186-1.5830502-1.81129416-2.8028581-1.9488962v-1.61062853h-5.9326055c-.65526344 0-1.18654039.53124802-1.18654039 1.18654038zm-2.80276171 5.11326104c.5848135 1.1669656 1.80637636 1.9775352 3.19821089 1.9775352h6.32805466c1.391931 0 2.6133781-.8105792 3.1982109-1.9775352zm2.8027135-9.49248703c0 .65526344.53129624 1.18654039 1.1865886 1.18654039h3.55952475c.436913 0 .7910044.35410107.7910044.79100443h1.5819896v-.39550704c0-1.09213786-.8853491-1.97753517-1.9775352-1.97753517h-4.74606511c-.19114944 0-.35059744.13555432-.38747273.31579168z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/dance-m.svg b/data/styles/default/dark/symbols/dance-m.svg
index f0c214906..33a149bd6 100644
--- a/data/styles/default/dark/symbols/dance-m.svg
+++ b/data/styles/default/dark/symbols/dance-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-    <title>dance-m</title>
-    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-    <circle cx="12" cy="12" r="11" fill="#51585E"/>
-    <g id="dance-m" fill-rule="nonzero">
-      <path
-	  style="fill:#000;stroke:none;stroke-width:1.29048" id="Shape"
-	  d="m 14.640892,5.1330653 c -1.408845,0 -1.408845,2.1132706 0,2.1132706 1.408848,0 1.408848,-2.1132706 0,-2.1132706 z M 9.3577166,7.2463359 C 8.7954093,7.2440113 8.6191711,8.0050431 9.1252568,8.2501394 l 2.1132702,1.0566353 c 0.202816,0.096343 0.444373,0.053965 0.602282,-0.1056635 l 0.824176,-0.8241755 0.390955,0.1267962 v 6.4454761 l -1.954776,1.954774 c -0.366565,0.488755 0.25089,1.106211 0.739645,0.739645 l 2.113271,-2.11327 c 0.09702,-0.09494 0.15378,-0.223589 0.158495,-0.359255 v -1.891379 l 2.039306,2.02874 -0.950971,2.852915 c -0.0981,0.277296 0.04917,0.581316 0.327556,0.676248 0.280372,0.09721 0.585793,-0.05551 0.676248,-0.338124 l 1.056635,-3.169906 c 0.07396,-0.243026 0,-0.390955 -0.126797,-0.528317 L 15.16921,12.835937 V 9.2116776 l 0.147929,0.052832 0.940406,1.9547754 c 0.128041,0.269218 0.453336,0.379245 0.718512,0.243026 L 19.11046,10.352844 C 19.369501,10.220988 19.473374,9.9046473 19.34292,9.644898 19.207107,9.3836206 18.883898,9.2838059 18.624408,9.4230046 L 16.976057,10.268313 16.173014,8.598829 C 16.112204,8.4696003 16.001665,8.3704964 15.86659,8.3241039 L 13.647655,7.5950256 12.696684,7.2780349 C 12.50948,7.2125611 12.301374,7.2574473 12.1578,7.3942648 L 11.365323,8.1867413 9.6007428,7.3097339 C 9.526008,7.2693727 9.4426438,7.2476261 9.3577166,7.2463359 Z M 9.8860343,9.7082961 5.6594931,11.113621 v 3.529162 c -0.9414269,0 -1.4127247,1.138142 -0.7471161,1.803751 0.6656088,0.665609 1.8037514,0.194311 1.8037514,-0.747115 V 12.476681 L 8.829399,11.768735 v 1.817413 c -0.941427,0 -1.4127248,1.138142 -0.747116,1.803751 0.6656086,0.665609 1.8037513,0.194311 1.8037513,-0.747116 z" />
-    </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#2B5C4B" r="11"/><path d="m14.640892 5.1330653c-1.408845 0-1.408845 2.1132706 0 2.1132706 1.408848 0 1.408848-2.1132706 0-2.1132706zm-5.2831754 2.1132706c-.5623073-.0023246-.7385455.7587072-.2324598 1.0038035l2.1132702 1.0566353c.202816.096343.444373.053965.602282-.1056635l.824176-.8241755.390955.1267962v6.4454761l-1.954776 1.954774c-.366565.488755.25089 1.106211.739645.739645l2.113271-2.11327c.09702-.09494.15378-.223589.158495-.359255v-1.891379l2.039306 2.02874-.950971 2.852915c-.0981.277296.04917.581316.327556.676248.280372.09721.585793-.05551.676248-.338124l1.056635-3.169906c.07396-.243026 0-.390955-.126797-.528317l-1.965342-1.965342v-3.6242594l.147929.052832.940406 1.9547754c.128041.269218.453336.379245.718512.243026l2.134403-1.109467c.259041-.131856.362914-.4481967.23246-.707946-.135813-.2612774-.459022-.3610921-.718512-.2218934l-1.648351.8453084-.803043-1.669484c-.06081-.1292287-.171349-.2283326-.306424-.2747251l-2.218935-.7290783-.950971-.3169907c-.187204-.0654738-.39531-.0205876-.538884.1162299l-.792477.7924765-1.7645802-.8770074c-.0747348-.0403612-.158099-.0621078-.2430262-.063398zm.5283177 2.4619602-4.2265412 1.4053249v3.529162c-.9414269 0-1.4127247 1.138142-.7471161 1.803751.6656088.665609 1.8037514.194311 1.8037514-.747115v-3.222738l2.1132706-.707946v1.817413c-.941427 0-1.4127248 1.138142-.747116 1.803751.6656086.665609 1.8037513.194311 1.8037513-.747116z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/diving-centre-m.svg b/data/styles/default/dark/symbols/diving-centre-m.svg
new file mode 100644
index 000000000..bea0f57b7
--- /dev/null
+++ b/data/styles/default/dark/symbols/diving-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#0a6074" r="8.25"/><path d="m9.2125 7.541875.07756875 1.232-.812375.05131875-.0777625-1.232zm5.3691875 1.083c-.415475.04283125-.7058125-.51534375-.7058125-1.5154375-.3426375-.3092875-1.9599375 1.38125-1.9599375 1.38125l.0104625.0225c-.3659313.25619375-.7389375.50113125-1.1118125.74625.1865187-.52225.3659312-1.0480625.5220562-1.581375.0045-.01678125.0084875-.0329625.0116438-.04914375l1.375875-1.2405c-.917-.37284375-.5662625-.8899375-1.56675-1.3068125-.298625.0894125-.6130437 1.854125-.6775625 2.230125-.020525.03434375-.0371063.0726375-.0501312.11605625-.1703375.584425-.370075 1.1588125-.57515005 1.7311875-1.351-.39770625-2.7691875-.18829375-4.1205625.15375625-.7040625.17823125-.7061875.99637495-.29744375 1.37724995.05250125.0913875.1458625.1612563.28816875.185925.81475.140925 1.536375.4806063 2.2084375.9566875.49639375.3509313.9659375-.4646187.4746875-.8125625-.23250625-.1646125-.475075-.3134312-.7249375-.4480375.6975-.065925 1.3934375-.0193437 2.0870625.2417813.30218125.1132937.63674995-.03395.83331245-.2759313.6458126-.4519875 1.3200626-.86349995 1.9613126-1.32356245.0169749-.0122375.0323687-.0250625.0463812-.03789375.714125-.18099375 2.29425-.58481875 1.97075-.5514625zm-10.00625 1.1025c.3521125-.7211875.7450625-.719625 1.280375-.7184375.23250625.0009375.4934375.002.7681875-.06553125l1.705875-.1077625-.0777625-1.232375-2.208625.13934375c-.34046875.0215125-.59883125.3148125-.57731875.6550625.00553125.08645.02861937.167375.06533125.2398125-.4821875.02625-.95725.178425-1.3348125 1.011125-.34145625.009275-.6570625.2265875-.773125.569225-.08033125.2364562-.04855625.4831687.065725.6845l-.11428125.3373125.7954375.2698125.06158062-.182175c.03533-.0005925.0702625-.003375.105-.0082938.12276875.1085563.3092875.1117125.4350125.0005925.0904-.0795437.1251375-.1985562.10381875-.3088875.0588175-.073625.10678125-.1582937.13895-.2528375.13895-.40975-.05644937-.85187495-.43935625-1.03049995z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/diving-m.svg b/data/styles/default/dark/symbols/diving-m.svg
index dcc81471f..7efa95e28 100644
--- a/data/styles/default/dark/symbols/diving-m.svg
+++ b/data/styles/default/dark/symbols/diving-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>diving-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="diving-m" fill-rule="nonzero">
-   <path id="Shape" d="m12.34 10.467 0.12411 1.9712-1.2998 0.08211-0.12442-1.9712zm8.5907 1.7328c-0.66476 0.06853-1.1293-0.82455-1.1293-2.4247-0.54822-0.49486-3.1359 2.21-3.1359 2.21l0.01674 0.036c-0.58549 0.40991-1.1823 0.80181-1.7789 1.194 0.29843-0.8356 0.58549-1.6769 0.83529-2.5302 0.0072-0.02685 0.01358-0.05274 0.01863-0.07863l2.2014-1.9848c-1.4672-0.59655-0.90602-1.4239-2.5068-2.0909-0.4778 0.14306-0.98087 2.9666-1.0841 3.5682-0.03284 0.05495-0.05937 0.11622-0.08021 0.18569-0.27254 0.93508-0.59212 1.8541-0.92024 2.7699-2.1616-0.63633-4.4307-0.30127-6.5929 0.24601-1.1265 0.28517-1.1299 1.5942-0.47591 2.2036 0.084002 0.14622 0.23338 0.25801 0.46107 0.29748 1.3036 0.22548 2.4582 0.76897 3.5335 1.5307 0.79423 0.56149 1.5455-0.74339 0.7595-1.3001-0.37201-0.26338-0.76012-0.50149-1.1599-0.71686 1.116-0.10548 2.2295-0.03095 3.3393 0.38685 0.48349 0.18127 1.0188-0.05432 1.3333-0.44149 1.0333-0.72318 2.1121-1.3816 3.1381-2.1177 0.02716-0.01958 0.05179-0.0401 0.07421-0.06063 1.1426-0.28959 3.6708-0.93571 3.1532-0.88234zm-16.01 1.764c0.56338-1.1539 1.1921-1.1514 2.0486-1.1495 0.37201 0.0015 0.7895 0.0032 1.2291-0.10485l2.7294-0.17242-0.12442-1.9718-3.5338 0.22295c-0.54475 0.03442-0.95813 0.5037-0.92371 1.0481 0.00885 0.13832 0.045791 0.2678 0.10453 0.3837-0.7715 0.042-1.5316 0.28548-2.1357 1.6178-0.54633 0.01484-1.0513 0.36254-1.237 0.91076-0.12853 0.37833-0.077687 0.77307 0.10516 1.0952l-0.18285 0.5397 1.2727 0.4317 0.098529-0.29148c0.056528-9.48e-4 0.11242-0.0054 0.168-0.01327 0.19643 0.17369 0.49486 0.17874 0.69602 9.48e-4 0.14464-0.12727 0.20022-0.31769 0.16611-0.49422 0.094108-0.1178 0.17085-0.25327 0.22232-0.40454 0.22232-0.6556-0.090319-1.363-0.70297-1.6488z" fill="#777777" stroke-width="1.2857"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.255 7.85025.0930825 1.4784-.97485.0615825-.093315-1.4784zm6.443025 1.2996c-.49857.0513975-.846975-.6184125-.846975-1.818525-.411165-.371145-2.351925 1.6575-2.351925 1.6575l.012555.027c-.4391175.3074325-.886725.6013575-1.334175.8955.2238225-.6267.4391175-1.257675.6264675-1.89765.0054-.0201375.010185-.039555.0139725-.0589725l1.65105-1.4886c-1.1004-.4474125-.679515-1.067925-1.8801-1.568175-.35835.107295-.7356525 2.22495-.813075 2.67615-.02463.0412125-.0445275.087165-.0601575.1392675-.204405.70131-.44409 1.390575-.69018 2.077425-1.6212-.4772475-3.323025-.2259525-4.944675.1845075-.844875.2138775-.847425 1.19565-.3569325 1.6527.0630015.109665.175035.1935075.3458025.22311.9777.16911 1.84365.5767275 2.650125 1.148025.5956725.4211175 1.159125-.5575425.569625-.975075-.2790075-.197535-.57009-.3761175-.869925-.537645.837-.07911 1.672125-.0232125 2.504475.2901375.3626175.1359525.7641-.04074.999975-.3311175.774975-.542385 1.584075-1.0362 2.353575-1.588275.02037-.014685.0388425-.030075.0556575-.0454725.85695-.2171925 2.7531-.7017825 2.3649-.661755zm-12.0075 1.323c.422535-.865425.894075-.86355 1.53645-.862125.2790075.001125.592125.0024.921825-.0786375l2.04705-.129315-.093315-1.47885-2.65035.1672125c-.4085625.025815-.7185975.377775-.6927825.786075.0066375.10374.03434325.20085.0783975.287775-.578625.0315-1.1487.21411-1.601775 1.21335-.4097475.01113-.788475.271905-.92775.68307-.0963975.2837475-.0582675.5798025.07887.8214l-.1371375.404775.954525.323775.07389675-.21861c.042396-.000711.084315-.00405.126-.0099525.1473225.1302675.371145.134055.522015.000711.10848-.0954525.150165-.2382675.1245825-.370665.070581-.08835.1281375-.1899525.16674-.303405.16674-.4917-.06773925-1.02225-.5272275-1.2366z" fill="#0a6074"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/drinking-water-m.svg b/data/styles/default/dark/symbols/drinking-water-m.svg
index 696f7b072..f24ab0270 100644
--- a/data/styles/default/dark/symbols/drinking-water-m.svg
+++ b/data/styles/default/dark/symbols/drinking-water-m.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m8.9999 16.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#0a6074"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m8.9999 16.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#0a6074"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/drinking-water-s.svg b/data/styles/default/dark/symbols/drinking-water-s.svg
index 0b24d4989..f9c31290c 100644
--- a/data/styles/default/dark/symbols/drinking-water-s.svg
+++ b/data/styles/default/dark/symbols/drinking-water-s.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 10.5c-1.6144 0-3.5-0.9-3.5-3.15 0-1.575 2.75-4.95 3.5-5.85 0.75 0.9 3.5 4.275 3.5 5.85 0 2.25-1.8856 3.15-3.5 3.15z" fill="#0a6074"/>
-</svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6 10.5c-1.6144 0-3.5-.9-3.5-3.15 0-1.575 2.75-4.95 3.5-5.85.75.9 3.5 4.275 3.5 5.85 0 2.25-1.8856 3.15-3.5 3.15z" fill="#0a6074"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/dry_cleaning-m.svg b/data/styles/default/dark/symbols/dry_cleaning-m.svg
index 1fd56b4cc..a39dfb4e8 100644
--- a/data/styles/default/dark/symbols/dry_cleaning-m.svg
+++ b/data/styles/default/dark/symbols/dry_cleaning-m.svg
@@ -1,6 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
- <path d="m7.5 4.9758c0-1.875 2.25-1.2638 2.25-0.37502 0 0.88875-0.75 2.0104-0.75 2.8992l-5.5 4h11l-5.5-4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6B425C" r="8.25"/><path d="m7.5 4.9758c0-1.875 2.25-1.2638 2.25-.37502 0 .88875-.75 2.0104-.75 2.8992l-5.5 4h11l-5.5-4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/electrician-m.svg b/data/styles/default/dark/symbols/electrician-m.svg
index 17346b564..75e2fc4cc 100644
--- a/data/styles/default/dark/symbols/electrician-m.svg
+++ b/data/styles/default/dark/symbols/electrician-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m16.694 14.397v-1.1984h1.8975q0.25966 0 0.42943 0.16978 0.16978 0.16978 0.16978 0.42943 0 0.23968-0.16978 0.41945-0.16978 0.17976-0.42943 0.17976zm0 3.1958v-1.1984h1.8975q0.25966 0 0.42943 0.16978 0.16978 0.16978 0.16978 0.42943 0 0.23968-0.16978 0.41945-0.16978 0.17976-0.42943 0.17976zm-3.0959 0.79894q-0.57924 0-0.9887-0.46938-0.40946-0.46938-0.40946-1.1285h-1.8975v-2.7963h1.8975q0-0.65913 0.40946-1.1285 0.40946-0.46938 0.9887-0.46938h2.4967v5.9921zm-5.6925-2.3968q-1.3382 0-2.2171-0.86885-0.87884-0.86885-0.87884-2.2271t0.87884-2.2271q0.87884-0.86885 2.2171-0.86885h1.2983q0.65913 0 1.0786-0.41945 0.41945-0.41945 0.41945-1.0786 0-0.65913-0.41945-1.0786-0.41945-0.41945-1.0786-0.41945h-2.996q-0.23968 0-0.41945-0.17976-0.17976-0.17976-0.17976-0.41945 0-0.25966 0.17976-0.42943 0.17976-0.16978 0.41945-0.16978h2.996q1.1585 0 1.9275 0.76899t0.76898 1.9275q0 1.1585-0.76898 1.9275-0.76898 0.76898-1.9275 0.76898h-1.2983q-0.83889 0-1.3682 0.51932-0.5293 0.51931-0.5293 1.3782 0 0.85887 0.5293 1.3782 0.5293 0.51931 1.3682 0.51931h1.7976v1.1984z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m16.694 14.397v-1.1984h1.8975q.25966 0 .42943.16978.16978.16978.16978.42943 0 .23968-.16978.41945-.16978.17976-.42943.17976zm0 3.1958v-1.1984h1.8975q.25966 0 .42943.16978.16978.16978.16978.42943 0 .23968-.16978.41945-.16978.17976-.42943.17976zm-3.0959.79894q-.57924 0-.9887-.46938-.40946-.46938-.40946-1.1285h-1.8975v-2.7963h1.8975q0-.65913.40946-1.1285.40946-.46938.9887-.46938h2.4967v5.9921zm-5.6925-2.3968q-1.3382 0-2.2171-.86885-.87884-.86885-.87884-2.2271t.87884-2.2271q.87884-.86885 2.2171-.86885h1.2983q.65913 0 1.0786-.41945.41945-.41945.41945-1.0786 0-.65913-.41945-1.0786-.41945-.41945-1.0786-.41945h-2.996q-.23968 0-.41945-.17976-.17976-.17976-.17976-.41945 0-.25966.17976-.42943.17976-.16978.41945-.16978h2.996q1.1585 0 1.9275.76899t.76898 1.9275q0 1.1585-.76898 1.9275-.76898.76898-1.9275.76898h-1.2983q-.83889 0-1.3682.51932-.5293.51931-.5293 1.3782 0 .85887.5293 1.3782.5293.51931 1.3682.51931h1.7976v1.1984z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/equestrian-centre-m.svg b/data/styles/default/dark/symbols/equestrian-centre-m.svg
new file mode 100644
index 000000000..975930869
--- /dev/null
+++ b/data/styles/default/dark/symbols/equestrian-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9.24809749 5.79006754c.06112551-.09655577.19496583-.1359272.29964779-.08825574l.85197452.3949215.0204978.00413673c.0430936.0132609.0814462.03440896.1164402.05926237l.0588503.02734512c.1034032.04787024.1624482.17633441.1317881.28656153l-.0165759.02589324c-.000433.03958792-.0043766.0793698-.0165977.11915249l-.31473 1.02146802.1079495.114388c.4055129-.21656699.7264801-.5298644 1.0836801-.91048438.3632119-.38685727.825464-.59136013 1.3366326-.59136013.0648518 0 .1272167.00329652.186475.00868876.1110722.0105527.2733063-.00600149.3539083-.03564354l.3259329-.1197561c.1644796-.06027884.3178527-.03211041.4050622.07252327.0654594.07874285.0886871.19351716.06483.32302759l-.0588479.32116043c-.0174.09655335.0043621.25464267.034607.34538528.0379925.11410632.0688848.23731954.0922571.36811587l.0293662.20169138c.0113961.09988528.0517896.26584567.0971811.3601214l.0957324.19581089c.1195308.24200711.1210036.46081149.004346.58534013-.1259773.13447531-.3851913.12682155-.6050339-.0105519l-.166732-.10317135c-.0759331-.04484931-.1549982-.0870419-.1993853-.09573967l-.0607633-.00859218-.1435464-.0083958c-.1781935-.00706626-.3990582-.01596748-.5617188-.14027882-.0180198.15787202-.032933.37834236-.0151225.59610852l.0070192.04697196.02696.11237287c.0223819.08701633.0457456.17696137.0441359.25505313-.0017082.07506486-.0207958.14662124-.0571542.21364037l-.0421113.0654686c-.013046.01742419-.0756283.10773542-.023404.17135263l1.7284958 2.10104349c.1050039.1278364.1018893.3255145-.0070823.4500431l-.7131846.8132631c-.170741.1945553-.5068146.346842-.7656182.346842h-.347687c-.2051306 0-.2838735-.0967466-.3124524-.1543631-.0287962-.0573831-.0582442-.1785879.0656727-.3420775l.5741613-.7581414c.0389369-.0515965.0348001-.1384197-.0085149-.1862819l-1.3372764-1.4699096c-.0418664-.0459789-.1369864-.0598684-.2043097-.0308766l-.1312419.051875c-.3177791.115252-.8593214.2444196-1.75177795.2968503-.24863877.0147345-.49810651.0219738-.74260854.0227947l-.76227816.8845694c-.22377007.2598176-.60129152.301853-.84247773.0934307-.24159747-.2082453-.25280046-.5855575-.02569847-.8431216l.19041864-.2156817-.2281241-.0317217c-.0834832-.0134565-.19082748.0298336-.23743578.0876441l-1.80157279 2.234079c-.16326426.2024506-.49479067.3611435-.75504289.3611435h-.32198939c-.20469601 0-.28428231-.0969638-.31349056-.1547735-.02920504-.0578097-.05989254-.1792398.06153757-.344178l1.72471319-2.341602c.05676906-.077093.11540287-.227931.12576-.3226171l.04849317-.4438059c.01202632-.11104798.02175489-.29132598.02175489-.40196355v-.34872526c-.17923979-.07150437-.53252029-.17301537-.71650042-.05573005-.08868954.05633688-.13178684.16244336-.13219851.32384851-.00209251 1.30613825-1.26042007 1.83577735-1.27305241 1.84092815-.01263233.0051508-.02589323.0076457-.03915413.0076457-.01616465 0-.03232851-.0037504-.04704129-.0113962-.02695478-.0136737-.04643422-.038309-.05367133-.0675398-.11402181-.4657601.04839768-.9743859.38603602-1.93158953l.13488128-.38214986c.11436386-.32387265.31535773-.55155411.59714673-.67651734.52715219-.23351796 1.17358564-.03397597 1.37373446.03874206.24409963-.20885689.69906014-.42475589 1.54218171-.42475589.12638776 0 .26086388.00663004.39864778.01657592zm.69367353-1.82571796c.20941218-.23102948.87645688-.83231294 1.39795928-.59528761.729136.33150227.4977202 1.0368158.5731231 1.22701713.0422849.10628354.0517816.20513464.0480795.28552333-.0053922.11436386-.1263877.16368438-.2308283.11623103l-.0979859-.04454959c-.0267359.15891827-.0895112.31390906-.1989335.44755623-.3343996.40944031-.9380251.47013122-1.3476586.13551433-.40958032-.33462817-.47029538-.9381973-.13569458-1.34780662l.00808193-.00808193c-.06567592-.05594252-.08017221-.14524049-.01614293-.2161163z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/equestrian-m.svg b/data/styles/default/dark/symbols/equestrian-m.svg
index dbd3a989c..accdcc33e 100644
--- a/data/styles/default/dark/symbols/equestrian-m.svg
+++ b/data/styles/default/dark/symbols/equestrian-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>equestrian-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="equestrian-m" fill-rule="nonzero">
-   <g id="equestrian-race" transform="translate(5,6)" fill="#777777">
-    <g transform="matrix(1.2877 0 0 1.2877 -2 -2.2964)" >
-     <path id="Path" d="m8.338 2.7604c0.50898 0.41577 1.259 0.34036 1.6745-0.16838 0.13596-0.16606 0.21396-0.35864 0.24718-0.5561l0.12175 0.055354c0.12977 0.058962 0.28011-0.00232 0.28681-0.14442 0.0046-0.099885-0.0072-0.22271-0.05974-0.35477-0.09369-0.23633 0.19385-1.1127-0.71212-1.5246-0.64798-0.29451-1.4768 0.4526-1.737 0.73966-0.079558 0.088065-0.061546 0.19902 0.020058 0.26853-0.00307 0.00361-0.00695 0.00617-0.010042 0.010042-0.41575 0.50895-0.34031 1.2589 0.16867 1.6747z" />
-     <path d="m7.2974 3.0756-1.7448 2.7529c-0.1712-0.012358-0.33829-0.020596-0.49533-0.020596-1.0476 0-1.6129 0.26826-1.9162 0.52777-0.24869-0.090354-1.0519-0.33829-1.7069-0.048138-0.35013 0.15527-0.59987 0.43817-0.74197 0.84059l-0.080823 0.22938c-0.47786 1.3503-0.71755 2.0282-0.56643 2.6455 0.0089923 0.03632 0.033196 0.06693 0.066688 0.08392 0.018281 0.0095 0.038365 0.01416 0.05845 0.01416 0.016477 0 0.032954-0.0031 0.04865-0.0095 0.015696-0.0064 1.5792-0.66449 1.5818-2.2874 5.115e-4 -0.20055 0.054061-0.33239 0.16426-0.40239 0.2286-0.14573 0.66756-0.0196 0.89027 0.069246v0.4333c0 0.13747-0.012088 0.36147-0.027031 0.49945l-0.060254 0.55144c-0.012869 0.11765-0.085723 0.30507-0.15626 0.40086l-2.143 2.9095c-0.15088 0.20494-0.11275 0.35582-0.076462 0.42765 0.036292 0.07183 0.13518 0.19231 0.38952 0.19231h0.40008c0.32337 0 0.7353-0.19718 0.93816-0.44873l2.2385-2.7759c0.057912-0.071831 0.19129-0.12562 0.29502-0.1089 0.075169 0.011846 0.17198 0.025496 0.28345 0.039415l-0.2366 0.26799c-0.28218 0.32003-0.26826 0.78885 0.031931 1.0476 0.29968 0.25897 0.76876 0.20674 1.0468-0.11609l0.94715-1.0991c0.3038-0.00102 0.61377-0.010015 0.92271-0.028323 1.2795-0.075169 1.9785-0.27728 2.3397-0.4333 0.083651-0.036023 0.20184-0.018765 0.25386 0.038365l1.6616 1.8264c0.05382 0.05947 0.05896 0.16735 0.01058 0.23146l-0.71341 0.94201c-0.15397 0.20314-0.11738 0.35374-0.0816 0.42504 0.03551 0.07159 0.13335 0.1918 0.38823 0.1918h0.43201c0.32157 0 0.73915-0.18922 0.9513-0.43096l0.88615-1.0105c0.1354-0.15473 0.13927-0.40035 0.0088-0.55919l-2.1477-2.6106c-0.06489-0.079046 0.01287-0.19126 0.02908-0.21291 0.07929-0.10583 0.12051-0.22244 0.12334-0.3468 2e-3 -0.097031-0.02703-0.20879-0.05484-0.31691-0.01879-0.071831-0.03783-0.14625-0.04222-0.19799-0.02213-0.27058-0.0036-0.54452 0.01879-0.74068 0.20211 0.15446 0.47654 0.16552 0.69795 0.1743 0.09498 0.00388 0.18458 0.00746 0.25386 0.021108 0.09192 0.018012 0.30353 0.15163 0.41733 0.22346l0.03758 0.023692c0.27316 0.17069 0.59524 0.1802 0.75177 0.013111 0.14495-0.15473 0.14312-0.4266-0.0054-0.7273-0.03915-0.078777-0.08163-0.16552-0.11895-0.2433-0.0564-0.11714-0.10659-0.32335-0.12075-0.44746-0.02935-0.2572-0.08031-0.49533-0.15112-0.708-0.03758-0.11275-0.06462-0.30918-0.043-0.42915l0.07312-0.39905c0.029643-0.16092 7.82e-4 -0.30353-0.080553-0.40137-0.10836-0.13001-0.29893-0.16501-0.5033-0.090112l-0.40498 0.1488c-0.10015 0.036831-0.30173 0.0574-0.43974 0.044288-0.07363-0.0067-0.15112-0.010796-0.2317-0.010796-0.63514 0-1.2095 0.2541-1.6608 0.73478-0.44383 0.47293-0.84264 0.86221-1.3465 1.1313l-0.13413-0.14213 0.39106-1.2692c0.015185-0.049431 0.020085-0.098861 0.020623-0.14805l0.020596-0.032173c0.038096-0.13696-0.035269-0.29658-0.16375-0.35606l-0.073123-0.033977c-0.043481-0.030881-0.091135-0.057158-0.14468-0.073635-0.00848-0.00258-0.016988-0.00283-0.025469-0.00514l-1.0586-0.4907c-0.13007-0.059233-0.29637-0.010313-0.37232 0.10966z" />
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.29771699 5.74808105c.07335061-.11586692.23395899-.16311264.35957734-.10590689l1.02236937.4739058.0245974.00496408c.0517124.01591307.0977354.04129074.1397283.07111484l.0706204.03281414c.1240837.0574443.1949378.2116013.1581456.34387385l-.0198911.03107187c-.0005196.04750551-.0052519.09524377-.0199172.14298299l-.3776759 1.22576163.1295394.1372656c.4866154-.25988039.8717761-.63583728 1.300416-1.09258125.4358543-.46422873.9905568-.70963216 1.6039591-.70963216.0778222 0 .1526601.00395582.2237701.01042651.1332866.01266324.3279675-.00720179.4246899-.04277224l.3911196-.14370732c.1973754-.07233462.3814231-.0385325.4860745.08702791.0785513.09449143.1064246.2322206.0777961.38763311l-.0706175.38539252c-.02088.11586402.0052345.30557121.0415283.41446234.0455911.13692758.0826618.28478344.1107086.44173905l.0352394.24202965c.0136753.11986233.0621476.3190148.1166173.43214568l.1148789.23497306c.1434369.29040854.1452043.55297379.0052152.70240816-.1511727.16137037-.4622296.15218585-.7260407-.01266228l-.2000784-.12380562c-.0911197-.05381918-.1859978-.10445028-.2392623-.1148876l-.072916-.01031062-.1722556-.01007496c-.2138322-.00847951-.4788699-.01916098-.6740627-.16833458-.0216237.18944642-.0395195.45401082-.0181469.71533022l.008423.05636635.032352.13484744c.0268582.10441957.0548947.21235367.0529631.30606377-.0020498.0900778-.024955.1759455-.0685851.2563684l-.0505335.0785624c-.0156553.020909-.0907539.1292825-.0280848.2056231l2.074195 2.5212522c.1260046.1534037.1222671.3906174-.0084988.5400518l-.8558216.9759156c-.2048891.2334664-.6081774.4162104-.9187417.4162104h-.4172245c-.2461567 0-.3406481-.1160958-.3749428-.1852357-.0345554-.0688597-.0698931-.2143054.0788072-.410493l.6889936-.9097697c.0467242-.0619158.0417601-.1661036-.0102179-.2235383l-1.6047318-1.7638914c-.0502396-.0551747-.1643835-.0718421-.2451716-.037052l-.1574902.0622501c-.381335.1383023-1.0311857.2933034-2.10213356.3562202-.29836653.0176814-.59772781.0263686-.89113025.0273537l-.91473379 1.0614833c-.26852408.3117811-.72154982.3622236-1.01097327.1121168-.28991697-.2498943-.30336055-.7026689-.03083816-1.0117459l.22850236-.258818-.27374892-.0380661c-.10017984-.0161477-.22899298.0358004-.28492294.1051729l-2.16188734 2.6808949c-.19591712.2429407-.59374881.4333722-.90605148.4333722h-.38638726c-.24563521 0-.34113877-.1163566-.37618868-.1857282-.03504604-.0693716-.07187104-.2150878.07384509-.4130137l2.06965583-2.8099223c.06812287-.0925116.13848344-.2735172.150912-.3871406l.05819181-.532567c.01443157-.1332576.02610586-.3495912.02610586-.4823563v-.41847031c-.21508775-.08580525-.63902434-.20761845-.85980051-.06687606-.10642744.06760425-.15814421.19493207-.1586382.38861817-.00251102 1.5673659-1.51250409 2.2029328-1.5276629 2.2091138-.0151588.0061809-.03107187.0091748-.04698495.0091748-.01939759 0-.03879422-.0045005-.05644955-.0136753-.03234573-.0164086-.05572106-.0459709-.0644056-.0810479-.13682617-.5589121.05807722-1.169263.46324322-2.3179074l.16185754-.45857981c.13723663-.38864718.37842928-.66186493.71657608-.81182081.63258263-.28022155 1.40830276-.04077116 1.64848135.04649048.29291956-.25062827.83887216-.50970707 1.85061805-.50970707.15166531 0 .31303666.00795605.47837734.0198911zm.83240821-2.19086155c.2512947-.27723537 1.0517483-.99877554 1.6775512-.71434514.8749632.39780272.5972642 1.24417896.6877477 1.47242057.0507418.12754024.062138.24616156.0576954.34262799-.0064707.13723663-.1516653.19642125-.2769939.13947723l-.1175831-.05345951c-.0320831.19070193-.1074135.37669088-.2387203.53706748-.4012795.49132837-1.1256301.56415746-1.6171902.16261719-.49149647-.40155379-.56435453-1.12583675-.1628336-1.61736794l.0096983-.00969831c-.0788111-.06713102-.0962066-.17428859-.0193715-.25933956z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/escape_game.svg b/data/styles/default/dark/symbols/escape_game.svg
index ea897ec9b..d0b61b34e 100644
--- a/data/styles/default/dark/symbols/escape_game.svg
+++ b/data/styles/default/dark/symbols/escape_game.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><circle cx="9" cy="9" r="9" opacity=".6"/><circle cx="9" cy="9" r="8.25" fill="#6E4426"/><path fill="#fff" fill-rule="evenodd" d="M5.194 4.525h1.35v5.4h-1.35z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><path fill="#fff" fill-rule="evenodd" d="M5.194 5.2h2.7v1.35h-2.7z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><circle cx="5.869" cy="11.613" r="1.688" fill="none" stroke="#000" stroke-width="1.35" style="stroke:#000;stroke-opacity:1"/><path fill="#fff" fill-rule="evenodd" d="M12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1-1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" style="fill:#000;fill-opacity:1;stroke-width:.9"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>escape_game</title>
+    <g id="escape_game" stroke="none" fill="none">
+        <circle id="Oval" fill="#000" fill-rule="nonzero" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#802D19" fill-rule="nonzero" cx="9" cy="9" r="8.25"></circle>
+        <path d="M6.544,4.525 L6.543,5.199 L7.894,5.2 L7.894,6.55 L6.543,6.55 L6.54384181,9.2696041 C7.56205461,9.56229277 8.307,10.5006507 8.307,11.613 C8.307,12.9594702 7.21547022,14.051 5.869,14.051 C4.52252978,14.051 3.431,12.9594702 3.431,11.613 C3.431,10.5010171 4.17545473,9.56291094 5.19315214,9.26989353 L5.194,4.525 L6.544,4.525 Z M5.869,10.675 C5.3509569,10.675 4.931,11.0949569 4.931,11.613 C4.931,12.1310431 5.3509569,12.551 5.869,12.551 C6.3870431,12.551 6.807,12.1310431 6.807,11.613 C6.807,11.0949569 6.3870431,10.675 5.869,10.675 Z M12.506,11.275 L10.931,11.275 L10.925,10.868 C10.925,10.3653333 11.0083333,9.952 11.175,9.628 C11.341,9.304 11.633,8.893 12.132,8.487 L12.5637778,8.12833333 C12.807037,7.92033333 12.9611111,7.77455556 13.026,7.691 C13.176,7.493 13.251,7.274 13.251,7.034 C13.251,6.70266667 13.117,6.41933333 12.849,6.184 C12.585,5.94466667 12.2283333,5.825 11.779,5.825 C11.3456667,5.825 10.9833333,5.94866667 10.692,6.196 C10.4,6.443 10.246,6.82 10.137,7.326 L8.569,7.132 C8.61366667,6.40666667 8.92133333,5.791 9.492,5.285 C10.068,4.778 10.775,4.525 11.706,4.525 C12.687,4.525 13.421,4.782 13.999,5.297 C14.579,5.807 14.869,6.40266667 14.869,7.084 C14.869,7.46 14.7616667,7.81633333 14.547,8.153 C14.2678649,8.60277864 13.927713,9.01103812 13.5366594,9.36629677 L13.296,9.573 C12.936,9.873 12.711,10.1143333 12.621,10.297 C12.537,10.4783333 12.4986667,10.8043333 12.506,11.275 Z M10.819,13.525 L10.819,11.725 L12.619,11.725 L12.619,13.525 L10.819,13.525 Z" id="Shape" fill="#000" fill-rule="evenodd"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/factory-m.svg b/data/styles/default/dark/symbols/factory-m.svg
index 12153e7fa..0a34f3fa2 100644
--- a/data/styles/default/dark/symbols/factory-m.svg
+++ b/data/styles/default/dark/symbols/factory-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#51585E"/>
-  <path d="m5.3333 18.667v-8l5.3333 3.9996v-4l4.6666 4.0003 0.66666-7.3333h2l0.6668 11.333h-13.333" fill="#000"/>
-  <path d="m17 5.9999c-0.12806-1.2135-1.9115-2.6077-4.3303-0.94099-0.91058 0.50118-2.7961 1.205-4.1425-0.55673" fill="none" stroke="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m5.3333 18.667v-8l5.3333 3.9996v-4l4.6666 4.0003.66666-7.3333h2l.6668 11.333h-13.333" fill="#000"/><path d="m17 5.9999c-.12806-1.2135-1.9115-2.6077-4.3303-.94099-.91058.50118-2.7961 1.205-4.1425-.55673" fill="none" stroke="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fitness-m.svg b/data/styles/default/dark/symbols/fitness-m.svg
new file mode 100644
index 000000000..3ad9fb10b
--- /dev/null
+++ b/data/styles/default/dark/symbols/fitness-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m15.03675 11.0145.5071725-.5071725c.2747175-.2747175.2747175-.7185 0-.993225l-.014085-.014085c-.2747175-.2747175-.7185-.2747175-.993225 0l-2.01465 2.014575-6.03675-6.03675 2.014575-2.014575c.2747175-.2747175.2747175-.7185 0-.993225l-.014085-.014088c-.2747175-.2747175-.7185-.2747175-.993225 0l-.50718.5071725-.5071725-.5071725c-.2747175-.2747175-.7255425-.2747175-1.000275 0l-1.007325 1.007325-.5071725-.5071725c-.2747175-.2747175-.732585-.2747175-1.007325 0-.2747175.2747175-.2747175.732585 0 1.007325l.5071725.5071725-1.007325 1.007325c-.2747175.2747175-.2747175.7185 0 .993225l.5071725.5071725-.5071725.514215c-.2747175.2747175-.2747175.7185 0 .993225l.014088.014085c.2747175.2747175.7185.2747175.993225 0l2.014575-2.014575 6.03675 6.03675-2.014575 2.014575c-.2747175.2747175-.2747175.7185 0 .993225l.014085.014085c.2747175.2747175.7185.2747175.993225 0l.5071725-.5071725.5071725.5071725c.2747175.2747175.7185.2747175.993225 0l1.007325-1.007325.5071725.5071725c.2747175.2747175.732585.2747175 1.007325 0 .2747175-.2747175.2747175-.732585 0-1.007325l-.5071725-.5071725 1.014375-1.007325c.2747175-.2747175.2747175-.7185 0-.993225z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fitness_centre-m.svg b/data/styles/default/dark/symbols/fitness_centre-m.svg
index c9d949dbc..26a9d46d2 100644
--- a/data/styles/default/dark/symbols/fitness_centre-m.svg
+++ b/data/styles/default/dark/symbols/fitness_centre-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<title>fitness_centre-m</title>
-	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#51585E"/>
-	<path id="Path" d="m17.964 13.99 0.50109-0.50109c0.27142-0.27142 0.27142-0.70987 0-0.98133l-0.01392-0.01392c-0.27142-0.27142-0.70987-0.27142-0.98133 0l-1.9904 1.9904-5.9643-5.9643 1.9904-1.9904c0.27142-0.27142 0.27142-0.70987 0-0.98133l-0.01391-0.013919c-0.27142-0.27142-0.70987-0.27142-0.98133 0l-0.5011 0.50109-0.50109-0.50109c-0.27142-0.27142-0.71683-0.27142-0.98822 0l-0.99521 0.99521-0.50109-0.50109c-0.27142-0.27142-0.72379-0.27142-0.99521 0s-0.27142 0.72379 0 0.99521l0.50109 0.50109-0.99521 0.99521c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.50109 0.50109-0.50109 0.50804c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.013919 0.01391c0.27142 0.27142 0.70987 0.27142 0.98133 0l1.9904-1.9904 5.9643 5.9643-1.9904 1.9904c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.01391 0.01392c0.27142 0.27142 0.70987 0.27142 0.98133 0l0.50109-0.50109 0.50108 0.50109c0.27142 0.27142 0.70988 0.27142 0.98133 0l0.99521-0.99521 0.50109 0.50109c0.27142 0.27142 0.72379 0.27142 0.99521 0s0.27142-0.72379 0-0.99521l-0.50109-0.50109 1.0022-0.99521c0.27142-0.27142 0.27142-0.70987 0-0.98133z" fill="#000" stroke-width="1.2664"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m13.473 10.4925.3758175-.3758175c.203565-.203565.203565-.5324025 0-.7359975l-.01044-.01044c-.203565-.203565-.5324025-.203565-.7359975 0l-1.4928 1.4928-4.473225-4.473225 1.4928-1.4928c.203565-.203565.203565-.5324025 0-.7359975l-.0104325-.01043925c-.203565-.203565-.5324025-.203565-.7359975 0l-.375825.3758175-.3758175-.3758175c-.203565-.203565-.5376225-.203565-.741165 0l-.7464075.7464075-.3758175-.3758175c-.203565-.203565-.5428425-.203565-.7464075 0s-.203565.5428425 0 .7464075l.3758175.3758175-.7464075.7464075c-.203565.203565-.203565.5324025 0 .7359975l.3758175.3758175-.3758175.38103c-.203565.203565-.203565.5324025 0 .7359975l.01043925.0104325c.203565.203565.5324025.203565.7359975 0l1.4928-1.4928 4.47322495 4.47322505-1.49279995 1.4928c-.203565.203565-.203565.5324025 0 .7359975l.0104325.01044c.203565.203565.5324025.203565.73599745 0l.3758175-.3758175.3758101.3758175c.203565.203565.5324099.203565.7359975 0l.7464075-.7464075.3758175.3758175c.203565.203565.5428425.203565.7464075 0s.203565-.5428425 0-.7464075l-.3758175-.3758175.75165-.7464075c.2035649-.203565.2035649-.5324025 0-.7359975z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/ford-m.svg b/data/styles/default/dark/symbols/ford-m.svg
index 10b800a07..17abcb2e8 100644
--- a/data/styles/default/dark/symbols/ford-m.svg
+++ b/data/styles/default/dark/symbols/ford-m.svg
@@ -1,5 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14" height="9" version="1.1" viewBox="0 0 14 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m11.52 1.8815a1.7502 1.7497 0 0 0-3.0391 0l-0.48047 0.84158-0.48047-0.84158a1.7502 1.7497 0 0 0-3.0391 0l-0.48047 0.84158-0.48047-0.84158a1.7502 1.7497 0 0 0-1.5195-0.88063 1.7502 1.7497 0 0 0-1 0.3378v3.1867l1.4805 2.5931a1.7502 1.7497 0 0 0 3.0391 0l0.48047-0.84158 0.48047 0.84158a1.7502 1.7497 0 0 0 3.0391 0l0.48047-0.84158 0.48047 0.84158a1.7502 1.7497 0 0 0 2.5195 0.54869v-3.1945z" fill="#000" opacity=".6"/>
- <path d="m12 4.7405-1.3496-2.3635a0.75008 0.75015 0 0 0-1.3008 0l-1.3496 2.3616-1.3496-2.3616a0.75008 0.75015 0 0 0-1.3008 0l-1.3496 2.3616-1.3496-2.3616a0.75008 0.75015 0 0 0-0.65039-0.37699v2.262l1.3496 2.3616a0.75008 0.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a0.75008 0.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a0.75008 0.75015 0 0 0 0.65039 0.36136z" fill="#14a0c2"/>
-</svg>
+<svg height="9" viewBox="0 0 14 9" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m11.52 1.8815a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -1.5195-.88063 1.7502 1.7497 0 0 0 -1 .3378v3.1867l1.4805 2.5931a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 2.5195.54869v-3.1945z" fill="#000" opacity=".6"/><path d="m12 4.7405-1.3496-2.3635a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -.65039-.37699v2.262l1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 .65039.36136z" fill="#0a6074"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fountain-m.svg b/data/styles/default/dark/symbols/fountain-m.svg
index b64b67c3b..8d569cba7 100644
--- a/data/styles/default/dark/symbols/fountain-m.svg
+++ b/data/styles/default/dark/symbols/fountain-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>fountain-m</title>
- <g fill="none" fill-rule="evenodd" opacity=".6">
-  <g fill-rule="nonzero">
-   <g transform="matrix(1.5,0,0,1.5,2.8125,1.5)" fill="#14A0C2">
-    <path d="m7.7656 0c-0.67014 0-1.2662 0.32312-1.6406 0.82173-0.37447-0.49861-0.97048-0.82173-1.6406-0.82173-1.1308 0-2.0508 0.91998-2.0508 2.0508h0.82031c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305v1.2852h0.82031v-1.2852c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305h0.82031c0-1.1308-0.91998-2.0508-2.0508-2.0508z"/>
-    <path d="m2.4336 4.1562v0.82031h0.86157c0.19056 0.93494 1.0192 1.6406 2.0095 1.6406h1.6406c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m0 7.4375v0.82031h0.86157c0.19053 0.93494 1.0191 1.6406 2.0095 1.6406h2.0234v0.82031h2.4609v-0.82031h2.0234c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m10.609 13.18c-0.19056-0.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-0.99036 0-1.819 0.70569-2.0095 1.6406h-0.88892v0.82031h10.691v-0.82031z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#0a6074" transform="matrix(1.5 0 0 1.5 2.8125 1.5)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fountain-s.svg b/data/styles/default/dark/symbols/fountain-s.svg
index 1bff3b390..ac08bc1fe 100644
--- a/data/styles/default/dark/symbols/fountain-s.svg
+++ b/data/styles/default/dark/symbols/fountain-s.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>fountain-s</title>
- <g fill="none" fill-rule="evenodd" opacity=".6">
-  <g fill-rule="nonzero">
-   <g transform="matrix(1.125 0 0 1.125 5.1094 4.125)" fill="#14a0c2">
-    <path d="m7.7656 0c-0.67014 0-1.2662 0.32312-1.6406 0.82173-0.37447-0.49861-0.97048-0.82173-1.6406-0.82173-1.1308 0-2.0508 0.91998-2.0508 2.0508h0.82031c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305v1.2852h0.82031v-1.2852c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305h0.82031c0-1.1308-0.91998-2.0508-2.0508-2.0508z"/>
-    <path d="m2.4336 4.1562v0.82031h0.86157c0.19056 0.93494 1.0192 1.6406 2.0095 1.6406h1.6406c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m0 7.4375v0.82031h0.86157c0.19053 0.93494 1.0191 1.6406 2.0095 1.6406h2.0234v0.82031h2.4609v-0.82031h2.0234c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m10.609 13.18c-0.19056-0.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-0.99036 0-1.819 0.70569-2.0095 1.6406h-0.88892v0.82031h10.691v-0.82031z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#0a6074" transform="matrix(1.125 0 0 1.125 5.1094 4.125)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fuel-m.svg b/data/styles/default/dark/symbols/fuel-m.svg
index e2b9d2773..9247c418e 100644
--- a/data/styles/default/dark/symbols/fuel-m.svg
+++ b/data/styles/default/dark/symbols/fuel-m.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6" style="fill-rule:nonzero;fill:#000;fill-opacity:1"/><circle cx="12" cy="12" r="11" fill="#51585E" style="fill-rule:nonzero"/><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#000;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m15.23 4.008a.667.667 0 0 0 -.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1 -.667-.666v-1.334c0-1.096-.903-2-2-2h-.667v-6.666a1.33 1.33 0 0 0 -1.333-1.334h-5.333a1.33 1.33 0 0 0 -1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334h5.333a1.33 1.33 0 0 0 1.333-1.334v-2.666h.667c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0 -1.138-2.747l-1.724-1.725a.667.667 0 0 0 -.576-.187zm-7.898 2.659h4c.37 0 .667.297.667.666v3.334h-5.332v-3.334c0-.369.297-.666.666-.666zm9.335 2.333a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" fill="#000" stroke-dasharray=".133333 .133333" stroke-linecap="round" stroke-linejoin="round" stroke-width=".133333"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fuel-s.svg b/data/styles/default/dark/symbols/fuel-s.svg
index 49aa6af65..334edfdc7 100644
--- a/data/styles/default/dark/symbols/fuel-s.svg
+++ b/data/styles/default/dark/symbols/fuel-s.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8" fill="#fff" opacity=".6" style="fill-rule:nonzero;stroke-width:.666667;fill:#000;fill-opacity:1"/><circle cx="8" cy="8" r="7.333" fill="#51585E" style="fill-rule:nonzero;stroke-width:.666667"/><path d="M10.375 2.005a.444.444 0 0 0-.245.754l1.15 1.149a1.7 1.7 0 0 1 .439.759h-.386A1.34 1.34 0 0 0 10 6a1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1-.444-.444v-.89a1.34 1.34 0 0 0-1.333-1.332H9v-5.55a.887.887 0 0 0-.888-.89h-2.89a.887.887 0 0 0-.888.89L4.333 12c0 .492.397.889.89.889H8.11A.887.887 0 0 0 9 12l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333V5.11l-.002-.036a2.59 2.59 0 0 0-.757-1.795l-1.15-1.15a.444.444 0 0 0-.383-.125Zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89V4.45c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" style="fill:#000;stroke-width:.0888887;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.0888887,.0888887;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#000" opacity=".6" r="8" stroke-width=".666667"/><circle cx="8" cy="8" fill="#574469" r="7.333" stroke-width=".666667"/><path d="m10.375 2.005a.444.444 0 0 0 -.245.754l1.15 1.149c.212.212.362.474.439.759h-.386a1.34 1.34 0 0 0 -1.333 1.333 1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1 -.444-.444v-.89a1.34 1.34 0 0 0 -1.333-1.332h-.556v-5.55a.887.887 0 0 0 -.888-.89h-2.89a.887.887 0 0 0 -.888.89l-.001 7.994c0 .492.397.889.89.889h2.887a.887.887 0 0 0 .89-.889l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333v-6.668l-.002-.036a2.59 2.59 0 0 0 -.757-1.795l-1.15-1.15a.444.444 0 0 0 -.383-.125zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89v-2.222c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" fill="#000" stroke-dasharray=".088889 .088889" stroke-linecap="round" stroke-linejoin="round" stroke-width=".088889"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/funeral_directors-m.svg b/data/styles/default/dark/symbols/funeral_directors-m.svg
index a3c28186f..819fc8599 100644
--- a/data/styles/default/dark/symbols/funeral_directors-m.svg
+++ b/data/styles/default/dark/symbols/funeral_directors-m.svg
@@ -1,14 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>funeral_directors-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="funeral_directors-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
-   <g id="tomb" transform="translate(6 6)" fill="#000">
-    <path id="Shape" d="m6.2293 0.0015h-0.46085c-2.06 0-3.73 1.67-3.73 3.73v4.1207h7.9208v-4.1207c0-2.06-1.6699-3.73-3.73-3.73zm1.2105 6.7177h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156zm0-1.4062h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156zm0-1.4062h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156z"/>
-    <path id="Path" d="m11.254 9.8099v-0.90302c0-0.19416-0.15741-0.35156-0.35156-0.35156h-9.8078c-0.19416 0-0.35156 0.15741-0.35156 0.35156v0.90302h10.511z"/>
-    <path id="Path" d="m11.998 11.996h-11.998v-1.1317c0-0.19416 0.15741-0.35156 0.35156-0.35156h11.295c0.19416 0 0.35156 0.15741 0.35156 0.35156v1.1317z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><g fill="#000" transform="translate(6 6)"><path d="m6.2293.0015h-.46085c-2.06 0-3.73 1.67-3.73 3.73v4.1207h7.9208v-4.1207c0-2.06-1.6699-3.73-3.73-3.73zm1.2105 6.7177h-2.8818c-.19416 0-.35156-.15741-.35156-.35156s.15741-.35156.35156-.35156h2.8818c.19416 0 .35156.15741.35156.35156s-.15738.35156-.35156.35156zm0-1.4062h-2.8818c-.19416 0-.35156-.15741-.35156-.35156s.15741-.35156.35156-.35156h2.8818c.19416 0 .35156.15741.35156.35156s-.15738.35156-.35156.35156zm0-1.4062h-2.8818c-.19416 0-.35156-.15741-.35156-.35156s.15741-.35156.35156-.35156h2.8818c.19416 0 .35156.15741.35156.35156s-.15738.35156-.35156.35156z"/><path d="m11.254 9.8099v-.90302c0-.19416-.15741-.35156-.35156-.35156h-9.8078c-.19416 0-.35156.15741-.35156.35156v.90302h10.511z"/><path d="m11.998 11.996h-11.998v-1.1317c0-.19416.15741-.35156.35156-.35156h11.295c.19416 0 .35156.15741.35156.35156v1.1317z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/gambling-m.svg b/data/styles/default/dark/symbols/gambling-m.svg
index 145507cf9..d78343de4 100644
--- a/data/styles/default/dark/symbols/gambling-m.svg
+++ b/data/styles/default/dark/symbols/gambling-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
- <path d="m9.5 6.4h7v9.1c0 0.385 0.315 0.7 0.7 0.7s0.7-0.315 0.7-0.7v-9.1c0-0.77-0.63-1.4-1.4-1.4h-7c-0.385 0-0.7 0.315-0.7 0.7s0.315 0.7 0.7 0.7zm-3.5 2.8v8.4c0 0.77 0.63 1.4 1.4 1.4h6.3c0.77 0 1.4-0.63 1.4-1.4v-8.4c0-0.77-0.63-1.4-1.4-1.4h-6.3c-0.77 0-1.4 0.63-1.4 1.4z" fill="#000"/>
- <path d="m10.55 9.0831c-1.2696 2.116-3.3856 2.9624-3.3856 5.0784 0 0.8464 0.8464 1.6928 1.6928 1.6928 0.4232 0 0.8464 0 1.2696-0.4232 0 0 0.13542 0.8464-0.8464 2.116h2.5392c-0.8464-1.2696-0.8464-2.116-0.8464-2.116 0.4232 0.4232 0.8464 0.4232 1.2696 0.4232 0.8464 0 1.6928-0.8464 1.6928-1.6928 0-2.116-2.116-2.9624-3.3856-5.0784z" fill="#6E4426"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m9.5 6.4h7v9.1c0 .385.315.7.7.7s.7-.315.7-.7v-9.1c0-.77-.63-1.4-1.4-1.4h-7c-.385 0-.7.315-.7.7s.315.7.7.7zm-3.5 2.8v8.4c0 .77.63 1.4 1.4 1.4h6.3c.77 0 1.4-.63 1.4-1.4v-8.4c0-.77-.63-1.4-1.4-1.4h-6.3c-.77 0-1.4.63-1.4 1.4z" fill="#000"/><path d="m10.55 9.0831c-1.2696 2.116-3.3856 2.9624-3.3856 5.0784 0 .8464.8464 1.6928 1.6928 1.6928.4232 0 .8464 0 1.2696-.4232 0 0 .13542.8464-.8464 2.116h2.5392c-.8464-1.2696-.8464-2.116-.8464-2.116.4232.4232.8464.4232 1.2696.4232.8464 0 1.6928-.8464 1.6928-1.6928 0-2.116-2.116-2.9624-3.3856-5.0784z" fill="#802D19"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/geyser-m.svg b/data/styles/default/dark/symbols/geyser-m.svg
index 59103079b..3a867645c 100644
--- a/data/styles/default/dark/symbols/geyser-m.svg
+++ b/data/styles/default/dark/symbols/geyser-m.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>geyser-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="geyser-m" fill-rule="nonzero">
-   <g id="geyser" transform="translate(5.1429 5.1429)" fill="#14A0C2">
-    <path id="Path" d="m12.509 0h-11.304c-0.66463 0-1.2054 0.54072-1.2054 1.2054 0 0.66463 0.54072 1.2054 1.2054 1.2054h0.44215c0.1867 0.9158 0.99841 1.6071 1.9686 1.6071h1.301c0.12123 0.342 0.39273 0.61347 0.73473 0.73473v3.918c0.35044-0.016821 0.6818-0.13653 0.96303-0.34918l0.24233-0.18324 0.24233 0.18324c0.28122 0.21265 0.61259 0.33236 0.96303 0.34918v-3.918c0.342-0.12123 0.61347-0.39273 0.73473-0.73473h1.301c0.97015 0 1.7819-0.69134 1.9686-1.6071h0.44215c0.66463 0 1.2054-0.54072 1.2054-1.2054 0-0.66463-0.54072-1.2054-1.2054-1.2054z"/>
-    <path id="Path" d="m13.312 9.4765c-0.46012 0-0.90118-0.12072-1.291-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.291-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.291 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514h-0.40184v1.6763h0.40179c0.38202 0 0.74467-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.30407 0.22993 0.66672 0.35146 1.0487 0.35146s0.74467-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.3041 0.22993 0.66675 0.35146 1.0487 0.35146 0.38204 0 0.7447-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.30407 0.22993 0.66672 0.35146 1.0487 0.35146s0.74467-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.30407 0.22993 0.66672 0.35146 1.0487 0.35146 0.38204 0 0.7447-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.3041 0.22993 0.66675 0.35146 1.0487 0.35146h0.40179v-1.6763h-0.40179z"/>
-    <path id="Path" d="m13.312 11.956c-0.46018 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.291-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.291 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514h-0.40184v1.758h13.714v-1.758h-0.40179z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#0a6074" transform="translate(5.1429 5.1429)"><path d="m12.509 0h-11.304c-.66463 0-1.2054.54072-1.2054 1.2054 0 .66463.54072 1.2054 1.2054 1.2054h.44215c.1867.9158.99841 1.6071 1.9686 1.6071h1.301c.12123.342.39273.61347.73473.73473v3.918c.35044-.016821.6818-.13653.96303-.34918l.24233-.18324.24233.18324c.28122.21265.61259.33236.96303.34918v-3.918c.342-.12123.61347-.39273.73473-.73473h1.301c.97015 0 1.7819-.69134 1.9686-1.6071h.44215c.66463 0 1.2054-.54072 1.2054-1.2054 0-.66463-.54072-1.2054-1.2054-1.2054z"/><path d="m13.312 9.4765c-.46012 0-.90118-.12072-1.291-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.6763h.40179c.38202 0 .74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146h.40179v-1.6763h-.40179z"/><path d="m13.312 11.956c-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.758h13.714v-1.758h-.40179z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/geyser-s.svg b/data/styles/default/dark/symbols/geyser-s.svg
index db83174ff..5f54f0e4c 100644
--- a/data/styles/default/dark/symbols/geyser-s.svg
+++ b/data/styles/default/dark/symbols/geyser-s.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>geyser-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="geyser-s" fill-rule="nonzero">
-   <g id="geyser" transform="translate(3.4286 3.4286)" fill="#14A0C2">
-    <path id="Path" d="m8.3393 0h-7.5357c-0.44309 0-0.80357 0.36048-0.80357 0.80357 0 0.44309 0.36048 0.80357 0.80357 0.80357h0.29477c0.12446 0.61054 0.66561 1.0714 1.3124 1.0714h0.86732c0.080821 0.228 0.26182 0.40898 0.48982 0.48982v2.612c0.23362-0.011214 0.45454-0.091018 0.64202-0.23279l0.16155-0.12216 0.16155 0.12216c0.18748 0.14177 0.40839 0.22157 0.64202 0.23279v-2.612c0.228-0.080821 0.40898-0.26182 0.48982-0.48982h0.86732c0.64677 0 1.1879-0.46089 1.3124-1.0714h0.29477c0.44309 0 0.80357-0.36048 0.80357-0.80357 0-0.44309-0.36048-0.80357-0.80357-0.80357z"/>
-    <path id="Path" d="m8.875 6.3176c-0.30675 0-0.60079-0.080482-0.86068-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.8607-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.8607 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427h-0.26789v1.1175h0.26786c0.25468 0 0.49645-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20271 0.15329 0.44448 0.2343 0.69916 0.2343 0.25468 0 0.49645-0.081018 0.69914-0.2343l0.16155-0.12216 0.16155 0.12216c0.20273 0.15329 0.4445 0.2343 0.69916 0.2343 0.2547 0 0.49646-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20271 0.15329 0.44448 0.2343 0.69916 0.2343s0.49645-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20271 0.15329 0.44448 0.2343 0.69914 0.2343 0.2547 0 0.49646-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20273 0.15329 0.4445 0.2343 0.69916 0.2343h0.26786v-1.1175h-0.26786z"/>
-    <path id="Path" d="m8.875 7.9709c-0.30679 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.8607-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.8607 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427h-0.26789v1.172h9.1429v-1.172h-0.26786z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="#0a6074" transform="translate(3.4286 3.4286)"><path d="m8.3393 0h-7.5357c-.44309 0-.80357.36048-.80357.80357s.36048.80357.80357.80357h.29477c.12446.61054.66561 1.0714 1.3124 1.0714h.86732c.080821.228.26182.40898.48982.48982v2.612c.23362-.011214.45454-.091018.64202-.23279l.16155-.12216.16155.12216c.18748.14177.40839.22157.64202.23279v-2.612c.228-.080821.40898-.26182.48982-.48982h.86732c.64677 0 1.1879-.46089 1.3124-1.0714h.29477c.44309 0 .80357-.36048.80357-.80357s-.36048-.80357-.80357-.80357z"/><path d="m8.875 6.3176c-.30675 0-.60079-.080482-.86068-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.1175h.26786c.25468 0 .49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69914-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69914.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343h.26786v-1.1175h-.26786z"/><path d="m8.875 7.9709c-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.172h9.1429v-1.172h-.26786z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/golf-centre-m.svg b/data/styles/default/dark/symbols/golf-centre-m.svg
new file mode 100644
index 000000000..1cdfe310f
--- /dev/null
+++ b/data/styles/default/dark/symbols/golf-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m13.359585 14.0449775c.4804877 0 .87-.3895123.87-.87s-.3895123-.87-.87-.87-.87.3895123-.87.87.3895123.87.87.87zm-4.929681-1.7226v-5.248971l2.447571-1.246971c.4234029-.2146029.4234029-.8293971-.0058-1.038171l-2.76077103-1.351371c-.3886029-.1914-.8410029.087-.8410029.5161971v8.93229c0 .3190029-.261.5800029-.5800029.5800029s-.5800029-.261-.5800029-.5800029v-.4234029c-1.038171.2029971-1.74.5742-1.74 1.003371 0 .6379971 1.560171 1.159971 3.48 1.159971s3.48000003-.522 3.48000003-1.159971c0-.5521154-1.1582841-1.0130963-2.71171184-1.130187z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/golf-m.svg b/data/styles/default/dark/symbols/golf-m.svg
index 7e9c2fc07..45c6f5a74 100644
--- a/data/styles/default/dark/symbols/golf-m.svg
+++ b/data/styles/default/dark/symbols/golf-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>golf-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="golf-m" fill-rule="nonzero">
-   <g id="golf_course_black_24dp" transform="translate(6,5)" fill="#777777">
-    <g transform="matrix(1.392 0 0 1.392 -1.8882 -2.5605)">
-     <circle cx="10.333" cy="11.667" r="1"/>
-     <path id="Path" d="m4.6667 10.687v-6.0333l2.8133-1.4333c0.48667-0.24667 0.48667-0.95333-0.0066667-1.1933l-3.1733-1.5533c-0.44667-0.22-0.96667 0.1-0.96667 0.59333v10.267c0 0.36667-0.3 0.66667-0.66667 0.66667-0.36667 0-0.66667-0.3-0.66667-0.66667v-0.48667c-1.1933 0.23333-2 0.66-2 1.1533 0 0.73333 1.7933 1.3333 4 1.3333s4-0.6 4-1.3333c0-0.66-1.44-1.2067-3.3333-1.3133z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.871502 15.053973c.5765853 0 1.044-.4674147 1.044-1.044s-.4674147-1.044-1.044-1.044-1.044.4674147-1.044 1.044.4674147 1.044 1.044 1.044zm-5.9156172-2.06712v-6.2987652l2.9370852-1.4963652c.5080835-.25752348.5080835-.99527652-.00696-1.2458052l-3.31292523-1.6216452c-.46632348-.22968-1.00920348.1044-1.00920348.61943652v10.71874798c0 .3828035-.3132.6960035-.69600348.6960035s-.69600348-.3132-.69600348-.6960035v-.5080835c-1.2458052.2435966-2.088.68904-2.088 1.2040452 0 .7655966 1.8722052 1.3919652 4.176 1.3919652s4.17599997-.6264 4.17599997-1.3919652c0-.6625384-1.3899408-1.2157156-3.25405415-1.3562243z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/grinding_mill-m.svg b/data/styles/default/dark/symbols/grinding_mill-m.svg
index 64c647879..46db50973 100644
--- a/data/styles/default/dark/symbols/grinding_mill-m.svg
+++ b/data/styles/default/dark/symbols/grinding_mill-m.svg
@@ -1,14 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
- <path d="m7.3333 9.9996 4.6666-5.333 4.6667 5.333v8.6669h-9.3333z" fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
- <path d="m2.7578 17.659a5.9999 5.9582 0 0 1 2.685-6.0597 5.9999 5.9582 0 0 1 6.6652 0.14442 5.9999 5.9582 0 0 1 2.4163 6.1703 5.9999 5.9582 0 0 1-4.8158 4.5781z" fill="#6B425C"/>
- <g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333">
-  <path d="m5.9998 14 5.3336 5.3336"/>
-  <path d="m11.333 14-5.3336 5.3334"/>
-  <path d="m5.2819 16.666h6.7693"/>
-  <path d="m8.6666 13.233v6.8183"/>
- </g>
- <ellipse cx="8.6666" cy="16.666" rx="2.0006" ry="2.0001" fill="#6B425C" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
-</svg>
+
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m7.3333 9.9996 4.6666-5.333 4.6667 5.333v8.6669h-9.3333z" fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/><path d="m2.7578 17.659a5.9999 5.9582 0 0 1 2.685-6.0597 5.9999 5.9582 0 0 1 6.6652.14442 5.9999 5.9582 0 0 1 2.4163 6.1703 5.9999 5.9582 0 0 1 -4.8158 4.5781z" fill="#574469"/><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"><g fill="none"><path d="m5.9998 14 5.3336 5.3336"/><path d="m11.333 14-5.3336 5.3334"/><path d="m5.2819 16.666h6.7693"/><path d="m8.6666 13.233v6.8183"/></g><ellipse cx="8.6666" cy="16.666" fill="#574469" rx="2.0006" ry="2.0001"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/hackerspace-m.svg b/data/styles/default/dark/symbols/hackerspace-m.svg
index 619c2ff72..164eb8ad0 100644
--- a/data/styles/default/dark/symbols/hackerspace-m.svg
+++ b/data/styles/default/dark/symbols/hackerspace-m.svg
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#51585E"/><g fill="none" stroke="#000" stroke-width="1.2"><path d="m7.2852 5.5351h9.4289l1.7502 1.7502v9.4289l-1.7502 1.7502h-9.4289l-1.7502-1.7502v-9.4289z" stroke-linecap="round"/><path d="m10.011 15.179h5.9743" stroke-linejoin="bevel"/><path d="m8.0337 8.0337 2.4494 2.4494-2.4494 2.45" stroke-linecap="square"/></g></svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#6E4426" r="11"/><g fill="none" stroke="#000" stroke-width="1.2"><path d="m7.2852 5.5351h9.4289l1.7502 1.7502v9.4289l-1.7502 1.7502h-9.4289l-1.7502-1.7502v-9.4289z" stroke-linecap="round"/><path d="m10.011 15.179h5.9743" stroke-linejoin="bevel"/><path d="m8.0337 8.0337 2.4494 2.4494-2.4494 2.45" stroke-linecap="square"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/handball-centre-m.svg b/data/styles/default/dark/symbols/handball-centre-m.svg
new file mode 100644
index 000000000..0d1aee9c5
--- /dev/null
+++ b/data/styles/default/dark/symbols/handball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m7.1071875 15.758125-.739375-.443625 1.8928125-3.2236875-1.2125625-.7245625-1.1090625 1.7893125-.739375-.443625 3.386375-5.4861875c-.41405-.36475833-.72459167-.76155-.931625-1.190375-.207025-.42883333-.3105375-.87985417-.3105375-1.3530625 0-.37461667.03696875-.71965833.11090625-1.035125s.20456042-.66050833.39186875-1.035125l.7689375.41405c-.13801667.28589167-.2366.5545375-.29575.8059375-.05915.2513875-.088725.50524167-.088725.7615625 0 .47320833.11337083.90204167.3401125 1.2865s.60628333.7344375 1.138625 1.0499375l1.434375.842875c.5619167.325325.9784375.72705417 1.2495625 1.2051875.2711042.478125.4066563 1.0277292.4066563 1.6488125 0 .384475-.05915.7738708-.17745 1.1681875-.1183.3943333-.2760334.7689583-.4732 1.123875l-.7689375-.443625c.1675916-.3154667.2982145-.62355.3918687-.92425.0936542-.3006792.1404813-.6087625.1404813-.92425 0-.3746167-.0640792-.7172-.1922375-1.02775-.1281584-.3105375-.3203959-.5496-.5767125-.7171875zm4.2144375-8.990625c-.29575 0-.5496042-.10597708-.7615625-.31793125-.2119542-.21195417-.3179312-.46580833-.3179312-.7615625 0-.29575.105977-.54960417.3179312-.7615625.2119542-.21195417.4658083-.31793125.7615625-.31793125s.5496083.10597708.7615625.31793125.3179313.46580833.3179313.7615625c0 .29575-.1059771.54960417-.3179313.7615625-.2119542.21195417-.4658083.31793125-.7615625.31793125zm-1.39-2.7505c-.25631667 0-.468275-.08379583-.635875-.2513875-.16759167-.16759167-.2513875-.37955-.2513875-.635875s.08379583-.46828333.2513875-.635875.37955-.2513875.635875-.2513875c.2563167 0 .468275.08379583.635875.2513875s.2513875.37955.2513875.635875-.0838042.46828333-.2513875.635875c-.1675917.16759167-.37955.2513875-.635875.2513875z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/handball-m.svg b/data/styles/default/dark/symbols/handball-m.svg
index 7e27d7911..eac4b5a36 100644
--- a/data/styles/default/dark/symbols/handball-m.svg
+++ b/data/styles/default/dark/symbols/handball-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m8.9715 22.813-1.183-0.7098 3.0285-5.1579-1.9401-1.1593-1.7745 2.8629-1.183-0.7098 5.4182-8.7779q-0.99372-0.87542-1.4906-1.9046-0.49686-1.0292-0.49686-2.1649 0-0.89908 0.17745-1.6562t0.62699-1.6562l1.2303 0.66248q-0.33124 0.68614-0.4732 1.2895-0.14196 0.60333-0.14196 1.2185 0 1.1357 0.54418 2.0584t1.8218 1.6799l2.295 1.3486q1.3486 0.78078 1.9993 1.9283 0.65065 1.1475 0.65065 2.6381 0 0.92274-0.28392 1.8691-0.28392 0.9464-0.75712 1.7982l-1.2303-0.7098q0.40222-0.75712 0.62699-1.4788 0.22477-0.72163 0.22477-1.4788 0-0.89908-0.30758-1.6444-0.30758-0.74529-0.92274-1.1475zm6.7431-14.385q-0.7098 0-1.2185-0.50869-0.50869-0.50869-0.50869-1.2185 0-0.7098 0.50869-1.2185 0.50869-0.50869 1.2185-0.50869t1.2185 0.50869q0.50869 0.50869 0.50869 1.2185 0 0.7098-0.50869 1.2185-0.50869 0.50869-1.2185 0.50869zm-2.224-4.4008q-0.61516 0-1.0174-0.40222-0.40222-0.40222-0.40222-1.0174t0.40222-1.0174 1.0174-0.40222q0.61516 0 1.0174 0.40222t0.40222 1.0174-0.40222 1.0174q-0.40222 0.40222-1.0174 0.40222z" fill="#777777" stroke-width=".4732"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.728625 17.10975-.88725-.53235 2.271375-3.868425-1.455075-.869475-1.330875 2.147175-.88725-.53235 4.06365-6.583425c-.49686-.43771-.86951-.91386-1.11795-1.42845-.24843-.5146-.372645-1.055825-.372645-1.623675 0-.44954.0443625-.86359.1330875-1.24215s.2454725-.79261.4702425-1.24215l.922725.49686c-.16562.34307-.28392.665445-.3549.967125-.07098.301665-.10647.60629-.10647.913875 0 .56785.136045 1.08245.408135 1.5438s.72754.881325 1.36635 1.259925l1.72125 1.01145c.6743.39039 1.174125.872465 1.499475 1.446225.325325.57375.4879875 1.233275.4879875 1.978575 0 .46137-.07098.928645-.21294 1.401825-.14196.4732-.33124.92275-.56784 1.34865l-.922725-.53235c.20111-.37856.3578575-.74826.4702425-1.1091.112385-.360815.1685775-.730515.1685775-1.1091 0-.44954-.076895-.86064-.230685-1.2333-.15379-.372645-.384475-.65952-.692055-.860625zm5.057325-10.78875c-.3549 0-.659525-.1271725-.913875-.3815175-.254345-.254345-.3815175-.55897-.3815175-.913875 0-.3549.1271725-.659525.3815175-.913875.254345-.254345.55897-.3815175.913875-.3815175s.65953.1271725.913875.3815175.3815175.55897.3815175.913875c0 .3549-.1271725.659525-.3815175.913875-.254345.254345-.55897.3815175-.913875.3815175zm-1.668-3.3006c-.30758 0-.56193-.100555-.76305-.301665-.20111-.20111-.301665-.45546-.301665-.76305s.100555-.56194.301665-.76305.45546-.301665.76305-.301665c.30758 0 .56193.100555.76305.301665s.301665.45546.301665.76305-.100565.56194-.301665.76305c-.20111.20111-.45546.301665-.76305.301665z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/handicraft-m.svg b/data/styles/default/dark/symbols/handicraft-m.svg
index f3b3c00c5..6dd383802 100644
--- a/data/styles/default/dark/symbols/handicraft-m.svg
+++ b/data/styles/default/dark/symbols/handicraft-m.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
- <g stroke-linecap="round" stroke-linejoin="round">
-  <path d="m16 18.667c2.9752-7.9831-4.4623-7.0753-1.3333-13.333h-5.3333c3.129 6.258-4.3085 5.3502-1.3333 13.333z" fill="#000" stroke="#000" stroke-width="2.667"/>
-  <path d="m6.6667 9.3333 2.6667 2.6667 2.6667-2.6667 2.6667 2.6667 2.6667-2.6667" fill="none" stroke="#6B425C" stroke-width="1.333"/>
-  <path d="m5.3333 12 4 4 2.6667-2.6667 2.6667 2.6667 4-4" fill="none" stroke="#6B425C" stroke-width="1.333"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><g stroke-linecap="round" stroke-linejoin="round"><path d="m16 18.667c2.9752-7.9831-4.4623-7.0753-1.3333-13.333h-5.3333c3.129 6.258-4.3085 5.3502-1.3333 13.333z" fill="#000" stroke="#000" stroke-width="2.667"/><g fill="none" stroke="#574469" stroke-width="1.333"><path d="m6.6667 9.3333 2.6667 2.6667 2.6667-2.6667 2.6667 2.6667 2.6667-2.6667"/><path d="m5.3333 12 4 4 2.6667-2.6667 2.6667 2.6667 4-4"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/hockey-centre-m.svg b/data/styles/default/dark/symbols/hockey-centre-m.svg
new file mode 100644
index 000000000..b06bd8fc6
--- /dev/null
+++ b/data/styles/default/dark/symbols/hockey-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m3.62025 13.00375v-1.1431875c0-.1613917.04931458-.2914021.14794375-.3900313.09862917-.0986291.22863958-.1479437.39003125-.1479437h.2689875v1.6811875zm1.39875 0v-1.6811875h2.353625l.578325-1.26425.659 1.3045625-.61866875 1.358375c-.04483333.0986292-.10983958.1703583-.19501875.2151875-.08517917.0448333-.18156667.06725-.2891625.06725zm8.55375 0v-1.6811875h.2689875c.1613917 0 .2914021.0493146.3900313.1479437.0986291.0986292.1479437.2286396.1479437.3900313v1.1431875zm-.591775 0h-2.488125c-.1075958 0-.2039833-.0224167-.2891625-.06725s-.1501854-.1165625-.1950187-.2151875l-3.79275005-8.325h1.2508125l1.53325 3.3623125 1.53325005-3.3623125h1.2508125l-2.15187505 4.747625.99525005 2.1788125h2.353625z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/hockey-m.svg b/data/styles/default/dark/symbols/hockey-m.svg
index a17367b29..fbbd8c959 100644
--- a/data/styles/default/dark/symbols/hockey-m.svg
+++ b/data/styles/default/dark/symbols/hockey-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m3.3924 18.886v-1.8291q0-0.38734 0.23671-0.62405t0.62405-0.23671h0.43038v2.6899zm2.238 0v-2.6899h3.7658l0.92532-2.0228 1.0544 2.0873-0.98987 2.1734q-0.1076 0.23671-0.31203 0.3443-0.20443 0.1076-0.46266 0.1076zm13.686 0v-2.6899h0.43038q0.38734 0 0.62405 0.23671t0.23671 0.62405v1.8291zm-0.94684 0h-3.981q-0.25823 0-0.46266-0.1076t-0.31203-0.3443l-6.0684-13.32h2.0013l2.4532 5.3797 2.4532-5.3797h2.0013l-3.443 7.5962 1.5924 3.4861h3.7658z" fill="#777777" stroke-width=".43038"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m2.5443 14.1645v-1.371825c0-.19367.0591775-.3496825.1775325-.4680375s.2743675-.1775325.4680375-.1775325h.322785v2.017425zm1.6785 0v-2.017425h2.82435l.69399-1.5171.7908 1.565475-.7424025 1.63005c-.0538.118355-.1318075.20443-.2340225.258225-.102215.0538-.21788.0807-.346995.0807zm10.2645 0v-2.017425h.322785c.19367 0 .3496825.0591775.4680375.1775325s.1775325.2743675.1775325.4680375v1.371825zm-.71013 0h-2.98575c-.129115 0-.24478-.0269-.346995-.0807s-.1802225-.139875-.2340225-.258225l-4.5513-9.99h1.500975l1.8399 4.034775 1.8399-4.034775h1.500975l-2.58225 5.69715 1.1943 2.614575h2.82435z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/key_cutter-m.svg b/data/styles/default/dark/symbols/key_cutter-m.svg
index be8e03f50..5f2a46448 100644
--- a/data/styles/default/dark/symbols/key_cutter-m.svg
+++ b/data/styles/default/dark/symbols/key_cutter-m.svg
@@ -1,7 +1,8 @@
+
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
+ <circle cx="12" cy="12" r="11" fill="#574469"/>
  <circle cx="7.3333" cy="12" r="3.3332" fill="none" stroke="#000" stroke-width="2.667"/>
  <rect x="10.667" y="10.667" width="10.667" height="2.6667" fill="#000"/>
  <rect x="17.333" y="10.667" width="2.6667" height="5.3333" fill="#000"/>
diff --git a/data/styles/default/dark/symbols/laundry-m.svg b/data/styles/default/dark/symbols/laundry-m.svg
index 93798e975..dd4237467 100644
--- a/data/styles/default/dark/symbols/laundry-m.svg
+++ b/data/styles/default/dark/symbols/laundry-m.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
- <rect x="5" y="4" width="8" height="10" rx="1" ry="1" fill="#000"/>
- <circle cx="9" cy="10" r="3" fill="#51585E"/>
- <path d="m7.584 11.416c0.78 0.78 2.052 0.78 2.832 0s0.78-2.052 0-2.832z" fill="#000"/>
- <circle cx="6.5" cy="5.5" r=".75" fill="#51585E"/>
- <circle cx="8.5" cy="5.5" r=".75" fill="#51585E"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6B425C" r="8.25"/><rect fill="#000" height="10" rx="1" width="8" x="5" y="4"/><circle cx="9" cy="10" fill="#6B425C" r="3"/><path d="m7.584 11.416c.78.78 2.052.78 2.832 0s.78-2.052 0-2.832z" fill="#000"/><g fill="#6B425C"><circle cx="6.5" cy="5.5" r=".75"/><circle cx="8.5" cy="5.5" r=".75"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/lawyer-m.svg b/data/styles/default/dark/symbols/lawyer-m.svg
index 4f509880a..c703e3718 100644
--- a/data/styles/default/dark/symbols/lawyer-m.svg
+++ b/data/styles/default/dark/symbols/lawyer-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>lawyer-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="lawyer-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m5.6868 17.168h6.8678c0.37773 0 0.68678 0.30905 0.68678 0.68678 0 0.37773-0.30905 0.68678-0.68678 0.68678h-6.8678c-0.37773 0-0.68678-0.30905-0.68678-0.68678 0-0.37773 0.30905-0.68678 0.68678-0.68678zm2.2252-8.8801 1.9436-1.9436 8.7427 8.7427c0.53569 0.53569 0.53569 1.4079 0 1.9436s-1.4079 0.53569-1.9436 0l-8.7427-8.7427zm5.8308-3.8872 1.9436 1.9436c0.53569 0.53569 0.53569 1.4079 0 1.9436l-0.97523 0.97523-3.8803-3.8872 0.96836-0.96836c0.53569-0.54256 1.4079-0.54256 1.9436-0.0068678zm-6.7991 4.8555 3.8872 3.8872-0.96836 0.96836c-0.53569 0.53569-1.4079 0.53569-1.9436 0l-1.9436-1.9436c-0.53569-0.53569-0.53569-1.4079 0-1.9436l0.96836-0.96836z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m5.6868 17.168h6.8678c.37773 0 .68678.30905.68678.68678s-.30905.68678-.68678.68678h-6.8678c-.37773 0-.68678-.30905-.68678-.68678s.30905-.68678.68678-.68678zm2.2252-8.8801 1.9436-1.9436 8.7427 8.7427c.53569.53569.53569 1.4079 0 1.9436s-1.4079.53569-1.9436 0zm5.8308-3.8872 1.9436 1.9436c.53569.53569.53569 1.4079 0 1.9436l-.97523.97523-3.8803-3.8872.96836-.96836c.53569-.54256 1.4079-.54256 1.9436-.0068678zm-6.7991 4.8555 3.8872 3.8872-.96836.96836c-.53569.53569-1.4079.53569-1.9436 0l-1.9436-1.9436c-.53569-.53569-.53569-1.4079 0-1.9436z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/lighthouse-m.svg b/data/styles/default/dark/symbols/lighthouse-m.svg
index edc207536..6c28ad04e 100644
--- a/data/styles/default/dark/symbols/lighthouse-m.svg
+++ b/data/styles/default/dark/symbols/lighthouse-m.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path id="Shape" d="m8.3705 14.053 0.53851-4.3378h3.4251l0.21438 1.7268-4.178 2.611zm5.508 4.2177h-0.48558c4.87e-5 -0.0027222 3.889e-4 -0.0053958 3.889e-4 -0.008118 0-0.024646-0.0024305-0.048757-0.0070972-0.071993l-0.60603-4.882-4.6562 2.9099c-0.0077778 0.0048611-0.015944 0.0085069-0.023917 0.012688l-0.2466 1.9865c-0.0021875 0.017743-0.002625 0.035438-0.0021875 0.053035h-0.48669c-0.2014 0-0.36458 0.16319-0.36458 0.36458 0 0.2014 0.16319 0.36458 0.36458 0.36458h6.5139c0.2014 0 0.36458-0.16319 0.36458-0.36458 0-0.2014-0.16319-0.36463-0.36453-0.36463zm-1.4583-9.9167h-0.25497l-0.075833-0.58333h-1.2086c-0.035778 0-0.069903-0.019396-0.10092-0.032521s-0.058965-0.03816-0.082396-0.061639c-0.035194-0.035194-0.068396-0.083465-0.07875-0.13412-0.0034513-0.016868-0.013368-0.035875-0.013368-0.053764v-0.001507-0.28355c0-0.017889 0.0099167-0.035389 0.013368-0.052257 0.017257-0.084389 0.079576-0.15385 0.15711-0.18662 0.031014-0.013125 0.069174-0.020368 0.10495-0.020368h1.1084l-0.058236-0.46657c0.13038-0.055562 0.22176-0.18482 0.22176-0.33551 0-0.19158-0.14783-0.3483-0.33556-0.36312-0.16061-0.46142-0.60088-0.77928-1.1087-0.77928h-0.17383c-0.50735 0-0.94719 0.31724-1.1082 0.77778h-0.020174c-0.2014 0-0.36458 0.16319-0.36458 0.36458 0 0.16805 0.1138 0.30912 0.26843 0.35136l-0.23217 1.8604h-0.30362c-0.2014 0-0.36458 0.16319-0.36458 0.36458 0 0.10578 0.045306 0.20076 0.1173 0.26736h4.1404c0.071944-0.066597 0.1173-0.16158 0.1173-0.26736 0-0.2014-0.16324-0.36458-0.36458-0.36458zm4.8198-2.0684c-0.08259-0.069368-0.18769-0.098486-0.29381-0.079625l-4.4702 0.79246c-0.17408 0.030868-0.29998 0.18215-0.29998 0.35899s0.12741 0.32812 0.30149 0.35899l4.4725 0.79246c0.021194 0.003743 0.042583 0.0055903 0.063729 0.0055903 0.084972 0 0.16008-0.029701 0.22619-0.085215 0.082639-0.069271 0.12231-0.17155 0.12231-0.27937v-1.5849c0-0.10782-0.039521-0.2101-0.12221-0.27937z" fill="#777"/>
-</svg>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>lighthouse-m</title>
+    <g id="lighthouse-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#51585E" cx="9" cy="9" r="8.25"></circle>
+        <path d="M7.00594076,10.3631798 L7.42906277,6.95491516 L10.1202074,6.95491516 L10.2886485,8.31168388 L7.00594076,10.3631798 L7.00594076,10.3631798 Z M11.3336542,13.6770803 L10.9521279,13.6770803 C10.9521661,13.6749414 10.9524334,13.6728407 10.9524334,13.6707019 C10.9524334,13.6513372 10.9505238,13.6323929 10.9468571,13.6141361 L10.4706916,9.77828659 L6.81225606,12.064632 C6.80614494,12.0684514 6.79972865,12.071316 6.79346416,12.0746011 L6.59970741,13.6354194 C6.59798866,13.6493603 6.59764491,13.6632635 6.59798866,13.6770897 L6.21559014,13.6770897 C6.0573476,13.6770897 5.929135,13.8053102 5.929135,13.9635449 C5.929135,14.1217874 6.05735546,14.25 6.21559014,14.25 L11.3336442,14.25 C11.4918867,14.25 11.6200993,14.1217795 11.6200993,13.9635449 C11.6200993,13.8053023 11.4918789,13.6770504 11.3336835,13.6770504 L11.3336542,13.6770803 Z M10.1878494,5.88540301 L9.98751623,5.88540301 L9.92793327,5.42707322 L8.97832089,5.42707322 C8.95020966,5.42707322 8.92339721,5.41183353 8.89902676,5.40152105 C8.87465631,5.39120857 8.85269721,5.37153826 8.83428718,5.35309051 C8.8066348,5.32543813 8.78054757,5.287511 8.7724123,5.24771072 C8.76970057,5.23445732 8.76190889,5.21952328 8.76190889,5.20546766 L8.76190889,5.20428359 L8.76190889,4.98149475 C8.76190889,4.96743914 8.76970057,4.95368916 8.7724123,4.94043576 C8.78597134,4.87413025 8.83493617,4.81955386 8.89585562,4.79380606 C8.92022372,4.78349358 8.95020651,4.77780266 8.97831617,4.77780266 L9.84920015,4.77780266 L9.80344338,4.41121268 C9.9058846,4.36755691 9.97768303,4.26599725 9.97768303,4.1475982 C9.97768303,3.99707136 9.86153112,3.87393447 9.71402927,3.8622902 C9.58783595,3.49974664 9.24191022,3.25 8.84290959,3.25 L8.70632915,3.25 C8.3076978,3.25 7.96210992,3.4992595 7.83560232,3.86111163 L7.81975135,3.86111163 C7.66150881,3.86111163 7.53329621,3.98933209 7.53329621,4.14756678 C7.53329621,4.2796058 7.62271031,4.39044629 7.74420507,4.4236348 L7.56178615,5.88537473 L7.32322805,5.88537473 C7.16498551,5.88537473 7.03677291,6.01359519 7.03677291,6.17182987 C7.03677291,6.25494256 7.07237041,6.32956956 7.12893701,6.38189802 L10.3821019,6.38189802 C10.4386293,6.32957191 10.474266,6.25494256 10.474266,6.17182987 C10.474266,6.01358733 10.3460063,5.88537473 10.1878109,5.88537473 L10.1878494,5.88540301 Z M13.9748275,4.26023484 C13.9099355,4.20573152 13.8273571,4.18285313 13.7439773,4.19767246 L10.2316843,4.82031836 C10.0949074,4.84457174 9.99598621,4.96343593 9.99598621,5.10238137 C9.99598621,5.2413268 10.0960939,5.36018942 10.2328707,5.38444437 L13.7469709,6.00709027 C13.7636232,6.01003119 13.7804289,6.01148264 13.7970435,6.01148264 C13.8638071,6.01148264 13.9228204,5.98814619 13.9747639,5.94452813 C14.0396944,5.89010103 14.0708644,5.80973912 14.0708644,5.72502357 L14.0708644,4.47974749 C14.0708644,4.39503195 14.0398123,4.31466925 13.9748425,4.26024293 L13.9748275,4.26023484 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/lighthouse-s.svg b/data/styles/default/dark/symbols/lighthouse-s.svg
index 35639e5fb..4d5d8db22 100644
--- a/data/styles/default/dark/symbols/lighthouse-s.svg
+++ b/data/styles/default/dark/symbols/lighthouse-s.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <path d="m5.5803 9.3687 0.35901-2.8919h2.2834l0.14292 1.1512-2.7854 1.7407zm3.672 2.8118h-0.32372c3.241e-5 -0.0018149 2.5926e-4 -0.0035973 2.5926e-4 -0.0054121 0-0.01643-0.0016204-0.032505-0.0047315-0.047995l-0.40402-3.2546-3.1041 1.9399c-0.0051852 0.0032408-0.01063 0.0056713-0.015944 0.0084584l-0.1644 1.3243c-0.0014583 0.011829-0.00175 0.023625-0.0014583 0.035356h-0.32446c-0.13426 0-0.24306 0.10879-0.24306 0.24306s0.10879 0.24306 0.24306 0.24306h4.3426c0.13426 0 0.24306-0.10879 0.24306-0.24306s-0.10879-0.24309-0.24302-0.24309zm-0.97222-6.6111h-0.16998l-0.050556-0.38889h-0.80571c-0.023852 0-0.046602-0.012931-0.067278-0.021681-0.020676-0.00875-0.03931-0.02544-0.054931-0.041093-0.023463-0.023463-0.045597-0.055644-0.0525-0.089412-0.0023009-0.011245-0.008912-0.023917-0.008912-0.035843v-0.0010046-0.18903c0-0.011926 0.0066111-0.023593 0.008912-0.034838 0.011505-0.056259 0.053051-0.10257 0.10474-0.12441 0.020676-0.00875 0.046116-0.013579 0.069968-0.013579h0.73895l-0.038824-0.31105c0.086917-0.037042 0.14784-0.12321 0.14784-0.22368 0-0.12772-0.098551-0.2322-0.22371-0.24208-0.10707-0.30761-0.40059-0.51952-0.73915-0.51952h-0.11589c-0.33824 0-0.63146 0.21149-0.73879 0.51852h-0.013449c-0.13426 0-0.24306 0.10879-0.24306 0.24306 0 0.11203 0.075866 0.20608 0.17895 0.23424l-0.15478 1.2403h-0.20242c-0.13426 0-0.24306 0.10879-0.24306 0.24306 0 0.070519 0.030204 0.13384 0.078199 0.17824h2.7603c0.047963-0.044398 0.078199-0.10772 0.078199-0.17824 0-0.13426-0.10882-0.24306-0.24306-0.24306zm3.2132-1.3789c-0.05506-0.046245-0.12512-0.065657-0.19587-0.053083l-2.9801 0.52831c-0.11605 0.020579-0.19999 0.12143-0.19999 0.23933s0.08494 0.21875 0.20099 0.23933l2.9816 0.52831c0.01413 0.0024954 0.028389 0.0037268 0.042486 0.0037268 0.056648 0 0.10672-0.019801 0.15079-0.05681 0.055093-0.046181 0.081537-0.11437 0.081537-0.18625v-1.0566c0-0.07188-0.026347-0.14006-0.081472-0.18625z" fill="#777"/>
-</svg>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>lighthouse-s</title>
+    <g id="lighthouse-s" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="6" cy="6" r="6"></circle>
+        <circle id="Oval" fill="#51585E" cx="6" cy="6" r="5.25"></circle>
+        <path d="M4.68524003,6.77656895 L4.95449949,4.60767328 L6.66704607,4.60767328 L6.77423585,5.47107156 L4.68524003,6.77656895 L4.68524003,6.77656895 Z M7.43923952,8.88541473 L7.19645001,8.88541473 C7.19647436,8.88405363 7.19664446,8.88271683 7.19664446,8.88135574 C7.19664446,8.86903276 7.19542921,8.85697729 7.19309586,8.84535931 L6.89008147,6.40436419 L4.56198613,7.85931128 C4.55809723,7.86174183 4.55401414,7.86356472 4.55002765,7.86565527 L4.4267279,8.85890328 C4.42563415,8.86777476 4.4254154,8.87662225 4.42563415,8.88542073 L4.18228964,8.88542073 C4.08158984,8.88542073 4,8.96701557 4,9.06771036 C4,9.16841016 4.08159484,9.25 4.18228964,9.25 L7.43923312,9.25 C7.53993292,9.25 7.62152276,9.16840516 7.62152276,9.06771036 C7.62152276,8.96701057 7.53992792,8.88539573 7.43925812,8.88539573 L7.43923952,8.88541473 Z M6.71009098,3.92707465 L6.58260623,3.92707465 L6.54468981,3.63541023 L5.94039102,3.63541023 C5.92250205,3.63541023 5.90543959,3.62571225 5.88993112,3.61914976 C5.87442265,3.61258727 5.86044868,3.6000698 5.8487332,3.58833032 C5.83113624,3.57073336 5.81453527,3.54659791 5.80935828,3.52127046 C5.80763263,3.51283647 5.80267429,3.50333299 5.80267429,3.49438851 L5.80267429,3.49363501 L5.80267429,3.3518603 C5.80267429,3.34291581 5.80763263,3.33416583 5.80935828,3.32573185 C5.81798676,3.28353743 5.8491462,3.248807 5.88791312,3.23242204 C5.90342009,3.22585955 5.92250005,3.22223806 5.94038802,3.22223806 L6.49458691,3.22223806 L6.46546897,2.98895352 C6.53065884,2.96117258 6.57634875,2.89654371 6.57634875,2.82119886 C6.57634875,2.72540905 6.5024339,2.64704921 6.40856908,2.63963922 C6.32826424,2.40892968 6.10812968,2.25 5.85422019,2.25 L5.76730537,2.25 C5.51363087,2.25 5.29371131,2.40861968 5.21320647,2.63888922 L5.20311949,2.63888922 C5.1024197,2.63888922 5.02082986,2.72048406 5.02082986,2.82117886 C5.02082986,2.90520369 5.07772974,2.97573855 5.15504459,2.99685851 L5.03895982,3.92705665 L4.88715013,3.92705665 C4.78645033,3.92705665 4.70486049,4.00865148 4.70486049,4.10934628 C4.70486049,4.16223618 4.72751344,4.20972608 4.76351037,4.24302601 L6.83370623,4.24302601 C6.86967816,4.20972758 6.89235612,4.16223618 6.89235612,4.10934628 C6.89235612,4.00864648 6.81073628,3.92705665 6.71006648,3.92705665 L6.71009098,3.92707465 Z M9.11998616,2.89287671 C9.07869124,2.85819278 9.02614135,2.84363381 8.97308145,2.85306429 L6.73798592,3.2492935 C6.6509461,3.26472747 6.58799622,3.34036832 6.58799622,3.42878814 C6.58799622,3.51720797 6.6517011,3.59284781 6.73874092,3.60828278 L8.97498645,4.00451199 C8.98558343,4.00638349 8.99627791,4.00730714 9.00685089,4.00730714 C9.0493368,4.00730714 9.08689073,3.99245667 9.11994566,3.96469972 C9.16126508,3.93006429 9.18110054,3.87892489 9.18110054,3.825015 L9.18110054,3.03256658 C9.18110054,2.97865669 9.16134008,2.92751679 9.11999566,2.89288186 L9.11998616,2.89287671 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/lottery-m.svg b/data/styles/default/dark/symbols/lottery-m.svg
index da2dff1c2..484d5fb59 100644
--- a/data/styles/default/dark/symbols/lottery-m.svg
+++ b/data/styles/default/dark/symbols/lottery-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
+ <circle cx="12" cy="12" r="11" fill="#802D19"/>
  <path d="m12 3.9193a3.9424 3.9424 0 0 0-3.9423 3.9423 3.9424 3.9424 0 0 0 1.0463 2.6652c-0.34982-0.10167-0.71931-0.1574-1.1019-0.1574-2.1773 0-3.9423 1.7652-3.9423 3.9425 0 2.1773 1.765 3.9423 3.9423 3.9423 1.4688 0 2.7491-0.80382 3.4274-1.995-0.0032 0.06694-0.0081 0.13356-0.01438 0.19963-0.0067 0.07098-0.01495 0.14145-0.0249 0.21135-0.0099 0.0699-0.02167 0.13932-0.03479 0.20805-0.02623 0.13745-0.05862 0.27247-0.09701 0.40471-0.0384 0.13224-0.08277 0.26157-0.13265 0.38788-0.04987 0.12631-0.10528 0.24956-0.16598 0.36924-0.0607 0.11968-0.12664 0.23579-0.19749 0.34812-0.0635 0.10069-0.13227 0.19727-0.20342 0.29153-0.0082 0.0109-0.01527 0.02288-0.02357 0.03365-0.08033 0.10429-0.16523 0.20442-0.2544 0.29994-0.08918 0.09553-0.18263 0.18649-0.27998 0.27256-0.08994 0.07952-0.18393 0.15369-0.28031 0.22455l-3.29e-4 0.0019 5e-4 0.0013c-0.0038 0.0038-0.0086 0.0063-0.01235 0.01007-0.01477 0.01477-0.02801 0.03099-0.03973 0.04835-0.01172 0.01737-0.02173 0.03594-0.03003 0.05544-0.0082 0.01952-0.01477 0.03999-0.01913 0.06121-0.0044 0.02123-0.0066 0.04328-0.0066 0.06583 0 0.02256 0.0026 0.04461 0.0066 0.06583 0.0044 0.02123 0.0109 0.0417 0.01913 0.06121 0.0082 0.01952 0.01831 0.03808 0.03003 0.05544s0.02503 0.03358 0.03973 0.04835c0.01477 0.01477 0.03098 0.02801 0.04835 0.03973 0.01736 0.01172 0.03593 0.02193 0.05545 0.03022 0.01952 0.0082 0.03999 0.01464 0.06121 0.01895 0.02123 0.0044 0.04328 0.0066 0.06583 0.0066h4.1217c0.02256 0 0.04461-0.0026 0.06583-0.0066 0.02123-0.0044 0.0417-0.01071 0.06121-0.01895 0.01952-0.0082 0.03809-0.01844 0.05544-0.03022 0.01736-0.01172 0.03358-0.02496 0.04835-0.03973 0.01477-0.01476 0.0282-0.03098 0.03993-0.04835 0.01172-0.01737 0.02173-0.03593 0.03003-0.05544 0.0082-0.01952 0.01464-0.03999 0.01895-0.06121 0.0044-0.02123 0.0066-0.04328 0.0066-0.06583 0-0.02256-0.0026-0.04461-0.0066-0.06583-0.0044-0.02123-0.01071-0.0417-0.01895-0.06121-0.0082-0.01952-0.01831-0.03808-0.03003-0.05544s-0.02515-0.03358-0.03993-0.04835c-0.0038-0.0038-0.0083-0.0065-0.01223-0.01007l5.07e-4 -0.0013v-0.0019c-0.09648-0.07092-0.19076-0.14511-0.2808-0.22471-0.09735-0.08606-0.1908-0.17703-0.27998-0.27255-0.04771-0.05113-0.09088-0.10686-0.13612-0.16053-0.03928-0.04664-0.08094-0.09093-0.11829-0.13942-0.08034-0.10428-0.15601-0.21285-0.22686-0.32518-0.07085-0.11234-0.13679-0.22844-0.19749-0.34812-0.06071-0.11968-0.1161-0.24293-0.16597-0.36924-0.04987-0.12631-0.09426-0.25564-0.13265-0.38788-0.03841-0.13224-0.07092-0.26726-0.09718-0.40472-0.01311-0.06872-0.02465-0.13814-0.03466-0.20804-0.0099-0.0699-0.01838-0.14036-0.02509-0.21135-0.0063-0.06602-0.01084-0.13259-0.01419-0.19947 0.67831 1.1911 1.9587 1.9948 3.4274 1.9948 2.1773 0 3.9423-1.765 3.9423-3.9423s-1.765-3.9425-3.9423-3.9425c-0.38269 0-0.75224 0.0557-1.1021 0.1574a3.9424 3.9424 0 0 0 1.0465-2.6652 3.9424 3.9424 0 0 0-3.9425-3.9423z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/marina-m.svg b/data/styles/default/dark/symbols/marina-m.svg
index 16ae7f5bf..a32e0ff4e 100644
--- a/data/styles/default/dark/symbols/marina-m.svg
+++ b/data/styles/default/dark/symbols/marina-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>marina-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="viewpoint-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
-   <path id="Shape" d="m5.5116 12.152 5.7601-8.2584v8.2584h-5.7601m6.8401 0c0.97201-2.7 0.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9h-6.0913m6.1921 2.5776c-0.2952 0.4608-0.64081 0.8568-1.044 1.1952-0.46801-0.2088-0.88561-0.5328-1.2168-0.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-0.36 0.36-0.75601 0.684-1.224 0.8928-0.82081-0.6768-1.44-1.6416-1.656-2.6928h14.357c-0.1152 0.54-0.3168 1.0368-0.60481 1.4976m-0.1008 4.2624c-0.76321 0-1.4832-0.18-2.16-0.54-1.3248 0.72-2.988 0.72-4.3129 0-1.3248 0.72-2.988 0.72-4.2985 0-0.88561 0.4968-1.9008 0.576-2.88 0.54v-1.44c1.0152 0.036 1.9944-0.072 2.88-0.72 1.2528 0.9 3.0312 0.9 4.2985 0 1.2744 0.9 3.0456 0.9 4.3129 0 0.87121 0.648 1.8576 0.756 2.8656 0.72v1.44z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0a6074" r="11"/><path d="m5.5116 12.152 5.7601-8.2584v8.2584zm6.8401 0c.97201-2.7.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9zm6.1921 2.5776c-.2952.4608-.64081.8568-1.044 1.1952-.46801-.2088-.88561-.5328-1.2168-.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-.36.36-.75601.684-1.224.8928-.82081-.6768-1.44-1.6416-1.656-2.6928h14.357c-.1152.54-.3168 1.0368-.60481 1.4976m-.1008 4.2624c-.76321 0-1.4832-.18-2.16-.54-1.3248.72-2.988.72-4.3129 0-1.3248.72-2.988.72-4.2985 0-.88561.4968-1.9008.576-2.88.54v-1.44c1.0152.036 1.9944-.072 2.88-.72 1.2528.9 3.0312.9 4.2985 0 1.2744.9 3.0456.9 4.3129 0 .87121.648 1.8576.756 2.8656.72v1.44z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/martial-arts-centre-m.svg b/data/styles/default/dark/symbols/martial-arts-centre-m.svg
new file mode 100644
index 000000000..5638e2633
--- /dev/null
+++ b/data/styles/default/dark/symbols/martial-arts-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9.5655 9.65716667-.24605 4.94833333c-.00911111.1458111-.06606667.2688361-.17086667.369075-.1048.1002444-.24833055.1503667-.43059166.1503667-.14580556 0-.27110834-.0501223-.37590834-.1503667s-.16175555-.2232694-.17086666-.369075l-.24605-4.4015833-1.736-.99783337-.191375.71081667.83383333 1.4626667c.07290556.1275833.08885278.2642777.04784167.4100833-.04100556.1458056-.1253.2551611-.25288334.3280667-.12758333.0729055-.26427777.0911305-.41008333.054675-.14580556-.03645-.25516111-.1184667-.32806667-.24605l-.95683333-1.654c-.03645-.0637889-.05923333-.1321361-.06835-.2050417-.00911111-.07290556-.00455556-.14580833.01366667-.21870833l.58779166-2.13241667 3.144-1.80433333-1.12091666-1.12091667c-.10024445-.10024444-.15264445-.22554722-.1572-.37590833-.00455556-.15036667.04784444-.28022778.1572-.38958334.10024444-.10024444.22782777-.15036666.38275-.15036666.15492222 0 .28250555.05012222.38275.15036666l1.62666666 1.613c.12758337.12758334.17998337.280225.15719997.457925-.0227833.17770556-.11163608.31212223-.2665583.40325l-1.35325.77915834.65613333.57411666 4.10083337-3.349c.1002444-.09112777.2209916-.12985833.3622416-.11619166.14125.01366944.2665528.08429444.3759084.211875.0820166.10024444.1207472.21415555.1161916.34173333-.0045555.12758333-.0524.24149722-.1435333.34174167zm-4.10083333-2.73391667c-.30072778 0-.55816945-.10707778-.772325-.32123333-.21415556-.21415556-.32123334-.47159723-.32123334-.772325 0-.30072778.10707778-.55816945.32123334-.772325.21415555-.21415556.47159722-.32123334.772325-.32123334.30072777 0 .55816944.10707778.772325.32123334.21415555.21415555.32123333.47159722.32123333.772325 0 .30072777-.10707778.55816944-.32123333.772325-.21415556.21415555-.47159723.32123333-.772325.32123333z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/martial-arts-m.svg b/data/styles/default/dark/symbols/martial-arts-m.svg
index d3fa2c23d..82ee40571 100644
--- a/data/styles/default/dark/symbols/martial-arts-m.svg
+++ b/data/styles/default/dark/symbols/martial-arts-m.svg
@@ -1,4 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m9.4386 9.1886-0.29526 5.938q-0.0164 0.26246-0.20504 0.44289-0.18864 0.18044-0.51671 0.18044-0.26245 0-0.45109-0.18044-0.18864-0.18044-0.20504-0.44289l-0.29526-5.2819-2.0832-1.1974-0.22965 0.85298 1.0006 1.7552q0.13123 0.22965 0.05741 0.4921-0.07381 0.26245-0.30346 0.39368-0.22965 0.13123-0.4921 0.06561-0.26245-0.06561-0.39368-0.29526l-1.1482-1.9848q-0.06561-0.11482-0.08202-0.24605-0.0164-0.13123 0.0164-0.26245l0.70535-2.5589 3.7728-2.1652-1.3451-1.3451q-0.18044-0.18044-0.18864-0.45109-0.0082-0.27066 0.18864-0.4675 0.18044-0.18044 0.4593-0.18044t0.4593 0.18044l1.952 1.9356q0.22965 0.22965 0.18864 0.54951-0.04101 0.31987-0.31987 0.4839l-1.6239 0.93499 0.78736 0.68894 4.921-4.0188q0.18044-0.16403 0.43469-0.13943 0.25425 0.024605 0.45109 0.25425 0.14763 0.18044 0.13943 0.41008-0.0082 0.22965-0.17224 0.41009zm-4.921-3.2807q-0.54131 0-0.92679-0.38548-0.38548-0.38548-0.38548-0.92679t0.38548-0.92679q0.38548-0.38548 0.92679-0.38548t0.92679 0.38548q0.38548 0.38548 0.38548 0.92679t-0.38548 0.92679q-0.38548 0.38548-0.92679 0.38548z" fill="#777777"/>
-</svg>
+
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.4386 9.1886-.29526 5.938c-.01093333.1749733-.07928.3226033-.20504.44289-.12576.1202933-.29799667.18044-.51671.18044-.17496667 0-.32533-.0601467-.45109-.18044s-.19410667-.2679233-.20504-.44289l-.29526-5.2819-2.0832-1.1974-.22965.85298 1.0006 1.7552c.08748667.1531.10662333.3171333.05741.4921-.04920667.1749667-.15036.3061933-.30346.39368s-.31713333.1093567-.4921.06561c-.17496667-.04374-.30619333-.14216-.39368-.29526l-1.1482-1.9848c-.04374-.07654667-.07108-.15856333-.08202-.24605-.01093333-.08748667-.00546667-.17497.0164-.26245l.70535-2.5589 3.7728-2.1652-1.3451-1.3451c-.12029333-.12029333-.18317333-.27065667-.18864-.45109-.00546667-.18044.05741333-.33627333.18864-.4675.12029333-.12029333.27339333-.18044.4593-.18044s.33900667.06014667.4593.18044l1.952 1.9356c.1531.1531.21598.33627.18864.54951-.02734.21324667-.13396333.37454667-.31987.4839l-1.6239.93499.78736.68894 4.921-4.0188c.1202933-.10935333.26519-.15583.43469-.13943.1695.01640333.3198633.10115333.45109.25425.09842.12029333.1448967.25698667.13943.41008-.0054667.1531-.06288.28979667-.17224.41009zm-4.921-3.2807c-.36087333 0-.66980333-.12849333-.92679-.38548s-.38548-.56591667-.38548-.92679.12849333-.66980333.38548-.92679.56591667-.38548.92679-.38548.66980333.12849333.92679.38548.38548.56591667.38548.92679-.12849333.66980333-.38548.92679-.56591667.38548-.92679.38548z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/metal_construction-m.svg b/data/styles/default/dark/symbols/metal_construction-m.svg
index 47978b225..568672056 100644
--- a/data/styles/default/dark/symbols/metal_construction-m.svg
+++ b/data/styles/default/dark/symbols/metal_construction-m.svg
@@ -1,13 +1,4 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>metal_construction_night-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="metal_construction_night-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
-<path
-         id="path1575"
-         style="fill:#000000;stroke-width:1.08707"
-         d="m 4.839,8.1229597 0.018198,2.1276653 2.6206275,-0.03546 0.018198,6.400728 H 4.8571988 l 0.036398,2.021282 7.2977192,-0.01772 -0.01819,-2.056744 -2.6752237,-0.03546 0.0182,-6.418459 2.5842307,0.01773 -0.01819,-1.9503598 z m 0.8086105,7.9060383 h 1.2096387 v -0.764781 z m 4.5554485,-5.253167 2.406409,0.05015 3.899154,-2.4698664 0.0386,4.0370404 1.132428,0.02508 -5.263215,3.610768 h -2.264852 z m 8.30018,1.868071 0.05148,1.25374 -5.623533,4.3254 -0.09008,-1.855535 z m -5.700745,-4.6639092 0.09008,1.9056827 5.662139,-3.422707 -0.02574,-1.3289634 z M 6.0765185,7.5201211 12.646286,7.5733131 17.559963,4.949192 12.664486,4.896 Z" />
-  </g>
- </g>
-</svg>
\ No newline at end of file
+
+
+
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m4.8393016 8.1229641.018198 2.1276649 2.6206275-.03546.018198 6.400728h-2.6388247l.036398 2.021282 7.2977196-.01772-.01819-2.056744-2.6752241-.03546.0182-6.418459 2.5842311.01773-.01819-1.9503594zm.8086105 7.9060379h1.2096387v-.764781zm4.5554489-5.253167 2.406409.05015 3.899154-2.469866.0386 4.03704 1.132428.02508-5.263215 3.610768h-2.264852zm8.30018 1.868071.05148 1.25374-5.623533 4.3254-.09008-1.855535zm-5.700745-4.6639088.09008 1.9056827 5.662139-3.422707-.02574-1.3289634zm-6.7259759-.4598717 6.5697679.0531916 4.913677-2.6241211-4.895477-.0531916z" fill="#000" stroke-width="1.08707"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/mine-m.svg b/data/styles/default/dark/symbols/mine-m.svg
index 0d8e6427d..2c92fc5cd 100644
--- a/data/styles/default/dark/symbols/mine-m.svg
+++ b/data/styles/default/dark/symbols/mine-m.svg
@@ -1,11 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<title>mine-m</title>
-	<g fill="none" fill-rule="evenodd">
-		<g id="lighthouse-m" fill-rule="nonzero">
-			<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-			<circle cx="12" cy="12" r="11" fill="#51585E"/>
-			<path d="m5.7595 17.085 1.3497 1.3666 4.9051-4.8838 4.8909 4.9205 1.4221-1.4347-4.9323-4.9148 2.5567-2.5098 2.5256 2.6017 0.36018-3.7884-0.85764-0.87215 0.2239-0.23261-1.3817-1.3775-0.26713 0.28171-1.6405-1.6448-2.129 2.1178 1.6472 1.6551-2.3981 2.4121-2.2711-2.2099 1.8381-1.8308-2.0878-2.0729-1.8191 1.8128-0.19464-0.2148-1.4079 1.4073 0.19381 0.20055-1.7855 1.7692 2.1041 2.0949 1.8021-1.806 2.2164 2.2599z" fill="#000" fill-rule="evenodd"/>
-		</g>
-	</g>
-</svg>
+
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m5.7595 17.085 1.3497 1.3666 4.9051-4.8838 4.8909 4.9205 1.4221-1.4347-4.9323-4.9148 2.5567-2.5098 2.5256 2.6017.36018-3.7884-.85764-.87215.2239-.23261-1.3817-1.3775-.26713.28171-1.6405-1.6448-2.129 2.1178 1.6472 1.6551-2.3981 2.4121-2.2711-2.2099 1.8381-1.8308-2.0878-2.0729-1.8191 1.8128-.19464-.2148-1.4079 1.4073.19381.20055-1.7855 1.7692 2.1041 2.0949 1.8021-1.806 2.2164 2.2599z" fill="#000" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/motorcycle_rental-m.svg b/data/styles/default/dark/symbols/motorcycle_rental-m.svg
index 46596c0bd..0f5f565d8 100644
--- a/data/styles/default/dark/symbols/motorcycle_rental-m.svg
+++ b/data/styles/default/dark/symbols/motorcycle_rental-m.svg
@@ -1,11 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>motorcycle_rental-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="car_sharing-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path transform="translate(2,2)" d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#000"/>
-   <path transform="translate(0,2)" d="m16.667 11.5c-0.105 0-0.21 0.0175-0.30917 0.029167l-1.2017-1.1958h0.9275c0.32083 0 0.58333-0.2625 0.58333-0.58333v-0.22167c0-0.43167-0.455-0.7175-0.84583-0.51917l-1.33 0.665-1.4992-1.4992c-0.105-0.11083-0.25667-0.175-0.40833-0.175h-1.75c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.2658c0.1575 0 0.30333 0.064167 0.41417 0.16917l0.9975 0.9975h-1.9542c-0.093333 0-0.18083 0.023333-0.2625 0.064167l-1.8317 0.91583c-0.22167 0.11083-0.49583 0.07-0.67083-0.11083l-0.7-0.7c-0.11083-0.105-0.2625-0.16917-0.41417-0.16917h-2.0942c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.75c-1.47 0-2.6192 1.3533-2.2692 2.8817 0.1925 0.84583 0.875 1.5283 1.7208 1.7208 1.5283 0.35 2.8817-0.79917 2.8817-2.2692l0.8225 0.8225c0.22167 0.22167 0.51917 0.34417 0.82833 0.34417h0.58917c0.42 0 0.805-0.22167 1.015-0.58917l1.6975-2.9692 0.58917 0.58917c-0.65917 0.53083-1.0267 1.4058-0.805 2.3625 0.19833 0.84 0.88083 1.5225 1.7208 1.715 1.5225 0.34417 2.8758-0.81083 2.8758-2.275 0-1.2892-1.0442-2.3333-2.3333-2.3333zm-9.3333 3.5c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667zm9.3333 0c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#6B425C" r="11"/><g fill="#000"><path d="m9.0974 3.7509c-.324-.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h.77142v-1.5429zm-2.1831 1.5429c-.42429 0-.77143-.34714-.77143-.77143s.34714-.77143.77143-.77143.77143.34714.77143.77143-.34714.77143-.77143.77143z" transform="translate(2 2)"/><path d="m16.667 11.5c-.105 0-.21.0175-.30917.029167l-1.2017-1.1958h.9275c.32083 0 .58333-.2625.58333-.58333v-.22167c0-.43167-.455-.7175-.84583-.51917l-1.33.665-1.4992-1.4992c-.105-.11083-.25667-.175-.40833-.175h-1.75c-.32083 0-.58333.2625-.58333.58333s.2625.58333.58333.58333h1.2658c.1575 0 .30333.064167.41417.16917l.9975.9975h-1.9542c-.093333 0-.18083.023333-.2625.064167l-1.8317.91583c-.22167.11083-.49583.07-.67083-.11083l-.7-.7c-.11083-.105-.2625-.16917-.41417-.16917h-2.0942c-.32083 0-.58333.2625-.58333.58333s.2625.58333.58333.58333h1.75c-1.47 0-2.6192 1.3533-2.2692 2.8817.1925.84583.875 1.5283 1.7208 1.7208 1.5283.35 2.8817-.79917 2.8817-2.2692l.8225.8225c.22167.22167.51917.34417.82833.34417h.58917c.42 0 .805-.22167 1.015-.58917l1.6975-2.9692.58917.58917c-.65917.53083-1.0267 1.4058-.805 2.3625.19833.84.88083 1.5225 1.7208 1.715 1.5225.34417 2.8758-.81083 2.8758-2.275 0-1.2892-1.0442-2.3333-2.3333-2.3333zm-9.3333 3.5c-.64167 0-1.1667-.525-1.1667-1.1667 0-.64167.525-1.1667 1.1667-1.1667.64167 0 1.1667.525 1.1667 1.1667 0 .64167-.525 1.1667-1.1667 1.1667zm9.3333 0c-.64167 0-1.1667-.525-1.1667-1.1667 0-.64167.525-1.1667 1.1667-1.1667.64167 0 1.1667.525 1.1667 1.1667 0 .64167-.525 1.1667-1.1667 1.1667z" transform="translate(0 2)"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/motorcycle_repair-m.svg b/data/styles/default/dark/symbols/motorcycle_repair-m.svg
index 5023229de..4ce3006e1 100644
--- a/data/styles/default/dark/symbols/motorcycle_repair-m.svg
+++ b/data/styles/default/dark/symbols/motorcycle_repair-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<path d="m12 24c6.6274 0 12-5.3726 12-12 0-6.6274-5.3726-12-12-12-6.6274 0-12 5.3726-12 12 0 6.6274 5.3726 12 12 12z" fill="#000" opacity=".6"/>
-	<path d="m12 23c6.0751 0 11-4.9249 11-11s-4.9248-11-11-11c-6.0751 0-11 4.9248-11 11s4.9248 11 11 11z" fill="#51585E"/>
-	<path d="m5.0001 16.197c0 0.46421 0.38683 0.85108 0.85105 0.85108h5.1664v1.7278c0 0.47284 0.38686 0.85108 0.85108 0.85108h0.0086c0.47273 0 0.85108-0.38686 0.85108-0.85108v-1.7278h5.1664c0.47284 0 0.85108-0.38686 0.85108-0.85108 0-0.47285-0.38686-0.85108-0.85108-0.85108h-12.044c-0.46421-0.0085-0.85115 0.37823-0.85115 0.85108z" fill="#000"/>
-	<path d="m17.445 9.0834c-0.1225 0-0.245 0.020417-0.36073 0.034066l-1.402-1.3951h1.0821c0.37426 0 0.68051-0.30625 0.68051-0.68055v-0.25861c0-0.50361-0.53083-0.83708-0.98676-0.60569l-1.5517 0.77583-1.749-1.749c-0.1225-0.1293-0.29948-0.20416-0.47634-0.20416h-2.0416c-0.37438 0-0.68063 0.30625-0.68063 0.68055s0.30625 0.68055 0.68063 0.68055h1.4768c0.18375 0 0.35385 0.074864 0.48311 0.19736l1.1637 1.1637h-2.2799c-0.10885 0-0.21093 0.027218-0.30625 0.074864l-2.1369 1.0684c-0.25861 0.12938-0.57846 0.081666-0.78263-0.12927l-0.81666-0.81666c-0.1293-0.1225-0.30625-0.19736-0.48319-0.19736h-2.4432c-0.3743 0-0.68055 0.30625-0.68055 0.68055 0 0.37431 0.30625 0.68056 0.68055 0.68056h2.0416c-1.715 0-3.0557 1.5788-2.6474 3.362 0.22458 0.98676 1.0208 1.783 2.0076 2.0076 1.783 0.40833 3.362-0.93239 3.362-2.6474l0.95954 0.95957c0.25865 0.25865 0.60573 0.40156 0.96646 0.40156h0.68728c0.49 0 0.93916-0.25865 1.1842-0.68739l1.9804-3.464 0.68739 0.68739c-0.76906 0.61926-1.1978 1.6401-0.93916 2.7562 0.23135 0.97999 1.0276 1.7762 2.0076 2.0008 1.7762 0.40145 3.3551-0.94604 3.3551-2.6541 0-1.5041-1.2179-2.7222-2.7218-2.7222zm-10.889 4.0833c-0.74861 0-1.3611-0.61249-1.3611-1.3611s0.61249-1.3611 1.3611-1.3611c0.74861 0 1.3611 0.61249 1.3611 1.3611s-0.61249 1.3611-1.3611 1.3611zm10.889 0c-0.74864 0-1.3611-0.61249-1.3611-1.3611s0.61249-1.3611 1.3611-1.3611c0.74853 0 1.3611 0.61249 1.3611 1.3611s-0.61249 1.3611-1.3611 1.3611z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12 24c6.6274 0 12-5.3726 12-12s-5.3726-12-12-12-12 5.3726-12 12 5.3726 12 12 12z" fill="#000" opacity=".6"/><path d="m12 23c6.0751 0 11-4.9249 11-11s-4.9248-11-11-11c-6.0751 0-11 4.9248-11 11s4.9248 11 11 11z" fill="#574469"/><g fill="#000"><path d="m5.0001 16.197c0 .46421.38683.85108.85105.85108h5.1664v1.7278c0 .47284.38686.85108.85108.85108h.0086c.47273 0 .85108-.38686.85108-.85108v-1.7278h5.1664c.47284 0 .85108-.38686.85108-.85108 0-.47285-.38686-.85108-.85108-.85108h-12.044c-.46421-.0085-.85115.37823-.85115.85108z"/><path d="m17.445 9.0834c-.1225 0-.245.020417-.36073.034066l-1.402-1.3951h1.0821c.37426 0 .68051-.30625.68051-.68055v-.25861c0-.50361-.53083-.83708-.98676-.60569l-1.5517.77583-1.749-1.749c-.1225-.1293-.29948-.20416-.47634-.20416h-2.0416c-.37438 0-.68063.30625-.68063.68055s.30625.68055.68063.68055h1.4768c.18375 0 .35385.074864.48311.19736l1.1637 1.1637h-2.2799c-.10885 0-.21093.027218-.30625.074864l-2.1369 1.0684c-.25861.12938-.57846.081666-.78263-.12927l-.81666-.81666c-.1293-.1225-.30625-.19736-.48319-.19736h-2.4432c-.3743 0-.68055.30625-.68055.68055 0 .37431.30625.68056.68055.68056h2.0416c-1.715 0-3.0557 1.5788-2.6474 3.362.22458.98676 1.0208 1.783 2.0076 2.0076 1.783.40833 3.362-.93239 3.362-2.6474l.95954.95957c.25865.25865.60573.40156.96646.40156h.68728c.49 0 .93916-.25865 1.1842-.68739l1.9804-3.464.68739.68739c-.76906.61926-1.1978 1.6401-.93916 2.7562.23135.97999 1.0276 1.7762 2.0076 2.0008 1.7762.40145 3.3551-.94604 3.3551-2.6541 0-1.5041-1.2179-2.7222-2.7218-2.7222zm-10.889 4.0833c-.74861 0-1.3611-.61249-1.3611-1.3611s.61249-1.3611 1.3611-1.3611 1.3611.61249 1.3611 1.3611-.61249 1.3611-1.3611 1.3611zm10.889 0c-.74864 0-1.3611-.61249-1.3611-1.3611s.61249-1.3611 1.3611-1.3611c.74853 0 1.3611.61249 1.3611 1.3611s-.61249 1.3611-1.3611 1.3611z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/nightclub-m.svg b/data/styles/default/dark/symbols/nightclub-m.svg
index 065fa810e..81d4eb709 100644
--- a/data/styles/default/dark/symbols/nightclub-m.svg
+++ b/data/styles/default/dark/symbols/nightclub-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#8c491c" r="8.25"/><path d="m11.8 8.518c.0617112 0 .1146065.01985612.1586859.05956835.0440793.03971222.2038672.97184647.2743942 1.27410065.070527.3022543.1636448.5499041.2793531.7429497.1157084.1930456.2688843.3469304.4595278.4616546l.132783.0699267.0986353.0465112.0789111.0314669c.0615155.0232237.1264461.0448281.1947915.0648132l.2238421.0569944 1.0072826.1846799.1923409.0428297c.0291714.0081023.0478877.0151042.0533334.0206917.0440794.0452279.0661191.0998322.0661191.163813s-.0220397.1185851-.0661191.163813c-.0440793.0452277-.9576249.1831174-1.2529569.2482013-.2953319.0650841-.5383196.1549882-.728963.2697124-.1906435.1147242-.3438194.268609-.4595278.4616546-.1157083.1930456-.2088261.4401439-.2793531.741295l-.216668 1.0726977-.0276905.1164364c-.0125115.0477421-.0228227.0782877-.0300357.0849666-.0440794.0408153-.0969747.061223-.1586859.061223s-.1146065-.0204077-.1586859-.061223c-.0154277-.0142854-.0430049-.1218793-.0747939-.2671616l-.1698467-.8431262c-.0286516-.1334771-.0603337-.2568885-.0950462-.3702338l-.0790958-.2276618-.0341331-.0821763c-.0815469-.1864269-.1845826-.3419664-.3091068-.4666187-.1245243-.1246524-.2793531-.2266907-.4644867-.3061151-.1388501-.0595684-.2993956-.112001-.48163622-.1572978l-.28539402-.0618097-.75750468-.1446149-.14015877-.0318776c-.05841402-.0146936-.09704961-.027225-.1056451-.0362705-.0429774-.0452279-.06446611-.0998322-.06446611-.163813s.02148871-.1185851.06446611-.163813c.01025599-.0107929.07021398-.0268628.15956703-.0459609l1.0933898-.2022404c.29423006-.0650841.53666676-.1549882.72731016-.2697124.1906433-.1147242.3443702-.268609.4611806-.4616546.0876079-.1447842.1621985-.3202832.2237719-.5264973l.0725048-.28501663.1940886-.97156492.0313246-.13525024c.0141601-.05571735.0257991-.09159359.0337105-.09872126.0440794-.03971223.0969747-.05956835.1586859-.05956835zm-5.00462261 4.1774895.47578827.0502628.32995434.0263277.57765236.0353901.42056496.0137938-.00064825 1.2530304-.16598532-.0165074-.1645867-.02175c-.27180754-.0405405-.53655878-.1026839-.79245105-.1846276l-.13594638-.0456834c-.13201893-.0464711-.26153181-.0982596-.38828151-.1551086-.05706076-.3091628-.10909042-.6279724-.15606072-.9551278zm3.49355501.0862286c.1073473.0519869.1949753.1131628.264923.1831825.0618318.0618953.1173885.137901.1663487.2292948l.0642181.1378745.0826828.2351502.0434237.1588536.1812332-.0754564c-.1267497.056849-.2562626.1086375-.3882815.1551086l-.1359464.0456834c-.2558923.0819437-.5206435.1440871-.79245105.1846276l-.1645867.02175-.16598532.0165074-.00064825-1.2530304.42056496-.0137938zm-5.00088081-.332281.31700206.0629752.32130216.0574943.07527007.5222404c-.16415505-.1216118-.32044126-.2530919-.46817922-.3934614zm1.25234286-2.3854766-.01697434-.34550972.56871797.06276939.29474017.02592572.53415795.03577645.2744038.01183766.40389732.01321523-.00257387 1.23477077c-.17012988.0386431-.19321523.0571874-.28575534.1545723-.12479698.1313318-.19100811.2995791-.19100811.4806817 0 .0517111.00539819.102374.01601703.1514287l.01894297.0712113-.04497194-.0011864c-.48606707-.0241334-.96155343-.0673328-1.42417187-.1280071-.06359528-.570574-.11240648-1.1616257-.14542174-1.767486zm-2.5707958-.69764234-.00799865-.15848097.46374374.12249833.41101876.09679424.24281734.05218007.22562016.04425017.36954891.06866044.02373455.51387826c.01222804.2214825.02660821.4410595.04343401.6582534l.036665.4701329.04404763.460615c-.43865499-.0810959-.86350016-.1782458-1.27238702-.2899773-.10948174-.2053937-.20519192-.4191686-.28579411-.6404323l-.06331389-.1835808-.06717924-.2269141-.06067814-.2491812-.04914876-.25960746-.03519936-.25913167zm6.93780455.41902344-.0435191.16937316c-.0459687.15259784-.1054641.29258034-.1715302.40176384-.0782682.1293494-.1784172.2296012-.3048028.3056568-.1442767.0868219-.3407964.1596984-.58947913.2147073l-.35419197.0644373-.00001732-1.07330477.40297732-.01321523.2753238-.01183766.5341579-.03577645zm3.1741968-.57750441-.0079986.15848097-.018931.21995701-.0351993.25913167-.0491488.25960746-.0606781.2491812-.0809808.269015-.0495124.1414799-.038871.0974696-.1829972-.0492608-.1125232-.0390742-.0709962-.028395-.0728261-.0352927-.1146348-.0608747c-.1030276-.0628713-.2022409-.1625438-.2793153-.2911331-.0711197-.1186548-.1343991-.2728503-.1877866-.46229722l-.0381539-.14869032c-.012555-.05380655-.0212612-.09377636-.0431441-.2042991l.3261176-.06353303.2428173-.05218007.5259029-.12581591zm-7.28117308-2.40395665.13461308.01487946.39744.03496.24288.01656.54924.02944.47493399.01497029.00032842 2.10921677-.53957507-.01892302c-.17831449-.00871986-.35519164-.01983347-.53051982-.0332675l-.52167519-.04676486c-.17226584-.01787207-.34289623-.03794812-.5117882-.06013977-.00435954-.22540378-.0065633-.4522648-.0065633-.68031422l.00277917-.46781769.0876671-.4291617c.02794853-.11865082.06308659-.22301518.10250723-.30715276l.04074051-.0771753c.02248072-.03750638.0479442-.07038807.07699208-.0993097zm4.72425258-.02941621.0159851.46112683c.0077652.28686039.0120325.57628165.0127014.86770067-.080686.02886662-.1545689.07361469-.2199504.13251862-.0881687.07943374-.1112525.11559931-.1425074.2210899l-.0483816.1862026-.0567095.27651916-.5723846.05209443c-.1753282.01343403-.3522053.02454764-.53051984.0332675l-.53957507.01892302.00032842-2.10921677.52260038-.01606292.50065361-.02834737.28704-.02024.35328-.03128zm-6.97901686-.11570986.10355214.03947298c.08015358.03438683.14163992.07490877.1877002.12101639.046864.04691216.08871186.11008448.12478199.19254552.03365107.07693077.06497708.17098108.09324131.28170049l.05346076.24683831.09570721.47458652.04627058.18632233c.03550682.1168579.05251858.1580878.14374396.24255801.07388246.06841152.16066865.11663579.25460449.14292813l.00149308.14387643c-.57487732-.1049053-1.12513955-.23550947-1.64582865-.38855571.01267636-.09367422.02791354-.18652609.04594577-.27859161l.06295029-.28368844.0606941-.21859728.09766013-.29160654.08264473-.2079964c.05800053-.13747718.12189933-.27185044.19137791-.40280913zm8.84346166-.1932224.0775512.13669953.1122356.21683356.1153184.25526206.0724763.18402824c.0548994.1461051.1028152.2952883.1438276.44732159l.0539911.21970783.02834.13806738c.0180322.09206552.0332694.18491739.0459458.27859161-.4960013.14578974-1.0188378.27121508-1.5642239.37346086l-.0477158-.19531555-.0320787-.10666729.0021392-.2290242-.0027468-.44656856-.0132578-.62223621-.0164124-.45637084c.2542508-.0406285.50447-.08576709.7502813-.1352276zm-7.5691243-2.91553207c.04407939 0 .08186174.01418293.11334702.04254882.03148528.02836588.14561944.69417608.1959959.91007194.05037645.21589585.11688911.39278862.19953798.53067831.06198666.10341727.13902721.19110034.23112167.26304921l.09711242.06670414c.13300702.08004015.30168403.14316663.50603101.18937944l.81638618.15228738.07769741.02049449c.00801839.00289399.01332321.00549992.01554249.00777702.03148528.03230559.04722792.07130866.04722792.11700925s-.01574264.08470366-.04722792.11700925l-.01259247.00667763-.06331562.01761927-.04691248.01036164c-.20603454.04343851-.61368275.10770621-.77214864.1426282l-.19848847.05239808c-.12401704.03887177-.23141684.08562293-.32219941.14025351-.13617386.08194587-.24558521.19186366-.32823409.32975335-.08264887.13788969-.14916153.31438849-.19953798.5294964l-.15917287.78582349-.02998674.11158676c-.00257778.00653053-.00486846.01083958-.00683629.01266169-.03148528.02915382-.06926763.04373073-.11334702.04373073s-.08186174-.01457691-.11334702-.04373073c-.01626472-.01506033-.05143407-.1753102-.08727858-.35301225l-.08746475-.44005044c-.04093088-.19068175-.09052019-.35260363-.14876797-.48576567-.03883185-.0887747-.08448551-.1677439-.13696098-.23690762l-.0067007-.00729329c-.02330635-.03160272-.04947581-.06141669-.07712887-.08909817-.08894593-.08903734-.19953799-.1619219-.33177619-.21865365-.13223819-.05673176-.292026-.10440218-.47936343-.1430113l-.57263861-.10909598c-.11406652-.02338893-.20101387-.04425706-.21252567-.05637165-.03069815-.03230559-.04604723-.07130866-.04604723-.11700925s.01534908-.08470366.04604723-.11700925c.03069814-.03230558.68480493-.13079822.8949692-.17728674s.38333334-.11070572.51950718-.19265159c.13617386-.08194587.24597878-.19186366.32941479-.32975335.083436-.13788969.15034223-.31478246.20071868-.53067831l.15917287-.7862667.02998674-.11128206c.00257778-.00648743.00486846-.01075031.00683629-.01252318.03148528-.02836589.06926763-.04254882.11334702-.04254882zm2.7795338.4324.00009383 2.0882231-.05870365-.00083563c.02575159-.06928968.03907602-.14337386.03907602-.21978747 0-.16521861-.06229099-.31954728-.17780332-.43806911l-.1502689-.10162334c-.03858982-.0240003-.05019941-.02594162-.07728846-.03047136l-.09483071-.02405418-.83230998-.15554992c-.14237115-.03253732-.26583671-.07874366-.3532017-.13131763-.07139836-.04296567-.12684721-.09867116-.17086209-.1721047-.01879766-.03136162-.03693848-.06724833-.05426963-.10763859l.01701588-.15466645c.58102387-.30245446 1.22782776-.49556123 1.91335271-.55210472zm.8441324 0c.6855249.05654349 1.3323288.24965026 1.9133527.55210472l.0140922.12223349.0326014.33528103c.0294402.30772863.0546499.62070304.0754731.93817871-.1745971.02091352-.3510641.03967558-.529278.05620888l-.4947812.03981501-.51346142.02865882-.42580856.01418019-.07228405.00156225zm2.821421 1.15795117c.2098075.17522662.4052152.36711759.5841888.57363866l-.1724141.03398644-.3591565.06281833-.037849-.50098153z" fill="#000" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#802D19" r="8.25"/><path d="m11.8 8.518c.0617112 0 .1146065.01985612.1586859.05956835.0440793.03971222.2038672.97184647.2743942 1.27410065.070527.3022543.1636448.5499041.2793531.7429497.1157084.1930456.2688843.3469304.4595278.4616546l.132783.0699267.0986353.0465112.0789111.0314669c.0615155.0232237.1264461.0448281.1947915.0648132l.2238421.0569944 1.0072826.1846799.1923409.0428297c.0291714.0081023.0478877.0151042.0533334.0206917.0440794.0452279.0661191.0998322.0661191.163813s-.0220397.1185851-.0661191.163813c-.0440793.0452277-.9576249.1831174-1.2529569.2482013-.2953319.0650841-.5383196.1549882-.728963.2697124-.1906435.1147242-.3438194.268609-.4595278.4616546-.1157083.1930456-.2088261.4401439-.2793531.741295l-.216668 1.0726977-.0276905.1164364c-.0125115.0477421-.0228227.0782877-.0300357.0849666-.0440794.0408153-.0969747.061223-.1586859.061223s-.1146065-.0204077-.1586859-.061223c-.0154277-.0142854-.0430049-.1218793-.0747939-.2671616l-.1698467-.8431262c-.0286516-.1334771-.0603337-.2568885-.0950462-.3702338l-.0790958-.2276618-.0341331-.0821763c-.0815469-.1864269-.1845826-.3419664-.3091068-.4666187-.1245243-.1246524-.2793531-.2266907-.4644867-.3061151-.1388501-.0595684-.2993956-.112001-.48163622-.1572978l-.28539402-.0618097-.75750468-.1446149-.14015877-.0318776c-.05841402-.0146936-.09704961-.027225-.1056451-.0362705-.0429774-.0452279-.06446611-.0998322-.06446611-.163813s.02148871-.1185851.06446611-.163813c.01025599-.0107929.07021398-.0268628.15956703-.0459609l1.0933898-.2022404c.29423006-.0650841.53666676-.1549882.72731016-.2697124.1906433-.1147242.3443702-.268609.4611806-.4616546.0876079-.1447842.1621985-.3202832.2237719-.5264973l.0725048-.28501663.1940886-.97156492.0313246-.13525024c.0141601-.05571735.0257991-.09159359.0337105-.09872126.0440794-.03971223.0969747-.05956835.1586859-.05956835zm-5.00462261 4.1774895.47578827.0502628.32995434.0263277.57765236.0353901.42056496.0137938-.00064825 1.2530304-.16598532-.0165074-.1645867-.02175c-.27180754-.0405405-.53655878-.1026839-.79245105-.1846276l-.13594638-.0456834c-.13201893-.0464711-.26153181-.0982596-.38828151-.1551086-.05706076-.3091628-.10909042-.6279724-.15606072-.9551278zm3.49355501.0862286c.1073473.0519869.1949753.1131628.264923.1831825.0618318.0618953.1173885.137901.1663487.2292948l.0642181.1378745.0826828.2351502.0434237.1588536.1812332-.0754564c-.1267497.056849-.2562626.1086375-.3882815.1551086l-.1359464.0456834c-.2558923.0819437-.5206435.1440871-.79245105.1846276l-.1645867.02175-.16598532.0165074-.00064825-1.2530304.42056496-.0137938zm-5.00088081-.332281.31700206.0629752.32130216.0574943.07527007.5222404c-.16415505-.1216118-.32044126-.2530919-.46817922-.3934614zm1.25234286-2.3854766-.01697434-.34550972.56871797.06276939.29474017.02592572.53415795.03577645.2744038.01183766.40389732.01321523-.00257387 1.23477077c-.17012988.0386431-.19321523.0571874-.28575534.1545723-.12479698.1313318-.19100811.2995791-.19100811.4806817 0 .0517111.00539819.102374.01601703.1514287l.01894297.0712113-.04497194-.0011864c-.48606707-.0241334-.96155343-.0673328-1.42417187-.1280071-.06359528-.570574-.11240648-1.1616257-.14542174-1.767486zm-2.5707958-.69764234-.00799865-.15848097.46374374.12249833.41101876.09679424.24281734.05218007.22562016.04425017.36954891.06866044.02373455.51387826c.01222804.2214825.02660821.4410595.04343401.6582534l.036665.4701329.04404763.460615c-.43865499-.0810959-.86350016-.1782458-1.27238702-.2899773-.10948174-.2053937-.20519192-.4191686-.28579411-.6404323l-.06331389-.1835808-.06717924-.2269141-.06067814-.2491812-.04914876-.25960746-.03519936-.25913167zm6.93780455.41902344-.0435191.16937316c-.0459687.15259784-.1054641.29258034-.1715302.40176384-.0782682.1293494-.1784172.2296012-.3048028.3056568-.1442767.0868219-.3407964.1596984-.58947913.2147073l-.35419197.0644373-.00001732-1.07330477.40297732-.01321523.2753238-.01183766.5341579-.03577645zm3.1741968-.57750441-.0079986.15848097-.018931.21995701-.0351993.25913167-.0491488.25960746-.0606781.2491812-.0809808.269015-.0495124.1414799-.038871.0974696-.1829972-.0492608-.1125232-.0390742-.0709962-.028395-.0728261-.0352927-.1146348-.0608747c-.1030276-.0628713-.2022409-.1625438-.2793153-.2911331-.0711197-.1186548-.1343991-.2728503-.1877866-.46229722l-.0381539-.14869032c-.012555-.05380655-.0212612-.09377636-.0431441-.2042991l.3261176-.06353303.2428173-.05218007.5259029-.12581591zm-7.28117308-2.40395665.13461308.01487946.39744.03496.24288.01656.54924.02944.47493399.01497029.00032842 2.10921677-.53957507-.01892302c-.17831449-.00871986-.35519164-.01983347-.53051982-.0332675l-.52167519-.04676486c-.17226584-.01787207-.34289623-.03794812-.5117882-.06013977-.00435954-.22540378-.0065633-.4522648-.0065633-.68031422l.00277917-.46781769.0876671-.4291617c.02794853-.11865082.06308659-.22301518.10250723-.30715276l.04074051-.0771753c.02248072-.03750638.0479442-.07038807.07699208-.0993097zm4.72425258-.02941621.0159851.46112683c.0077652.28686039.0120325.57628165.0127014.86770067-.080686.02886662-.1545689.07361469-.2199504.13251862-.0881687.07943374-.1112525.11559931-.1425074.2210899l-.0483816.1862026-.0567095.27651916-.5723846.05209443c-.1753282.01343403-.3522053.02454764-.53051984.0332675l-.53957507.01892302.00032842-2.10921677.52260038-.01606292.50065361-.02834737.28704-.02024.35328-.03128zm-6.97901686-.11570986.10355214.03947298c.08015358.03438683.14163992.07490877.1877002.12101639.046864.04691216.08871186.11008448.12478199.19254552.03365107.07693077.06497708.17098108.09324131.28170049l.05346076.24683831.09570721.47458652.04627058.18632233c.03550682.1168579.05251858.1580878.14374396.24255801.07388246.06841152.16066865.11663579.25460449.14292813l.00149308.14387643c-.57487732-.1049053-1.12513955-.23550947-1.64582865-.38855571.01267636-.09367422.02791354-.18652609.04594577-.27859161l.06295029-.28368844.0606941-.21859728.09766013-.29160654.08264473-.2079964c.05800053-.13747718.12189933-.27185044.19137791-.40280913zm8.84346166-.1932224.0775512.13669953.1122356.21683356.1153184.25526206.0724763.18402824c.0548994.1461051.1028152.2952883.1438276.44732159l.0539911.21970783.02834.13806738c.0180322.09206552.0332694.18491739.0459458.27859161-.4960013.14578974-1.0188378.27121508-1.5642239.37346086l-.0477158-.19531555-.0320787-.10666729.0021392-.2290242-.0027468-.44656856-.0132578-.62223621-.0164124-.45637084c.2542508-.0406285.50447-.08576709.7502813-.1352276zm-7.5691243-2.91553207c.04407939 0 .08186174.01418293.11334702.04254882.03148528.02836588.14561944.69417608.1959959.91007194.05037645.21589585.11688911.39278862.19953798.53067831.06198666.10341727.13902721.19110034.23112167.26304921l.09711242.06670414c.13300702.08004015.30168403.14316663.50603101.18937944l.81638618.15228738.07769741.02049449c.00801839.00289399.01332321.00549992.01554249.00777702.03148528.03230559.04722792.07130866.04722792.11700925s-.01574264.08470366-.04722792.11700925l-.01259247.00667763-.06331562.01761927-.04691248.01036164c-.20603454.04343851-.61368275.10770621-.77214864.1426282l-.19848847.05239808c-.12401704.03887177-.23141684.08562293-.32219941.14025351-.13617386.08194587-.24558521.19186366-.32823409.32975335-.08264887.13788969-.14916153.31438849-.19953798.5294964l-.15917287.78582349-.02998674.11158676c-.00257778.00653053-.00486846.01083958-.00683629.01266169-.03148528.02915382-.06926763.04373073-.11334702.04373073s-.08186174-.01457691-.11334702-.04373073c-.01626472-.01506033-.05143407-.1753102-.08727858-.35301225l-.08746475-.44005044c-.04093088-.19068175-.09052019-.35260363-.14876797-.48576567-.03883185-.0887747-.08448551-.1677439-.13696098-.23690762l-.0067007-.00729329c-.02330635-.03160272-.04947581-.06141669-.07712887-.08909817-.08894593-.08903734-.19953799-.1619219-.33177619-.21865365-.13223819-.05673176-.292026-.10440218-.47936343-.1430113l-.57263861-.10909598c-.11406652-.02338893-.20101387-.04425706-.21252567-.05637165-.03069815-.03230559-.04604723-.07130866-.04604723-.11700925s.01534908-.08470366.04604723-.11700925c.03069814-.03230558.68480493-.13079822.8949692-.17728674s.38333334-.11070572.51950718-.19265159c.13617386-.08194587.24597878-.19186366.32941479-.32975335.083436-.13788969.15034223-.31478246.20071868-.53067831l.15917287-.7862667.02998674-.11128206c.00257778-.00648743.00486846-.01075031.00683629-.01252318.03148528-.02836589.06926763-.04254882.11334702-.04254882zm2.7795338.4324.00009383 2.0882231-.05870365-.00083563c.02575159-.06928968.03907602-.14337386.03907602-.21978747 0-.16521861-.06229099-.31954728-.17780332-.43806911l-.1502689-.10162334c-.03858982-.0240003-.05019941-.02594162-.07728846-.03047136l-.09483071-.02405418-.83230998-.15554992c-.14237115-.03253732-.26583671-.07874366-.3532017-.13131763-.07139836-.04296567-.12684721-.09867116-.17086209-.1721047-.01879766-.03136162-.03693848-.06724833-.05426963-.10763859l.01701588-.15466645c.58102387-.30245446 1.22782776-.49556123 1.91335271-.55210472zm.8441324 0c.6855249.05654349 1.3323288.24965026 1.9133527.55210472l.0140922.12223349.0326014.33528103c.0294402.30772863.0546499.62070304.0754731.93817871-.1745971.02091352-.3510641.03967558-.529278.05620888l-.4947812.03981501-.51346142.02865882-.42580856.01418019-.07228405.00156225zm2.821421 1.15795117c.2098075.17522662.4052152.36711759.5841888.57363866l-.1724141.03398644-.3591565.06281833-.037849-.50098153z" fill="#000" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/office-m.svg b/data/styles/default/dark/symbols/office-m.svg
index c0d5677c8..fd0fe3a6f 100644
--- a/data/styles/default/dark/symbols/office-m.svg
+++ b/data/styles/default/dark/symbols/office-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>office-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="office-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m10.6 15.1v-0.7h-4.893l-7e-3 2.8c0 0.777 0.623 1.4 1.4 1.4h9.8c0.777 0 1.4-0.623 1.4-1.4v-2.8h-4.9v0.7h-2.8zm7-6.3h-2.807v-1.4l-1.4-1.4h-2.8l-1.4 1.4v1.4h-2.793c-0.77 0-1.4 0.63-1.4 1.4v2.1c0 0.777 0.623 1.4 1.4 1.4h4.2v-1.4h2.8v1.4h4.2c0.77 0 1.4-0.63 1.4-1.4v-2.1c0-0.77-0.63-1.4-1.4-1.4zm-4.2 0h-2.8v-1.4h2.8v1.4z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m10.6 15.1v-.7h-4.893l-.007 2.8c0 .777.623 1.4 1.4 1.4h9.8c.777 0 1.4-.623 1.4-1.4v-2.8h-4.9v.7zm7-6.3h-2.807v-1.4l-1.4-1.4h-2.8l-1.4 1.4v1.4h-2.793c-.77 0-1.4.63-1.4 1.4v2.1c0 .777.623 1.4 1.4 1.4h4.2v-1.4h2.8v1.4h4.2c.77 0 1.4-.63 1.4-1.4v-2.1c0-.77-.63-1.4-1.4-1.4zm-4.2 0h-2.8v-1.4h2.8z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/padel-centre-m.svg b/data/styles/default/dark/symbols/padel-centre-m.svg
new file mode 100644
index 000000000..a89c7e6a9
--- /dev/null
+++ b/data/styles/default/dark/symbols/padel-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m12.1089277 10.5336112c.521633 0 1.048361.1994517 1.4472483.598339.7977827.8029017.7977827 2.0967139 0 2.8944965-.3989194.3988873-.9256153.598331-1.4472483.598331-.5216329 0-1.0483609-.1994437-1.4472482-.598331-.79778266-.8029017-.79778266-2.0967138 0-2.8944965.3989194-.3988953.9256233-.598339 1.4472482-.598339zm0 1.0227736c-.2710386 0-.531855.1073964-.7210686.2966099-.3988873.3989195-.3988873 1.048361 0 1.4472483.1892136.1943326.45003.301729.7210686.301729.2710387 0 .5318471-.1073964.7210687-.2966099.3988873-.3989195.3988873-1.048361 0-1.4472483-.1892136-.1943326-.45003-.301729-.7210687-.301729zm-.8425715-8.59132855c.4046751.23565.65825.43743125 1.13125.9003125.5621063.5498875.864125.9383125 1.1015625 1.4163125.4595251.925125.3888375 1.757-.2195312 2.5834375-.1523813.20700625-.7885.825-1.0906875 1.059625-.5552188.4310625-1.02975.7163125-1.547.929875-.2022333.0835-.601484.20919255-.76053265.24197105l-.04752985.0076727c-.02126765.00175-.51725882.1379279-1.17267603.3215513l-2.00613647.565205-2.0993125 2.1588125-1.288375-1.2444375 2.15155-2.1941438.79060625-3.1985c.18311875-.948.746-1.936125 1.6633125-2.9198125.51601875-.55334375.804625-.7653125 1.268125-.931375.6829375-.2446875 1.34674995-.1499 2.12537495.30349375zm-1.2611125 4.8816-.49832495.50816875.50816875.49831875.498325-.50816875zm-1.01631245-.996625-.498325.50816875.50816875.49831875.498325-.50816875zm2.01287495-.01975-.4983249.50816875.5081749.498325.4983188-.508175zm-3.02918745-.976875-.498325.50816875.50816875.49831875.498325-.50816875zm2.012875-.01975-.498325.508175.50816875.49831875.498325-.508175zm2.01287495-.01975-.498325.50816875.5081688.49831875.498325-.50816875zm-3.02918745-.976875-.498325.50816875.508175.498325.49831875-.508175zm2.01287495-.01975-.4983187.50816875.5081687.49831875.4983188-.50816875zm-1.01631245-.996625-.498325.50816875.50816875.49831875.498325-.50816875z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/padel-m.svg b/data/styles/default/dark/symbols/padel-m.svg
index d1acf5bf6..b7e98ca68 100644
--- a/data/styles/default/dark/symbols/padel-m.svg
+++ b/data/styles/default/dark/symbols/padel-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd"><g id="tennis-m" fill-rule="nonzero"><g id="Group" transform="translate(5 5)" fill="#777777"><g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)"><path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909s-0.66182-0.13364-0.89727-0.37546c-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z"/></g></g></g></g><path d="m6.2703 13.138 0.60389-2.4108c0.33214-1.3259 0.62962-2.544 0.66108-2.7068 0.29299-1.5168 1.1936-3.0978 2.6613-4.6717 0.82563-0.88535 1.2874-1.2245 2.029-1.4902 1.0927-0.3915 2.1548-0.23984 3.4006 0.48559 0.64748 0.37704 1.0532 0.69989 1.81 1.4405 0.89937 0.87982 1.3826 1.5013 1.7625 2.2661 0.73524 1.4802 0.62214 2.8112-0.35125 4.1335-0.24381 0.33121-1.2616 1.32-1.7451 1.6954-0.88835 0.6897-1.6476 1.1461-2.4752 1.4878-0.36402 0.1503-1.127 0.38604-1.2929 0.39943-0.04132 0.0034-1.2026 0.32394-2.5806 0.71244l-2.5055 0.70637-3.3589 3.4541-2.0614-1.9911zm4.5003-4.9687 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81308 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79731 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731z" stroke-width=".037959" fill="#777777"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12.7307133 10.8403335c.6259596 0 1.2580331.239342 1.7366979.7180067.9573392.9634821.9573392 2.5160567 0 3.4733959-.4787033.4786647-1.1107383.7179971-1.7366979.7179971s-1.2580331-.2393324-1.7366979-.7179971c-.9573392-.9634821-.9573392-2.5160567 0-3.4733959.4787033-.4786744 1.110748-.7180067 1.7366979-.7180067zm0 1.2273282c-.3252463 0-.6382261.1288757-.8652823.3559319-.4786648.4787034-.4786648 1.2580332 0 1.736698.2270562.2331991.540036.3620748.8652823.3620748s.6382165-.1288757.8652823-.3559319c.4786648-.4787034.4786648-1.2580332 0-1.7366979-.2270562-.2331992-.540036-.3620749-.8652823-.3620749zm-1.0110858-10.3095942c.48561.28278.7899.5249175 1.3575 1.080375.6745275.659865 1.03695 1.125975 1.321875 1.699575.55143 1.11015.466605 2.1084-.2634375 3.100125-.1828575.2484075-.9462.99-1.308825 1.27155-.6662625.517275-1.2357.859575-1.8564 1.11585-.24268.1002-.7217807.2510311-.9126392.2903653l-.0570358.0092072c-.02552118.0021-.62071059.1655134-1.40721124.3858616l-2.40736376.6782459-2.519175 2.590575-1.54605-1.493325 2.58186-2.6329725.9487275-3.8382c.2197425-1.1376.8952-2.32335 1.995975-3.503775.6192225-.6640125.96555-.918375 1.52175-1.11765.819525-.293625 1.6161-.17988 2.55045.3641925zm-1.513335 5.85792-.59799.6098025.6098025.5979825.59799-.6098025zm-1.219575-1.19595-.59799.6098025.6098025.5979825.59799-.6098025zm2.41545-.0237-.59799.6098025.60981.59799.5979825-.60981zm-3.635025-1.17225-.59799.6098025.6098025.5979825.59799-.6098025zm2.41545-.0237-.59799.60981.6098025.5979825.59799-.60981zm2.41545-.0237-.59799.6098025.6098025.5979825.59799-.6098025zm-3.635025-1.17225-.59799.6098025.60981.59799.5979825-.60981zm2.41545-.0237-.5979825.6098025.6098025.5979825.5979825-.6098025zm-1.219575-1.19595-.59799.6098025.6098025.5979825.59799-.6098025z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/painter-m.svg b/data/styles/default/dark/symbols/painter-m.svg
index d51e9bfac..842199f75 100644
--- a/data/styles/default/dark/symbols/painter-m.svg
+++ b/data/styles/default/dark/symbols/painter-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m9.0946 5.5957c-0.80117 0-1.4527 0.65155-1.4527 1.4527v2.1791c0 0.80118 0.65155 1.4527 1.4527 1.4527h7.99c0.80117 0 1.4527-0.65155 1.4527-1.4527v-2.1791c0-0.80117-0.65155-1.4527-1.4527-1.4527zm-2.1791 2.1791c-0.80117 0-1.4527 0.65155-1.4527 1.4527v2.9054c0 0.80117 0.65155 1.4527 1.4527 1.4527h5.0845v1.4527a0.72636 0.72636 0 0 0-0.72636 0.72636v3.6318a0.72636 0.72636 0 0 0 0.72636 0.72636h1.4527a0.72636 0.72636 0 0 0 0.72636-0.72636v-3.6318a0.72636 0.72636 0 0 0-0.72636-0.72636v-1.4527c0-0.80117-0.65155-1.4527-1.4527-1.4527h-5.0845z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m9.0946 5.5957c-.80117 0-1.4527.65155-1.4527 1.4527v2.1791c0 .80118.65155 1.4527 1.4527 1.4527h7.99c.80117 0 1.4527-.65155 1.4527-1.4527v-2.1791c0-.80117-.65155-1.4527-1.4527-1.4527zm-2.1791 2.1791c-.80117 0-1.4527.65155-1.4527 1.4527v2.9054c0 .80117.65155 1.4527 1.4527 1.4527h5.0845v1.4527a.72636.72636 0 0 0 -.72636.72636v3.6318a.72636.72636 0 0 0 .72636.72636h1.4527a.72636.72636 0 0 0 .72636-.72636v-3.6318a.72636.72636 0 0 0 -.72636-.72636v-1.4527c0-.80117-.65155-1.4527-1.4527-1.4527h-5.0845z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/pelota-centre-m.svg b/data/styles/default/dark/symbols/pelota-centre-m.svg
new file mode 100644
index 000000000..221fd00db
--- /dev/null
+++ b/data/styles/default/dark/symbols/pelota-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m12.10875 10.6335c.521625 0 1.0483625.19945 1.44725.5983375.7978125.802875.7978125 2.0966875 0 2.8945-.3989375.3988875-.9256188.5983313-1.44725.5983313-.521625 0-1.0483625-.1994438-1.44725-.5983313-.7978125-.802875-.7978125-2.0966875 0-2.8945.3989375-.3988937.925625-.5983375 1.44725-.5983375zm0 1.02275c-.2710313 0-.53185.1074-.7210625.2966125-.3988875.3989375-.3988875 1.0483625 0 1.44725.1892062.1943375.450025.3017313.7210625.3017313.2710312 0 .5318437-.1074.7210625-.2966125.3988875-.3989375.3988875-1.0483625 0-1.44725-.1892063-.1943375-.450025-.3017313-.7210625-.3017313zm-.2535063-8.4869375c.5505375.06848125.982875.2741125 1.3443125.6394375.3389876.3425875.5382188.748125.6165375 1.2550625.0343813.222525-.0061249.8413125-.0704625 1.0760625-.0999562.36484375-.2602.70875-.4780999 1.026125-.2139102.31152734-.580419.66636035-.918501.89624396l-.1595798.09969081-1.5522653.78145744-2.40296645 1.20473279-.16541789.1043584c-.17336181.1213663-.3694.3054568-.90054643.8456634l-1.44370912 1.4766121-.1335868.1329907c-.38429022.3778415-.41836907.3598582-.60861476.3873754-.09461875.0136875-.1795375.0152813-.2255125.0041875-.1701875-.0409375-.2436375-.09385-.573925-.4134562l-.19923502-.1956808c-.28349303-.2848507-.48703203-.5286772-.46432748-.7043817.03037875-.2350625.1843375-.4040125.4649125-.43425.2152875-.0232.47521875.2341812.5115375.2132437l.03441897-.0295208c.0272336-.0252157.06893801-.0655452.12256916-.1184281l.41442469-.4167798 1.10610286-1.1423534c.54960129-.57663754.64085389-.70256736.78010932-.9596054l.17830882-.37164261c.07554033-.16110971.16699345-.35819262.25995368-.56060739l.24378255-.5458316c.3759961-.85513889.62866537-1.48150173 1.18121745-2.5409809.18959375-.35155.61019375-.8380625.9335625-1.07975.30475625-.2278375.67699995-.41494375 1.06449995-.53501875.2434438-.07544375.7936875-.1256625 1.0405-.09495625z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/pelota-m.svg b/data/styles/default/dark/symbols/pelota-m.svg
index 95304b85d..716386ed4 100644
--- a/data/styles/default/dark/symbols/pelota-m.svg
+++ b/data/styles/default/dark/symbols/pelota-m.svg
@@ -1,4 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m16.974 16.09c0.43366 0 0.85097 0.17183 1.1537 0.48277 0.63822 0.63822 0.63822 1.6773 0 2.3156-0.30275 0.30274-0.72005 0.47458-1.1537 0.47458-0.43366 0-0.85097-0.17183-1.1537-0.48277-0.63822-0.63822-0.63822-1.6773 0-2.3156 0.30274-0.30274 0.72005-0.47458 1.1537-0.47458m0-1.6364c-0.8346 0-1.6773 0.31911-2.3156 0.95734-1.2765 1.2765-1.2765 3.3466 0 4.6312 0.63822 0.63822 1.481 0.95733 2.3156 0.95733 0.83461 0 1.6773-0.31911 2.3156-0.95733 1.2765-1.2765 1.2765-3.3466 0-4.6312-0.63822-0.63822-1.481-0.95734-2.3156-0.95734z" fill="#777777" stroke-width="1.2858"/>
-<path d="m5.2111 18.399c-0.27247-0.0656-0.38999-0.15026-0.91845-0.66163-0.60975-0.59008-1.1061-1.0965-1.0617-1.4401 0.048606-0.3761 0.29494-0.64642 0.74386-0.6948 0.34446-0.03712 0.76035 0.37469 0.81846 0.34119 0.058099-0.0335 0.85197-0.83254 1.7641-1.7756 1.7241-1.7826 1.8834-1.9656 2.1681-2.4911 0.058451-0.10789 0.374-0.7791 0.70122-1.4916 0.84913-1.8684 1.2191-2.9047 2.28-4.9389 0.30335-0.56248 0.97631-1.3409 1.4937-1.7276 0.48761-0.36454 1.0832-0.66391 1.7032-0.85603 0.38951-0.12071 1.2699-0.20106 1.6648-0.15193 0.88086 0.10957 1.5726 0.43858 2.1509 1.0231 0.54238 0.54814 0.86115 1.197 0.98646 2.0081 0.05501 0.35604-0.0098 1.3461-0.11274 1.7217-0.15993 0.58375-0.41632 1.134-0.76496 1.6418-0.39115 0.56965-1.1012 1.2298-1.6978 1.5786-0.10269 0.06003-1.5384 0.78178-3.1905 1.6039-1.6521 0.8221-3.0763 1.5371-3.165 1.5889-0.49322 0.28812-0.66974 0.45388-2.6746 2.5116-2.1813 2.2388-2.0638 2.1364-2.5284 2.2036-0.15139 0.0219-0.28726 0.02445-0.36082 0.0067z" fill="#777777" stroke-width=".030096"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12.7305 10.8402c.62595 0 1.258035.23934 1.7367.718005.957375.96345.957375 2.516025 0 3.4734-.478725.478665-1.1107425.7179975-1.7367.7179975-.62595 0-1.258035-.2393325-1.7367-.7179975-.957375-.96345-.957375-2.516025 0-3.4734.478725-.4786725 1.11075-.718005 1.7367-.718005zm0 1.2273c-.3252375 0-.63822.12888-.865275.355935-.478665.478725-.478665 1.258035 0 1.7367.2270475.233205.54003.3620775.865275.3620775.3252375 0 .6382125-.12888.865275-.355935.478665-.478725.478665-1.258035 0-1.7367-.2270475-.233205-.54003-.3620775-.865275-.3620775zm-.3042075-10.184325c.660645.0821775 1.17945.328935 1.613175.767325.406785.411105.6458625.89775.739845 1.506075.0412575.26703-.00735 1.009575-.084555 1.291275-.1199475.4378125-.31224.8505-.57372 1.23135-.2566922.37383281-.6965027.79963242-1.1022011 1.07549275l-.1914958.11962898-1.8627183.93774893-2.8835598 1.44567934-.19850147.1252301c-.20803417.1456396-.44328.3665481-1.08065571 1.014796l-1.73245095 1.7719346-.16030416.1595889c-.46114826.4534097-.50204288.4318297-.73033771.4648504-.1135425.016425-.215445.0183375-.270615.005025-.204225-.049125-.292365-.11262-.68871-.4961475l-.23908202-.2348169c-.34019164-.3418208-.58443843-.6344126-.55719298-.8452581.0364545-.282075.221205-.484815.557895-.5211.258345-.02784.5702625.2810175.613845.2558925l.04130277-.035425c.03268031-.0302588.08272561-.0786542.14708299-.1421137l.49730963-.5001357 1.32732342-1.37082412c.65952155-.69196504.76902467-.84308083.93613119-1.15152648l.21397059-.44597113c.09064839-.19333166.20039214-.42983114.31194441-.67272887l.29253906-.65499792c.45119531-1.02616666.75439844-1.77780208 1.41746094-3.04917708.2275125-.42186.7322325-1.005675 1.120275-1.2957.3657075-.273405.8124-.4979325 1.2774-.6420225.2921325-.0905325.952425-.150795 1.2486-.1139475z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/petting_zoo-m.svg b/data/styles/default/dark/symbols/petting_zoo-m.svg
index 1c89767bf..b1c284462 100644
--- a/data/styles/default/dark/symbols/petting_zoo-m.svg
+++ b/data/styles/default/dark/symbols/petting_zoo-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#6E4426"/>
-	<path d="m7.0781 5.9961c-0.10394 0-0.22223 0.00669-0.32617 0.013672-0.86615 0.083803-1.3858 0.39146-1.6699 0.62891l-0.20703 0.17383-0.26367-0.13281c-0.18016-0.090787-0.42205-0.12476-0.69922-0.089844-0.27024 0.027934-0.51357 0.097304-0.66602 0.16016-0.083151 0.027934-0.13849 0.097837-0.15234 0.18164-0.013858 0.083803 0.021621 0.16874 0.083984 0.22461 0.048505 0.041902 0.096027 0.075286 0.14453 0.11719 0.15244 0.11872 0.69427 0.50261 1.207 0.65625l0.2832 0.083984 0.068359 0.20312c0.11087 0.33521 0.29938 0.83868 0.54883 1.3555 0.27717 0.57266 0.57509 1.0111 0.87305 1.3184 0.29796 0.30728 0.59569 0.46094 0.88672 0.46094 0.020788-7e-3 0.040643-0.0059 0.068359-0.0059 0.31875-0.027893 0.61081-0.23808 0.86719-0.61519 0.23559-0.3422 0.44307-0.81572 0.60938-1.4023 0.1663-0.57964 0.25618-1.1396 0.30469-1.5098l0.027344-0.22266 0.22266-0.10547c0.45733-0.21649 0.91466-0.68449 1.0879-0.87305 0.05543-0.055869 0.10384-0.11796 0.15234-0.17383 0.05543-0.062852 0.06873-0.15448 0.04102-0.23828-0.027721-0.083803-0.096541-0.13838-0.17969-0.15234-0.22866-0.034918-0.47767-0.050248-0.68555-0.029297-0.32567 0.034918-0.58282 0.13347-0.74219 0.28711l-0.22852 0.22266-0.26367-0.16602c-0.38804-0.24443-0.86596-0.37109-1.3926-0.37109zm5.834 2.0039c-0.38804 0-0.75371 0.12696-1.0586 0.35742l-0.1875 0.13867-0.21484-0.089844c-0.21481-0.090787-0.43628-0.13281-0.67188-0.13281-0.31182 0-0.60974 0.083813-0.87305 0.23047l-0.0625 0.035156c-0.062363 0.034918-0.10528 0.09032-0.11914 0.16016-0.055434 0.29331-0.12495 0.57837-0.20117 0.84375-0.19402 0.67741-0.43465 1.2294-0.71875 1.6484-0.4019 0.58662-0.89469 0.90898-1.4629 0.96484h-0.013672c-0.083151 7e-3 -0.15285 0.05516-0.1875 0.125-0.034646 0.06984-0.034646 0.15365 0 0.23047 0.13858 0.24443 0.34039 0.4616 0.58984 0.61523l0.20703 0.125-0.013672 0.24414v0.07813c0 0.53774 0.27049 1.0317 0.70703 1.332v2.5156c0 0.26538 0.2152 0.48047 0.47852 0.48047 0.26331 0 0.47656-0.21509 0.47656-0.48047v-1.9902c0.21481 0.31426 0.52054 0.54451 0.88086 0.65625v2.4512c0 0.26538 0.2152 0.48242 0.47852 0.48242 0.26331 0 0.47852-0.21704 0.47852-0.48242v-2.3965c0.11087-0.02793 0.22028-0.06161 0.32422-0.10352l0.20898-0.0918 0.1875 0.13281c0.29796 0.20951 0.64359 0.31445 1.0039 0.31445 0.30489 0 0.60192-0.076 0.86524-0.22266l0.20117-0.11328 0.20117 0.11328c0.24252 0.13967 0.52059 0.21567 0.80469 0.22266v1.0469c0 0.26538 0.2152 0.48242 0.47852 0.48242s0.47656-0.21704 0.47656-0.48242v-1.2988c0.13166-0.07682 0.25739-0.17342 0.36133-0.28516l0.11719-0.12695h0.17383c0.04158 0 0.08928 0.0011 0.13086-0.0059v2.8145c0 0.26538 0.2152 0.48242 0.47852 0.48242s0.47852-0.21704 0.47852-0.48242v-3.1914c0.38111-0.30728 0.62305-0.76949 0.62305-1.2793 0-0.28633-0.07607-0.57281-0.22852-0.82422l-0.125-0.20898 0.125-0.20898c0.14551-0.25141 0.22852-0.53789 0.22852-0.82422 0-0.3841-0.13141-0.74072-0.38086-1.041l-0.13867-0.16797 0.02148-0.06836c0.37418 0.29331 0.81658 0.58694 1.0938 0.44727 0.09701-0.04889 0.17982-0.14744 0.24219-0.28711 0.09008-0.23046 0.09027-0.43922-0.01367-0.63476-0.20787-0.38406-0.81001-0.61615-1.3574-0.75582-0.25638-0.60059-0.87223-1.0195-1.5859-1.0195-0.09008 0-0.18815 0.00752-0.28516 0.021484l-0.17969 0.027344-0.13867-0.11719c-0.31182-0.26538-0.71315-0.40625-1.1289-0.40625-0.24945 0-0.49204 0.049543-0.7207 0.1543l-0.16797 0.076172-0.16602-0.076172c-0.22866-0.09777-0.47125-0.1543-0.7207-0.1543z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m7.0781 5.9961c-.10394 0-.22223.00669-.32617.013672-.86615.083803-1.3858.39146-1.6699.62891l-.20703.17383-.26367-.13281c-.18016-.090787-.42205-.12476-.69922-.089844-.27024.027934-.51357.097304-.66602.16016-.083151.027934-.13849.097837-.15234.18164-.013858.083803.021621.16874.083984.22461.048505.041902.096027.075286.14453.11719.15244.11872.69427.50261 1.207.65625l.2832.083984.068359.20312c.11087.33521.29938.83868.54883 1.3555.27717.57266.57509 1.0111.87305 1.3184.29796.30728.59569.46094.88672.46094.020788-.007.040643-.0059.068359-.0059.31875-.027893.61081-.23808.86719-.61519.23559-.3422.44307-.81572.60938-1.4023.1663-.57964.25618-1.1396.30469-1.5098l.027344-.22266.22266-.10547c.45733-.21649.91466-.68449 1.0879-.87305.05543-.055869.10384-.11796.15234-.17383.05543-.062852.06873-.15448.04102-.23828-.027721-.083803-.096541-.13838-.17969-.15234-.22866-.034918-.47767-.050248-.68555-.029297-.32567.034918-.58282.13347-.74219.28711l-.22852.22266-.26367-.16602c-.38804-.24443-.86596-.37109-1.3926-.37109zm5.834 2.0039c-.38804 0-.75371.12696-1.0586.35742l-.1875.13867-.21484-.089844c-.21481-.090787-.43628-.13281-.67188-.13281-.31182 0-.60974.083813-.87305.23047l-.0625.035156c-.062363.034918-.10528.09032-.11914.16016-.055434.29331-.12495.57837-.20117.84375-.19402.67741-.43465 1.2294-.71875 1.6484-.4019.58662-.89469.90898-1.4629.96484h-.013672c-.083151.007-.15285.05516-.1875.125-.034646.06984-.034646.15365 0 .23047.13858.24443.34039.4616.58984.61523l.20703.125-.013672.24414v.07813c0 .53774.27049 1.0317.70703 1.332v2.5156c0 .26538.2152.48047.47852.48047.26331 0 .47656-.21509.47656-.48047v-1.9902c.21481.31426.52054.54451.88086.65625v2.4512c0 .26538.2152.48242.47852.48242.26331 0 .47852-.21704.47852-.48242v-2.3965c.11087-.02793.22028-.06161.32422-.10352l.20898-.0918.1875.13281c.29796.20951.64359.31445 1.0039.31445.30489 0 .60192-.076.86524-.22266l.20117-.11328.20117.11328c.24252.13967.52059.21567.80469.22266v1.0469c0 .26538.2152.48242.47852.48242s.47656-.21704.47656-.48242v-1.2988c.13166-.07682.25739-.17342.36133-.28516l.11719-.12695h.17383c.04158 0 .08928.0011.13086-.0059v2.8145c0 .26538.2152.48242.47852.48242s.47852-.21704.47852-.48242v-3.1914c.38111-.30728.62305-.76949.62305-1.2793 0-.28633-.07607-.57281-.22852-.82422l-.125-.20898.125-.20898c.14551-.25141.22852-.53789.22852-.82422 0-.3841-.13141-.74072-.38086-1.041l-.13867-.16797.02148-.06836c.37418.29331.81658.58694 1.0938.44727.09701-.04889.17982-.14744.24219-.28711.09008-.23046.09027-.43922-.01367-.63476-.20787-.38406-.81001-.61615-1.3574-.75582-.25638-.60059-.87223-1.0195-1.5859-1.0195-.09008 0-.18815.00752-.28516.021484l-.17969.027344-.13867-.11719c-.31182-.26538-.71315-.40625-1.1289-.40625-.24945 0-.49204.049543-.7207.1543l-.16797.076172-.16602-.076172c-.22866-.09777-.47125-.1543-.7207-.1543z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/pitch-m.svg b/data/styles/default/dark/symbols/pitch-m.svg
index 3048de0cc..ee467135f 100644
--- a/data/styles/default/dark/symbols/pitch-m.svg
+++ b/data/styles/default/dark/symbols/pitch-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>pitch-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="pitch-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.595 3c-1.109 0-2.008 0.84822-2.008 1.8947 0 1.0465 0.89899 1.8947 2.008 1.8947 1.109 0 2.008-0.84822 2.008-1.8947 0-1.0465-0.89899-1.8947-2.008-1.8947zm-5.7729 3.7894 0.502 1.8948c0.25099 0.94735 0.85053 0.94735 1.6001 0.94735h1.6628c0.59612 0.94735 0.31592 2.4875 0.502 3.9352h-0.90987c-1.004 0-2.6041 0.94735-1.6001 2.8421l1.506 2.8422c1.004 1.8947 2.5099 0.47368 2.008-0.47368l-1.506-2.8422c-0.25099-0.47368 0.26536-0.47368 0.502-0.47368h2.4778s1.1885 2.3436 2.5884 4.0497c0.51677 0.62972 1.0892 1.4887 1.8057 1.4887 0.50198 0 1.3622-0.73205 0.44668-1.763-1.7145-1.9307-2.8006-3.9212-2.8006-4.8686 0-1.1019-0.20515-3.4225-0.50198-4.7368h1.506c0.48994 0.92658 1.3499 2.3684 1.3499 2.3684 0.55494 0.90706 1.4674 0.83852 1.4674 0 0-0.11492-0.01467-0.36235-0.14013-0.64122l-1.4222-3.1482c-0.09288-0.20548-0.25442-0.47368-1.004-0.47368h-7.7809l-0.75299-2.3685c-0.30119-0.94735-1.757-0.94735-1.757 0 0 0.47368 0.17786 1.0488 0.25099 1.421z" fill="#777777" stroke-width="1.2857"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m11.595 3c-1.109 0-2.008.84822-2.008 1.8947 0 1.0465.89899 1.8947 2.008 1.8947 1.109 0 2.008-.84822 2.008-1.8947 0-1.0465-.89899-1.8947-2.008-1.8947zm-5.7729 3.7894.502 1.8948c.25099.94735.85053.94735 1.6001.94735h1.6628c.59612.94735.31592 2.4875.502 3.9352h-.90987c-1.004 0-2.6041.94735-1.6001 2.8421l1.506 2.8422c1.004 1.8947 2.5099.47368 2.008-.47368l-1.506-2.8422c-.25099-.47368.26536-.47368.502-.47368h2.4778s1.1885 2.3436 2.5884 4.0497c.51677.62972 1.0892 1.4887 1.8057 1.4887.50198 0 1.3622-.73205.44668-1.763-1.7145-1.9307-2.8006-3.9212-2.8006-4.8686 0-1.1019-.20515-3.4225-.50198-4.7368h1.506c.48994.92658 1.3499 2.3684 1.3499 2.3684.55494.90706 1.4674.83852 1.4674 0 0-.11492-.01467-.36235-.14013-.64122l-1.4222-3.1482c-.09288-.20548-.25442-.47368-1.004-.47368h-7.7809l-.75299-2.3685c-.30119-.94735-1.757-.94735-1.757 0 0 .47368.17786 1.0488.25099 1.421z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/plumber-m.svg b/data/styles/default/dark/symbols/plumber-m.svg
index 3b423bd5e..3f87c9276 100644
--- a/data/styles/default/dark/symbols/plumber-m.svg
+++ b/data/styles/default/dark/symbols/plumber-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m9.0215 4.6055h0.17578c0.63524 0 1.1055 0.45379 1.1055 0.99414v6.3984c0 0.54035-0.47022 0.99414-1.1055 0.99414h-0.17578c-0.63524 0-1.1055-0.45379-1.1055-0.99414v-6.3984c0-0.54035 0.47022-0.99414 1.1055-0.99414zm3.0898 9.0918h6.1777c0.63524 0 1.1035 0.45379 1.1035 0.99414v0.39844c0 0.54035-0.46827 0.99414-1.1035 0.99414h-6.1777c-0.63524 0-1.1055-0.45379-1.1055-0.99414v-0.39844c0-0.54035 0.47022-0.99414 1.1055-0.99414zm-6.5117-8.0977v6.4004h1.5098v-6.4004zm5.5098 0v6.3984c0 4e-3 2.7e-5 0.0078 0 0.01172a1.0206 1.0206 0 0 1 0.87305 0.88672c0.04298-0.0028 0.08531-0.0059 0.12891-0.0059h6.1777c0.03767 0 0.07412 0.0038 0.11133 0.0059v-2.3066c0-2.7556-2.2327-4.9902-4.9883-4.9902zm0.89062 11.285v1.5156h6.4004v-1.5156c-0.03721 0.0021-0.07366 0.0059-0.11133 0.0059h-6.1777c-0.03767 0-0.07412-0.0038-0.11133-0.0059z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m9.0215 4.6055h.17578c.63524 0 1.1055.45379 1.1055.99414v6.3984c0 .54035-.47022.99414-1.1055.99414h-.17578c-.63524 0-1.1055-.45379-1.1055-.99414v-6.3984c0-.54035.47022-.99414 1.1055-.99414zm3.0898 9.0918h6.1777c.63524 0 1.1035.45379 1.1035.99414v.39844c0 .54035-.46827.99414-1.1035.99414h-6.1777c-.63524 0-1.1055-.45379-1.1055-.99414v-.39844c0-.54035.47022-.99414 1.1055-.99414zm-6.5117-8.0977v6.4004h1.5098v-6.4004zm5.5098 0v6.3984c0 .004.000027.0078 0 .01172a1.0206 1.0206 0 0 1 .87305.88672c.04298-.0028.08531-.0059.12891-.0059h6.1777c.03767 0 .07412.0038.11133.0059v-2.3066c0-2.7556-2.2327-4.9902-4.9883-4.9902zm.89062 11.285v1.5156h6.4004v-1.5156c-.03721.0021-.07366.0059-.11133.0059h-6.1777c-.03767 0-.07412-.0038-.11133-.0059z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/public_bath-m.svg b/data/styles/default/dark/symbols/public_bath-m.svg
index 8837f78f5..690e50bdd 100644
--- a/data/styles/default/dark/symbols/public_bath-m.svg
+++ b/data/styles/default/dark/symbols/public_bath-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
- <path d="m5.9316 17.09c-0.943 0-1.5048 0.5205-1.9746 0.85156-0.40228 0.28349-0.71292 0.43683-0.85742 0.47852a11 11 0 0 0 1.3828 1.5781c0.23481-0.14128 0.44324-0.29241 0.62695-0.42188 0.48213-0.33976 0.84217-0.48633 0.82227-0.48633-0.019918 0 0.3373 0.14324 0.79883 0.47656 0.46153 0.33332 1.0277 0.85742 1.9707 0.85742 0.943-1.3e-5 1.5045-0.51978 1.9727-0.84766 0.46817-0.32787 0.82081-0.48633 0.91211-0.48633 0.091299 1e-6 0.54727 0.18704 1.0938 0.52148 0.54648 0.33444 1.18 0.81299 2.1211 0.82812 0.94109 0.01509 1.5744-0.47679 2.0664-0.80078 0.49202-0.32399 0.84722-0.48242 0.94922-0.48242 0.10199 2e-6 0.55774 0.1859 1.1074 0.50977 0.18097 0.10663 0.37435 0.22728 0.58398 0.3418a11 11 0 0 0 1.3984-1.5977c-0.18907-0.060699-0.54714-0.21954-0.9668-0.4668-0.54644-0.32196-1.1865-0.7871-2.123-0.78711-0.9365 0-1.5621 0.49068-2.0508 0.8125-0.48873 0.32182-0.83618 0.47226-0.93359 0.4707-0.09733-0.0016-0.55973-0.19682-1.1094-0.5332-0.54964-0.33638-1.1895-0.81639-2.1367-0.81641-0.9472 0-1.5749 0.50889-2.0586 0.84766-0.48373 0.33877-0.84609 0.48633-0.82617 0.48633 0.019902 0-0.3373-0.1452-0.79883-0.47852-0.46152-0.33332-1.0277-0.85546-1.9707-0.85547z" fill="#000"/>
- <path d="m12 3.2847c-1.2926 0-2.3379 1.0475-2.3379 2.3398 2.482e-4 1.2913 1.0456 2.3398 2.3379 2.3398 1.2911 0 2.3379-1.0485 2.3379-2.3398 0-1.2926-1.0468-2.3398-2.3379-2.3398zm-2.584 5.2793c-1.6559 0-3.0098 1.3424-3.0098 2.9961v4.5586c1.066 0.13059 1.6293 0.67608 2.0332 0.97852v-4.8242h0.52148s0.00267 3.0451 0.00391 4.8379c0.49189-0.34641 1.2552-1.0215 2.6211-1.0215 1.3751 1.7e-5 2.1089 0.62555 2.6602 0.96289 0.25145 0.15389 0.45709 0.24341 0.58594 0.30078 0.05212-0.02549 0.11758-0.06272 0.19922-0.10938v-4.9707h0.52734v4.627c0.4514-0.30797 1.0843-0.67658 2.0352-0.73047v-4.6094c0-1.6537-1.3553-2.9961-3.0098-2.9961z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0a6074" r="11"/><g fill="#000"><path d="m5.9316 17.09c-.943 0-1.5048.5205-1.9746.85156-.40228.28349-.71292.43683-.85742.47852a11 11 0 0 0 1.3828 1.5781c.23481-.14128.44324-.29241.62695-.42188.48213-.33976.84217-.48633.82227-.48633-.019918 0 .3373.14324.79883.47656s1.0277.85742 1.9707.85742c.943-.000013 1.5045-.51978 1.9727-.84766.46817-.32787.82081-.48633.91211-.48633.091299.000001.54727.18704 1.0938.52148.54648.33444 1.18.81299 2.1211.82812.94109.01509 1.5744-.47679 2.0664-.80078.49202-.32399.84722-.48242.94922-.48242.10199.000002.55774.1859 1.1074.50977.18097.10663.37435.22728.58398.3418a11 11 0 0 0 1.3984-1.5977c-.18907-.060699-.54714-.21954-.9668-.4668-.54644-.32196-1.1865-.7871-2.123-.78711-.9365 0-1.5621.49068-2.0508.8125-.48873.32182-.83618.47226-.93359.4707-.09733-.0016-.55973-.19682-1.1094-.5332-.54964-.33638-1.1895-.81639-2.1367-.81641-.9472 0-1.5749.50889-2.0586.84766-.48373.33877-.84609.48633-.82617.48633.019902 0-.3373-.1452-.79883-.47852-.46152-.33332-1.0277-.85546-1.9707-.85547z"/><path d="m12 3.2847c-1.2926 0-2.3379 1.0475-2.3379 2.3398.0002482 1.2913 1.0456 2.3398 2.3379 2.3398 1.2911 0 2.3379-1.0485 2.3379-2.3398 0-1.2926-1.0468-2.3398-2.3379-2.3398zm-2.584 5.2793c-1.6559 0-3.0098 1.3424-3.0098 2.9961v4.5586c1.066.13059 1.6293.67608 2.0332.97852v-4.8242h.52148s.00267 3.0451.00391 4.8379c.49189-.34641 1.2552-1.0215 2.6211-1.0215 1.3751.000017 2.1089.62555 2.6602.96289.25145.15389.45709.24341.58594.30078.05212-.02549.11758-.06272.19922-.10938v-4.9707h.52734v4.627c.4514-.30797 1.0843-.67658 2.0352-.73047v-4.6094c0-1.6537-1.3553-2.9961-3.0098-2.9961z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/ranger-station-m.svg b/data/styles/default/dark/symbols/ranger-station-m.svg
index 609a8f99e..4976b0283 100644
--- a/data/styles/default/dark/symbols/ranger-station-m.svg
+++ b/data/styles/default/dark/symbols/ranger-station-m.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m10.636 1.2727-2.1818 1.0909v4.1164l-5.4545 2.9745v6.5455h4.3636v-4.3636h3.2727v4.3636h4.3636v-6.5455l-5.4545-2.9745v-1.3892l1.0909-0.54545 2.1818 1.0909 2.1818-1.0909v-3.2727l-2.1818 1.0909z" fill="#777777"/>
-</svg>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ranger-station-m</title>
+    <g id="ranger-station-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#51585E" cx="9" cy="9" r="8.25"></circle>
+        <polygon id="Path" fill="#000" points="10.1090909 3.30003542 8.56363636 4.07276269 8.56363636 6.98857032 4.7 9.09552538 4.7 13.7319598 7.79090909 13.7319598 7.79090909 10.6410508 10.1090909 10.6410508 10.1090909 13.7319598 13.2 13.7319598 13.2 9.09552538 9.33636364 6.98857032 9.33636364 6.00454545 10.1090909 5.61818182 11.6545455 6.39090909 13.2 5.61818182 13.2 3.3 11.6545455 4.07272727"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/recycling-centre-m.svg b/data/styles/default/dark/symbols/recycling-centre-m.svg
new file mode 100644
index 000000000..4fc50bc0e
--- /dev/null
+++ b/data/styles/default/dark/symbols/recycling-centre-m.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>recycling-centre-m</title>
+    <g id="recycling-centre-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#000" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#51585E" cx="9" cy="9" r="8.25"></circle>
+        <path d="M6.1353,6.5751025 L6.8502975,5.3901025 L7.3653,4.5351025 C7.5603,4.210105 8.0303025,4.210105 8.225325,4.5351025 L8.9653275,5.7651025 L8.3503275,6.7950775 L7.850325,7.6050775 L6.1353,6.5751025 Z M14.11005,9.4851025 L13.310025,8.1551275 L11.58,9.1551025 L12.684975,11.0001025 L13.2499725,11.0001025 C13.629975,11.0001025 13.974975,10.7851 14.1449475,10.4451025 C14.2149472,10.3051 14.2499475,10.1551 14.2499475,10.000105 C14.2499475,9.820105 14.1999472,9.6451075 14.109945,9.4851025 L14.11005,9.4851025 Z M11.250075,13.5000775 L12.000075,13.5000775 C12.3800775,13.5000775 12.7250775,13.285075 12.89505,12.9450775 L13.6200525,11.5000525 L11.2500525,11.5000525 L11.2500525,10.5000775 L9.2500275,12.5001025 L11.2500525,14.5001275 L11.2500525,13.5001525 L11.250075,13.5000775 Z M8.250075,11.5000525 L6.10005,11.5000525 L5.68005,12.2050525 C5.53005,12.45505 5.5200525,12.765055 5.65005,13.0300525 C5.7900525,13.3150525 6.08505,13.500055 6.410025,13.500055 L8.25,13.500055 L8.25,11.50003 L8.250075,11.5000525 Z M6.31005,10.1750275 L7.175025,10.695025 L6.4900275,7.950025 L3.7500525,8.6350225 L4.6000275,9.1450225 L4.39503,9.4900225 C4.2200325,9.78502 4.2050325,10.14502 4.36002975,10.450025 L5.17505475,12.0799975 L6.31002975,10.1749975 L6.31005,10.1750275 Z M11.760075,5.5700275 L11.1100725,4.4850025 C10.92507,4.1850025 10.6000725,4 10.2500475,4 L8.4850725,4 L10.0450725,6.600025 L9.1850475,7.1150275 L11.9300475,7.800025 L12.615045,5.055025 L11.760045,5.5700275 L11.760075,5.5700275 Z" id="Shape" fill="#000"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/sauna-m.svg b/data/styles/default/dark/symbols/sauna-m.svg
new file mode 100644
index 000000000..5e1c71844
--- /dev/null
+++ b/data/styles/default/dark/symbols/sauna-m.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>sauna-m</title>
+    <g id="sauna-m" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16.5980474,5.34246801 C16.7468507,5.43708529 16.7719933,5.65393124 16.6774834,5.80280272 L16.2747841,6.44622828 C15.4418772,7.79759698 14.8650886,8.8728762 14.518396,9.70308327 L14.4417487,9.89404056 C13.9674663,11.3122064 13.6214547,12.6672387 13.4037139,13.9591376 C12.9931409,15.8209689 12.0934828,16.5 10.3526752,16.5 L10.1879901,16.4948917 C9.04399189,16.4237233 8.09238221,15.616254 7.81508138,14.5330987 L7.78256249,14.3870442 L12.4802588,14.3870442 L12.9192453,12.5029487 C13.1641511,11.3203921 13.5393508,10.1424778 14.0572521,8.87121473 C14.3573782,8.1345122 15.0432541,6.98547029 16.109563,5.44151572 C16.2193202,5.28257002 16.4350611,5.23883232 16.5980474,5.34246801 Z M5.52052512,11.0946422 L5.89251109,15.3540235 L5.01400515,15.3540751 C4.53170194,15.3540751 4.12652667,14.9914259 4.07326519,14.5120726 L3.69311107,11.0946938 L5.52052512,11.0946422 Z M7.60194279,11.0946422 L7.60177542,13.912943 L7.1957144,13.9137796 L7.35650537,14.6359521 C7.4148855,14.8641548 7.49764583,15.0812718 7.60163715,15.2846499 L7.60194279,15.3540235 L6.5579211,15.3540235 L6.1849886,11.0946422 L7.60194279,11.0946422 Z M9.90674134,11.0946422 L9.65952986,13.912943 L8.30220701,13.912943 L8.30237438,11.0946422 L9.90674134,11.0946422 Z M12.2118737,11.0946938 L11.8980714,13.912943 L10.3249399,13.912943 L10.5712048,11.0946422 L12.2118737,11.0946938 Z M12.4497844,9.08805194 C12.5543351,9.08805194 12.6390902,9.17280705 12.6390902,9.27735777 L12.5214752,10.5724082 C12.512564,10.6698739 12.4308278,10.744478 12.3329557,10.744478 L3.57291984,10.744478 C3.47504765,10.744478 3.39331144,10.6698739 3.3844003,10.5724082 L3.26757155,9.29459385 C3.25805233,9.19047738 3.33473855,9.09835745 3.43885502,9.08883823 L12.4497844,9.08805194 Z M5.14759262,6.83620746 L5.31323523,8.72831929 L3.42997595,8.72837085 L3.33707583,7.88636833 C3.27934735,7.366812 3.65373279,6.89883019 4.17328912,6.84110171 L4.22547235,6.8367609 L5.14759262,6.83620746 Z M7.60194279,6.83620746 L7.60194279,8.72831929 L5.97769871,8.72831929 L5.81300264,6.83620746 L7.60194279,6.83620746 Z M10.2796738,6.83526093 L10.1140312,8.72831929 L8.30237438,8.72831929 L8.30237438,6.83526093 L10.2796738,6.83526093 Z M11.6280597,6.83531249 C12.1508133,6.83531249 12.5745889,7.25908804 12.5745889,7.78184167 L12.5731405,7.8341851 L12.4750088,8.72837085 L10.7784947,8.72831929 L10.9441373,6.83526093 L11.6280597,6.83531249 Z M6.69454404,1.80746008 C6.60290187,1.56267538 6.330174,1.43852882 6.0853893,1.53017098 C5.84060459,1.62181315 5.71645803,1.89454102 5.80810019,2.13932572 C5.92294379,2.44608361 5.96706035,2.7016911 5.94828971,2.90437832 C5.94335237,2.95769221 5.93639298,2.98485172 5.91058649,3.03015079 L5.84699221,3.13085102 C5.70484418,3.35222019 5.62953523,3.54741847 5.60223122,3.85013034 C5.56191484,4.29710675 5.63999563,4.70140842 5.84168281,5.04999312 C5.9725813,5.27623067 6.26209725,5.35351824 6.4883348,5.22261975 C6.68943483,5.10626554 6.77284601,4.86458394 6.69696491,4.65341954 L6.66096142,4.57596776 C6.56186855,4.40470125 6.52145614,4.19544613 6.54493341,3.93516019 C6.5548191,3.82556028 6.57021312,3.76886418 6.60935807,3.69858229 L6.67301707,3.59662085 C6.80227388,3.39646347 6.86800347,3.23766893 6.89078591,2.99166183 C6.92401615,2.63283825 6.85598891,2.23869429 6.69454404,1.80746008 Z M8.40199548,1.80746008 C8.31035332,1.56267538 8.03762545,1.43852882 7.79284074,1.53017098 C7.54805603,1.62181315 7.42390947,1.89454102 7.51555164,2.13932572 C7.63039524,2.44608361 7.67451179,2.7016911 7.65574116,2.90437832 C7.65080382,2.95769221 7.64384442,2.98485172 7.61803793,3.03015079 L7.55444366,3.13085102 C7.41229563,3.35222019 7.33698667,3.54741847 7.30968267,3.85013034 C7.26936629,4.29710675 7.34744708,4.70140842 7.54913425,5.04999312 C7.68003274,5.27623067 7.9695487,5.35351824 8.19578624,5.22261975 C8.39688628,5.10626554 8.48029745,4.86458394 8.40441636,4.65341954 L8.36841287,4.57596776 C8.26931999,4.40470125 8.22890758,4.19544613 8.25238485,3.93516019 C8.26227055,3.82556028 8.27766457,3.76886418 8.31680951,3.69858229 L8.38046851,3.59662085 C8.50972533,3.39646347 8.57545491,3.23766893 8.59823735,2.99166183 C8.6314676,2.63283825 8.56344036,2.23869429 8.40199548,1.80746008 Z M10.1094469,1.80746008 C10.0178048,1.56267538 9.74507689,1.43852882 9.50029219,1.53017098 C9.25550748,1.62181315 9.13136092,1.89454102 9.22300308,2.13932572 C9.33784668,2.44608361 9.38196324,2.7016911 9.3631926,2.90437832 C9.35825526,2.95769221 9.35129587,2.98485172 9.32548938,3.03015079 L9.2618951,3.13085102 C9.11974707,3.35222019 9.04443812,3.54741847 9.01713411,3.85013034 C8.97681773,4.29710675 9.05489852,4.70140842 9.2565857,5.04999312 C9.38748419,5.27623067 9.67700014,5.35351824 9.90323769,5.22261975 C10.1043377,5.10626554 10.1877489,4.86458394 10.1118678,4.65341954 L10.0758643,4.57596776 C9.97677144,4.40470125 9.93635903,4.19544613 9.9598363,3.93516019 C9.96972199,3.82556028 9.98511601,3.76886418 10.024261,3.69858229 L10.08792,3.59662085 C10.2171768,3.39646347 10.2829064,3.23766893 10.3056888,2.99166183 C10.338919,2.63283825 10.2708918,2.23869429 10.1094469,1.80746008 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/sawmill-m.svg b/data/styles/default/dark/symbols/sawmill-m.svg
index 11cd53e76..b556b044e 100644
--- a/data/styles/default/dark/symbols/sawmill-m.svg
+++ b/data/styles/default/dark/symbols/sawmill-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
-  <path d="m11.566 2.6328-2.5312 3.543-0.0058593 0.0078126a4 4 0 0 0-0.52148 0.73828l-2.1113-0.80273 1.4844 3.2637h8.7207l-0.7832-1.7207a4 4 0 0 0-0.39258-0.875l1.7441-1.4199-4.3008-0.41797a4 4 0 0 0-0.86914-0.095703 4 4 0 0 0-0.074219 0.0058594l-0.35938-2.2266zm-6.0664 7.918c-0.554 0-1 0.446-1 1v0.89844c0 0.554 0.446 1 1 1h0.56445v5.1445c0 0.554 0.41769 1 0.93555 1s0.93555-0.446 0.93555-1v-5.1445h8.1523v5.1445c0 0.554 0.4072 1 0.91211 1s0.91211-0.446 0.91211-1v-5.1445h0.58789c0.554 0 1-0.446 1-1v-0.89844c0-0.554-0.446-1-1-1h-13z" fill="#000"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m11.566 2.6328-2.5312 3.543-.0058593.0078126a4 4 0 0 0 -.52148.73828l-2.1113-.80273 1.4844 3.2637h8.7207l-.7832-1.7207a4 4 0 0 0 -.39258-.875l1.7441-1.4199-4.3008-.41797a4 4 0 0 0 -.86914-.095703 4 4 0 0 0 -.074219.0058594l-.35938-2.2266zm-6.0664 7.918c-.554 0-1 .446-1 1v.89844c0 .554.446 1 1 1h.56445v5.1445c0 .554.41769 1 .93555 1s.93555-.446.93555-1v-5.1445h8.1523v5.1445c0 .554.4072 1 .91211 1s.91211-.446.91211-1v-5.1445h.58789c.554 0 1-.446 1-1v-.89844c0-.554-.446-1-1-1h-13z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/shop-industry-m.svg b/data/styles/default/dark/symbols/shop-industry-m.svg
new file mode 100644
index 000000000..ce04ca5dc
--- /dev/null
+++ b/data/styles/default/dark/symbols/shop-industry-m.svg
@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <title>shop-industry-m</title>
+ <g fill="none" fill-rule="evenodd">
+  <g id="shop-m" fill-rule="nonzero">
+   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#574469"/>
+   <path id="Shape" d="m16.667 8.3333h-1.3333c0-1.84-1.4933-3.3333-3.3333-3.3333s-3.3333 1.4933-3.3333 3.3333h-1.3333c-0.73333 0-1.3267 0.6-1.3267 1.3333l-0.0066667 8c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-8c0-0.73333-0.6-1.3333-1.3333-1.3333zm-4.6667-2c1.1067 0 2 0.89333 2 2h-4c0-1.1067 0.89333-2 2-2zm0 6.6667c-1.84 0-3.3333-1.4933-3.3333-3.3333h1.3333c0 1.1067 0.89333 2 2 2s2-0.89333 2-2h1.3333c0 1.84-1.4933 3.3333-3.3333 3.3333z" fill="#000"/>
+  </g>
+ </g>
+</svg>
diff --git a/data/styles/default/dark/symbols/shower-m.svg b/data/styles/default/dark/symbols/shower-m.svg
index b29820b18..3085c1817 100644
--- a/data/styles/default/dark/symbols/shower-m.svg
+++ b/data/styles/default/dark/symbols/shower-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>shower-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
-  <g id="shower-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.6 5v1.4656c-1.7775 0.29846-3.1899 1.6981-3.5 3.4344h8.4c-0.31006-1.7363-1.7225-3.1359-3.5-3.4344v-1.4656h-1.4zm-4.2 5.6v1.4h9.8v-1.4h-9.8zm2.1 2.8c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-7 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7c0.3866 0 0.7-0.3134 0.7-0.7s-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-9.8 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7z" fill="#777777"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m7.125 10.05c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm-5.25 1.575c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm-7.35 1.575c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525z" fill="#0a6074"/><path d="m8.7 3.75v1.0992c-1.333125.223845-2.392425 1.273575-2.625 2.5758h6.3c-.232545-1.302225-1.291875-2.351925-2.625-2.5758v-1.0992zm-3.15 4.2v1.05h7.35v-1.05z" fill="#51585E"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/skateboard-centre-m.svg b/data/styles/default/dark/symbols/skateboard-centre-m.svg
new file mode 100644
index 000000000..5ab76dc8d
--- /dev/null
+++ b/data/styles/default/dark/symbols/skateboard-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9.9925 4.35325c0-.53804375.5955875-.97825 1.3235-.97825s1.3235.44021875 1.3235.97825-.5955875.97825-1.3235.97825-1.3235-.44021875-1.3235-.97825zm-3.805125 9.538125c-.271325 0-.496325.1663063-.496325.36685 0 .2005438.225.36685.496325.36685s.496325-.1663062.496325-.36685c0-.2005437-.225-.36685-.496325-.36685zm5.625 0c-.271325 0-.496325.1663063-.496325.36685 0 .2005438.225.36685.496325.36685s.496325-.1663062.496325-.36685c0-.2005437-.225-.36685-.496325-.36685zm2.3095625-1.7119375c-.158825 0-.2977938.0538063-.3904438.1467375-.3639687.3570625-.9396875.5869563-1.58825.5869563h-.1654437v-2.93481255l-2.8588125-1.306 1.1911875-1.4135625c.761.9 2.117625 1.49675 3.6529375 1.49675v-.97825c-1.22425 0-2.2765-.547825-2.7330625-1.3304375l-.3441188-.59185c-.1257375-.210325-.4897062-.52336875-1.09193745-.52336875h-3.7720625l-1.6544375 1.9565 1.125.51848125 1.257375-1.49675h1.555125l-1.58825 1.87825c-.20515.2445625-.2580875.5429375-.13896875.816875l.88675 2.02987505-2.0646875 1.839125c-.4632375-.0782625-.8603125-.2788063-1.131625-.547825-.09265-.0929375-.2382375-.1467375-.39705625-.1467375-.291175 0-.496325.1760875-.496325.36685 0 .0733687.03308812.1516312.0992625.2201062.54265.5380438 1.4095625.8804375 2.382375.8804375h6.28687495c.9728125 0 1.8396875-.3423937 2.382375-.8804375.066175-.068475.0992625-.1467375.0992625-.2201062 0-.1907625-.2117625-.36685-.5029437-.36685zm-3.467625.7336875h-3.5735l1.919125-1.7119375-.66175-1.614125 2.3161875 1.0760625z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/skateboard-m.svg b/data/styles/default/dark/symbols/skateboard-m.svg
index 103a09cd5..8a668474f 100644
--- a/data/styles/default/dark/symbols/skateboard-m.svg
+++ b/data/styles/default/dark/symbols/skateboard-m.svg
@@ -1,3 +1 @@
-<svg enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m13.588 4.5652c0-0.86087 0.95294-1.5652 2.1176-1.5652s2.1176 0.70435 2.1176 1.5652-0.95294 1.5652-2.1176 1.5652-2.1176-0.70435-2.1176-1.5652zm-6.0882 15.261c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm9 0c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm3.6953-2.7391c-0.25412 0-0.47647 0.08609-0.62471 0.23478-0.58235 0.5713-1.5035 0.93913-2.5412 0.93913h-0.26471v-4.6957l-4.5741-2.0896 1.9059-2.2617c1.2176 1.44 3.3882 2.3948 5.8447 2.3948v-1.5652c-1.9588 0-3.6424-0.87652-4.3729-2.1287l-0.55059-0.94696c-0.20118-0.33652-0.78353-0.83739-1.7471-0.83739h-6.0353l-2.6471 3.1304 1.8 0.82957 2.0118-2.3948h2.4882l-2.5412 3.0052c-0.32824 0.3913-0.41294 0.8687-0.22235 1.307l1.4188 3.2478-3.3035 2.9426c-0.74118-0.12522-1.3765-0.44609-1.8106-0.87652-0.14824-0.1487-0.38118-0.23478-0.63529-0.23478-0.46588 0-0.79412 0.28174-0.79412 0.58696 0 0.11739 0.052941 0.24261 0.15882 0.35217 0.86824 0.86087 2.2553 1.4087 3.8118 1.4087h10.059c1.5565 0 2.9435-0.54783 3.8118-1.4087 0.10588-0.10956 0.15882-0.23478 0.15882-0.35217 0-0.30522-0.33882-0.58696-0.80471-0.58696zm-5.5482 1.1739h-5.7176l3.0706-2.7391-1.0588-2.5826 3.7059 1.7217z" fill="#777777" stroke-width=".9103"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m10.191 3.4239c0-.6456525.714705-1.1739 1.5882-1.1739s1.5882.5282625 1.5882 1.1739-.714705 1.1739-1.5882 1.1739-1.5882-.5282625-1.5882-1.1739zm-4.56615 11.44575c-.32559 0-.59559.1995675-.59559.44022s.27.44022.59559.44022.59559-.1995675.59559-.44022-.27-.44022-.59559-.44022zm6.75 0c-.32559 0-.59559.1995675-.59559.44022s.27.44022.59559.44022.59559-.1995675.59559-.44022-.27-.44022-.59559-.44022zm2.771475-2.054325c-.19059 0-.3573525.0645675-.4685325.176085-.4367625.428475-1.127625.7043475-1.9059.7043475h-.1985325v-3.521775l-3.430575-1.5672 1.429425-1.696275c.9132 1.08 2.54115 1.7961 4.383525 1.7961v-1.1739c-1.4691 0-2.7318-.65739-3.279675-1.596525l-.4129425-.71022c-.150885-.25239-.5876475-.6280425-1.310325-.6280425h-4.526475l-1.985325 2.3478 1.35.6221775 1.50885-1.7961h1.86615l-1.9059 2.2539c-.24618.293475-.309705.651525-.1667625.98025l1.0641 2.43585-2.477625 2.20695c-.555885-.093915-1.032375-.3345675-1.35795-.65739-.11118-.111525-.285885-.176085-.4764675-.176085-.34941 0-.59559.211305-.59559.44022 0 .0880425.03970575.1819575.119115.2641275.65118.6456525 1.691475 1.056525 2.85885 1.056525h7.54425c1.167375 0 2.207625-.4108725 2.85885-1.056525.07941-.08217.119115-.176085.119115-.2641275 0-.228915-.254115-.44022-.6035325-.44022zm-4.16115.880425h-4.2882l2.30295-2.054325-.7941-1.93695 2.779425 1.291275z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/skiing-centre-m.svg b/data/styles/default/dark/symbols/skiing-centre-m.svg
new file mode 100644
index 000000000..0fa8bd202
--- /dev/null
+++ b/data/styles/default/dark/symbols/skiing-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m12.25625 4.359375c0 .61875-.50625 1.125-1.125 1.125s-1.125-.50625-1.125-1.125.50625-1.125 1.125-1.125 1.125.50625 1.125 1.125zm-1.53 9.225.4275.151875c.34875.118125.714375.185625 1.1025.185625.4725 0 .928125-.10125 1.33875-.28125l.63.635625c-.590625.309375-1.26.489375-1.96875.489375-.48375 0-.945-.07875-1.378125-.230625l-7.903125-2.88.28125-.793125 3.88125 1.411875.9675-2.4975-2.008125-2.098125c-.500625-.52875-.376875-1.389375.253125-1.755l1.9575-1.130625c.61875-.36 1.4175-.05625 1.636875.624375l.185625.6075c.2475.79875.8325 1.445625 1.591875 1.76625l.2925-.9.804375.25875-.63 1.940625c-1.378125-.225-2.52-1.164375-3.02625-2.43l-1.423125.815625 1.704375 1.94625-1.24875 3.24 1.738125.63 1.18125-3.6225c.25875.10125.52875.174375.81.230625z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/skiing-m.svg b/data/styles/default/dark/symbols/skiing-m.svg
index 99c638a4a..b577b09f6 100644
--- a/data/styles/default/dark/symbols/skiing-m.svg
+++ b/data/styles/default/dark/symbols/skiing-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>skiing-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="skiing-m" fill-rule="nonzero">
-   <path id="Shape" d="m17.85 4.575c0 0.99-0.81 1.8-1.8 1.8s-1.8-0.81-1.8-1.8c0-0.99 0.81-1.8 1.8-1.8s1.8 0.81 1.8 1.8zm-2.448 14.76 0.684 0.243c0.558 0.189 1.143 0.297 1.764 0.297 0.756 0 1.485-0.162 2.142-0.45l1.008 1.017c-0.945 0.495-2.016 0.783-3.15 0.783-0.774 0-1.512-0.126-2.205-0.369l-12.645-4.608 0.45-1.269 6.21 2.259 1.548-3.996-3.213-3.357c-0.801-0.846-0.603-2.223 0.405-2.808l3.132-1.809c0.99-0.576 2.268-0.09 2.619 0.999l0.297 0.972c0.396 1.278 1.332 2.313 2.547 2.826l0.468-1.44 1.287 0.414-1.008 3.105c-2.205-0.36-4.032-1.863-4.842-3.888l-2.277 1.305 2.727 3.114-1.998 5.184 2.781 1.008 1.89-5.796c0.414 0.162 0.846 0.279 1.296 0.369z" fill="#777777" stroke-width="1.3179"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.3875 3.43125c0 .7425-.6075 1.35-1.35 1.35s-1.35-.6075-1.35-1.35.6075-1.35 1.35-1.35 1.35.6075 1.35 1.35zm-1.836 11.07.513.18225c.4185.14175.85725.22275 1.323.22275.567 0 1.11375-.1215 1.6065-.3375l.756.76275c-.70875.37125-1.512.58725-2.3625.58725-.5805 0-1.134-.0945-1.65375-.27675l-9.48375-3.456.3375-.95175 4.6575 1.69425 1.161-2.997-2.40975-2.51775c-.60075-.6345-.45225-1.66725.30375-2.106l2.349-1.35675c.7425-.432 1.701-.0675 1.96425.74925l.22275.729c.297.9585.999 1.73475 1.91025 2.1195l.351-1.08.96525.3105-.756 2.32875c-1.65375-.27-3.024-1.39725-3.6315-2.916l-1.70775.97875 2.04525 2.3355-1.4985 3.888 2.08575.756 1.4175-4.347c.3105.1215.6345.20925.972.27675z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/slots-m.svg b/data/styles/default/dark/symbols/slots-m.svg
index fed6046db..18eeb1bcc 100644
--- a/data/styles/default/dark/symbols/slots-m.svg
+++ b/data/styles/default/dark/symbols/slots-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
- <path d="m2.977 8.1665q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198zm6.515 0q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198zm6.515 0q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m2.977 8.1665q.308 0 .429.198.099.143.121.495.429-.726 1.397-.726.616 0 1.188.286l.506.253q.176.088.297.088.143 0 .242-.143l.165-.242q.154-.22.473-.22.363 0 .605.308.253.308.253.781 0 .792-.605 1.54-.176.209-.561.638-.792.869-1.078 1.386-.275.506-.275 1.078 0 .187.055.572.055.374.055.561 0 .385-.253.616t-.682.231q-.594 0-.935-.451-.341-.462-.341-1.265 0-1.287.858-2.167.418-.429 1.012-.913.715-.583 1.056-.968-.462.209-.814.209-.473 0-1.155-.385l-.506-.286q-.187-.099-.341-.099-.33 0-.33.363 0 .011.022.099l.099.374q.055.209.055.385 0 .88-.858.88-.814 0-.814-.77 0-.231.033-.451.088-.583.088-.682 0-.143-.055-.429-.055-.297-.055-.44 0-.308.176-.506.187-.198.473-.198zm6.515 0q.308 0 .429.198.099.143.121.495.429-.726 1.397-.726.616 0 1.188.286l.506.253q.176.088.297.088.143 0 .242-.143l.165-.242q.154-.22.473-.22.363 0 .605.308.253.308.253.781 0 .792-.605 1.54-.176.209-.561.638-.792.869-1.078 1.386-.275.506-.275 1.078 0 .187.055.572.055.374.055.561 0 .385-.253.616t-.682.231q-.594 0-.935-.451-.341-.462-.341-1.265 0-1.287.858-2.167.418-.429 1.012-.913.715-.583 1.056-.968-.462.209-.814.209-.473 0-1.155-.385l-.506-.286q-.187-.099-.341-.099-.33 0-.33.363 0 .011.022.099l.099.374q.055.209.055.385 0 .88-.858.88-.814 0-.814-.77 0-.231.033-.451.088-.583.088-.682 0-.143-.055-.429-.055-.297-.055-.44 0-.308.176-.506.187-.198.473-.198zm6.515 0q.308 0 .429.198.099.143.121.495.429-.726 1.397-.726.616 0 1.188.286l.506.253q.176.088.297.088.143 0 .242-.143l.165-.242q.154-.22.473-.22.363 0 .605.308.253.308.253.781 0 .792-.605 1.54-.176.209-.561.638-.792.869-1.078 1.386-.275.506-.275 1.078 0 .187.055.572.055.374.055.561 0 .385-.253.616t-.682.231q-.594 0-.935-.451-.341-.462-.341-1.265 0-1.287.858-2.167.418-.429 1.012-.913.715-.583 1.056-.968-.462.209-.814.209-.473 0-1.155-.385l-.506-.286q-.187-.099-.341-.099-.33 0-.33.363 0 .011.022.099l.099.374q.055.209.055.385 0 .88-.858.88-.814 0-.814-.77 0-.231.033-.451.088-.583.088-.682 0-.143-.055-.429-.055-.297-.055-.44 0-.308.176-.506.187-.198.473-.198z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/soccer-centre-m.svg b/data/styles/default/dark/symbols/soccer-centre-m.svg
new file mode 100644
index 000000000..f2c668f33
--- /dev/null
+++ b/data/styles/default/dark/symbols/soccer-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9 3.375c-3.105 0-5.625 2.52-5.625 5.625s2.52 5.625 5.625 5.625 5.625-2.52 5.625-5.625-2.52-5.625-5.625-5.625zm.5625 1.85625.759375-.534375c1.02375.315 1.895625.99 2.46375 1.87875l-.219375.75375-.759375.25875-2.244375-1.569375zm-1.884375-.534375.759375.534375v.7875l-2.244375 1.569375-.759375-.25875-.219375-.75375c.568125-.883125 1.44-1.558125 2.46375-1.87875zm-1.445625 7.1775-.64125.05625c-.680625-.7875-1.09125-1.81125-1.09125-2.930625 0-.0675.005625-.129375.01125-.196875l.5625-.410625.77625.27.82125 2.44125zm4.17375 1.395c-.444375.14625-.916875.230625-1.40625.230625s-.961875-.084375-1.40625-.230625l-.388125-.838125.36-.61875h2.874375l.36.624375zm-.129375-2.581875h-2.55375l-.759375-2.26125 2.03625-1.42875 2.041875 1.42875zm2.131875 1.243125-.64125-.05625-.444375-.770625.82125-2.44125.781875-.264375.5625.410625c.005625.061875.01125.12375.01125.19125 0 1.119375-.410625 2.143125-1.09125 2.930625z" fill="#000" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/soccer-m.svg b/data/styles/default/dark/symbols/soccer-m.svg
index c27dbd719..dc74f9498 100644
--- a/data/styles/default/dark/symbols/soccer-m.svg
+++ b/data/styles/default/dark/symbols/soccer-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>soccer-m</title>
- <g fill="#fff" fill-rule="evenodd">
-  <g id="soccer-m" fill="#fff" fill-rule="nonzero">
-   <path id="Shape" d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 2.97 1.215-0.855c1.638 0.504 3.033 1.584 3.942 3.006l-0.351 1.206-1.215 0.414-3.591-2.511zm-3.015-0.855 1.215 0.855v1.26l-3.591 2.511-1.215-0.414-0.351-1.206c0.909-1.413 2.304-2.493 3.942-3.006zm-2.313 11.484-1.026 0.09c-1.089-1.26-1.746-2.898-1.746-4.689 0-0.108 9e-3 -0.207 0.018-0.315l0.9-0.657 1.242 0.432 1.314 3.906zm6.678 2.232c-0.711 0.234-1.467 0.369-2.25 0.369s-1.539-0.135-2.25-0.369l-0.621-1.341 0.576-0.99h4.599l0.576 0.999zm-0.207-4.131h-4.086l-1.215-3.618 3.258-2.286 3.267 2.286zm3.411 1.989-1.026-0.09-0.711-1.233 1.314-3.906 1.251-0.423 0.9 0.657c9e-3 0.099 0.018 0.198 0.018 0.306 0 1.791-0.657 3.429-1.746 4.689z" fill="#777777" stroke-width="1.2857"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c-3.726 0-6.75 3.024-6.75 6.75s3.024 6.75 6.75 6.75 6.75-3.024 6.75-6.75-3.024-6.75-6.75-6.75zm.675 2.2275.91125-.64125c1.2285.378 2.27475 1.188 2.9565 2.2545l-.26325.9045-.91125.3105-2.69325-1.88325zm-2.26125-.64125.91125.64125v.945l-2.69325 1.88325-.91125-.3105-.26325-.9045c.68175-1.05975 1.728-1.86975 2.9565-2.2545zm-1.73475 8.613-.7695.0675c-.81675-.945-1.3095-2.1735-1.3095-3.51675 0-.081.00675-.15525.0135-.23625l.675-.49275.9315.324.9855 2.9295zm5.0085 1.674c-.53325.1755-1.10025.27675-1.6875.27675s-1.15425-.10125-1.6875-.27675l-.46575-1.00575.432-.7425h3.44925l.432.74925zm-.15525-3.09825h-3.0645l-.91125-2.7135 2.4435-1.7145 2.45025 1.7145zm2.55825 1.49175-.7695-.0675-.53325-.92475.9855-2.9295.93825-.31725.675.49275c.00675.07425.0135.1485.0135.2295 0 1.34325-.49275 2.57175-1.3095 3.51675z" fill="#51585E" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/sports_centre-m.svg b/data/styles/default/dark/symbols/sports_centre-m.svg
index 6e9d0f4f5..e76c1c8f6 100644
--- a/data/styles/default/dark/symbols/sports_centre-m.svg
+++ b/data/styles/default/dark/symbols/sports_centre-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-  <title>sports_centre-m</title>
-  <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#51585E"/>
-  <g fill="none" fill-rule="evenodd">
-    <g id="pitch-m" fill-rule="nonzero">
-      <path id="Shape" d="m 11.672709,4.7280561 c -0.896063,0 -1.622449,0.6853555 -1.622449,1.5309036 0,0.8455642 0.726377,1.5309036 1.622449,1.5309036 0.896064,0 1.622449,-0.6853555 1.622449,-1.5309036 0,-0.8455643 -0.726377,-1.5309036 -1.622449,-1.5309036 z M 7.0082488,7.7898633 7.4138611,9.3208476 C 7.6166592,10.086299 8.101083,10.086299 8.7067301,10.086299 H 10.05026 c 0.481661,0.765452 0.255261,2.009882 0.405612,3.179613 H 9.7207042 c -0.8112246,0 -2.1040935,0.765452 -1.2928689,2.296396 l 1.2168368,2.296476 c 0.8112249,1.530904 2.0279809,0.38273 1.6224489,-0.38273 l -1.216837,-2.296476 c -0.2027977,-0.38273 0.214409,-0.38273 0.405613,-0.38273 h 2.002044 c 0,0 0.960299,1.893611 2.091408,3.272127 0.417546,0.50881 0.880065,1.202859 1.458992,1.202859 0.405596,0 1.100648,-0.591491 0.360914,-1.424491 -1.385303,-1.559991 -2.262864,-3.168301 -2.262864,-3.933793 0,-0.890327 -0.16576,-2.765354 -0.405596,-3.827299 h 1.216837 c 0.395868,0.74867 1.090709,1.91365 1.090709,1.91365 0.448387,0.732897 1.185648,0.677518 1.185648,0 0,-0.09286 -0.01185,-0.292776 -0.113224,-0.518101 L 15.931638,8.9380773 C 15.856592,8.772051 15.726069,8.5553474 15.120414,8.5553474 H 8.8335041 L 8.2250938,6.6416169 c -0.2433593,-0.7654518 -1.419643,-0.7654518 -1.419643,0 0,0.3827299 0.1437095,0.8474226 0.202798,1.1481575 z" fill="#000"/>
-    </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#2B5C4B" r="11"/><path d="m11.672709 4.7280561c-.896063 0-1.622449.6853555-1.622449 1.5309036 0 .8455642.726377 1.5309036 1.622449 1.5309036.896064 0 1.622449-.6853555 1.622449-1.5309036 0-.8455643-.726377-1.5309036-1.622449-1.5309036zm-4.6644602 3.0618072.4056123 1.5309843c.2027981.7654514.6872219.7654514 1.292869.7654514h1.3435299c.481661.765452.255261 2.009882.405612 3.179613h-.7351678c-.8112246 0-2.1040935.765452-1.2928689 2.296396l1.2168368 2.296476c.8112249 1.530904 2.0279809.38273 1.6224489-.38273l-1.216837-2.296476c-.2027977-.38273.214409-.38273.405613-.38273h2.002044s.960299 1.893611 2.091408 3.272127c.417546.50881.880065 1.202859 1.458992 1.202859.405596 0 1.100648-.591491.360914-1.424491-1.385303-1.559991-2.262864-3.168301-2.262864-3.933793 0-.890327-.16576-2.765354-.405596-3.827299h1.216837c.395868.74867 1.090709 1.91365 1.090709 1.91365.448387.732897 1.185648.677518 1.185648 0 0-.09286-.01185-.292776-.113224-.518101l-1.149127-2.5437227c-.075046-.1660263-.205569-.3827299-.811224-.3827299h-6.2869099l-.6084103-1.9137305c-.2433593-.7654518-1.419643-.7654518-1.419643 0 0 .3827299.1437095.8474226.202798 1.1481575z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/stadium-m.svg b/data/styles/default/dark/symbols/stadium-m.svg
index 260966068..a267ddb7f 100644
--- a/data/styles/default/dark/symbols/stadium-m.svg
+++ b/data/styles/default/dark/symbols/stadium-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
- <path d="m7.1 6h1.4l2.1 1.4-2.1 1.4v0.93412c1.0296-0.1489 2.225-0.23412 3.5-0.23412s2.4704 0.085218 3.5 0.23412v-3.7341h1.4l2.1 1.4-2.1 1.4v1.2002c1.296 0.31761 2.1 0.76021 2.1 1.2498 0 0.96649-3.134 1.75-7 1.75-3.866 0-7-0.78351-7-1.75 0-0.48954 0.80405-0.93214 2.1-1.2498v-4.0002zm4.9 4.55c-2.3196 0-3.5 0.1201-3.5 0.69999 0 0.57988 1.1804 0.7 3.5 0.7 2.3196 0 3.5-0.12012 3.5-0.7 0-0.57989-1.1804-0.69999-3.5-0.69999zm0 3.675c2.6658 0 5.0415-0.46564 6.5804-1.1919l-0.98035 5.5669h-3.5v-1.4c0-0.77322-0.62678-1.4-1.4-1.4h-1.4c-0.77321 0-1.4 0.62678-1.4 1.4v1.4h-3.5l-0.98035-5.5669c1.5388 0.72625 3.9146 1.1919 6.5804 1.1919z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#2B5C4B" r="11"/><path d="m7.1 6h1.4l2.1 1.4-2.1 1.4v.93412c1.0296-.1489 2.225-.23412 3.5-.23412s2.4704.085218 3.5.23412v-3.7341h1.4l2.1 1.4-2.1 1.4v1.2002c1.296.31761 2.1.76021 2.1 1.2498 0 .96649-3.134 1.75-7 1.75s-7-.78351-7-1.75c0-.48954.80405-.93214 2.1-1.2498v-4.0002zm4.9 4.55c-2.3196 0-3.5.1201-3.5.69999 0 .57988 1.1804.7 3.5.7s3.5-.12012 3.5-.7c0-.57989-1.1804-.69999-3.5-.69999zm0 3.675c2.6658 0 5.0415-.46564 6.5804-1.1919l-.98035 5.5669h-3.5v-1.4c0-.77322-.62678-1.4-1.4-1.4h-1.4c-.77321 0-1.4.62678-1.4 1.4v1.4h-3.5l-.98035-5.5669c1.5388.72625 3.9146 1.1919 6.5804 1.1919z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/stadium-s.svg b/data/styles/default/dark/symbols/stadium-s.svg
index c98ece54c..cd5608e8b 100644
--- a/data/styles/default/dark/symbols/stadium-s.svg
+++ b/data/styles/default/dark/symbols/stadium-s.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
- <circle cx="8" cy="8" r="7.3333" fill="#6E4426"/>
- <path d="m4.7333 4h0.93333l1.4 0.93333-1.4 0.93333v0.62275c0.68641-0.099269 1.4833-0.15608 2.3333-0.15608s1.6469 0.056812 2.3333 0.15608v-2.4894h0.93333l1.4 0.93333-1.4 0.93333v0.80017c0.86399 0.21174 1.4 0.5068 1.4 0.83317 0 0.64433-2.0894 1.1667-4.6667 1.1667-2.5773 0-4.6667-0.52234-4.6667-1.1667 0-0.32636 0.53603-0.62143 1.4-0.83317v-2.6668zm3.2667 3.0333c-1.5464 0-2.3333 0.080066-2.3333 0.46666 0 0.38659 0.78694 0.46667 2.3333 0.46667 1.5464 0 2.3333-0.08008 2.3333-0.46667 0-0.3866-0.78694-0.46666-2.3333-0.46666zm0 2.45c1.7772 0 3.361-0.31043 4.3869-0.79459l-0.65357 3.7113h-2.3333v-0.93333c0-0.51548-0.41785-0.93333-0.93333-0.93333h-0.93333c-0.51547 0-0.93333 0.41785-0.93333 0.93333v0.93333h-2.3333l-0.65357-3.7113c1.0259 0.48417 2.6097 0.79459 4.3869 0.79459z" fill="#000"/>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#000" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#2B5C4B" r="7.3333"/><path d="m4.7333 4h.93333l1.4.93333-1.4.93333v.62275c.68641-.099269 1.4833-.15608 2.3333-.15608s1.6469.056812 2.3333.15608v-2.4894h.93333l1.4.93333-1.4.93333v.80017c.86399.21174 1.4.5068 1.4.83317 0 .64433-2.0894 1.1667-4.6667 1.1667s-4.6667-.52234-4.6667-1.1667c0-.32636.53603-.62143 1.4-.83317v-2.6668zm3.2667 3.0333c-1.5464 0-2.3333.080066-2.3333.46666 0 .38659.78694.46667 2.3333.46667 1.5464 0 2.3333-.08008 2.3333-.46667 0-.3866-.78694-.46666-2.3333-.46666zm0 2.45c1.7772 0 3.361-.31043 4.3869-.79459l-.65357 3.7113h-2.3333v-.93333c0-.51548-.41785-.93333-.93333-.93333h-.93333c-.51547 0-.93333.41785-.93333.93333v.93333h-2.3333l-.65357-3.7113c1.0259.48417 2.6097.79459 4.3869.79459z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/stripclub-m.svg b/data/styles/default/dark/symbols/stripclub-m.svg
index ffbd0b206..957927e9d 100644
--- a/data/styles/default/dark/symbols/stripclub-m.svg
+++ b/data/styles/default/dark/symbols/stripclub-m.svg
@@ -1,6 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C491C"/>
- <path d="m2.0024 15.579 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756z" fill="#000"/>
-</svg>
+
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m2.0024 15.579 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/studio-m.svg b/data/styles/default/dark/symbols/studio-m.svg
index 77432e48b..071736d1d 100644
--- a/data/styles/default/dark/symbols/studio-m.svg
+++ b/data/styles/default/dark/symbols/studio-m.svg
@@ -1,8 +1 @@
-<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="12" cy="12" fill="#000" id="Oval" opacity=".6" r="12" />
-  <circle cx="12" cy="12" fill="#6B425C" r="11" />
-  <path d="m9 17 8-5-8-5z" fill="#000" />
-  <title>studio-m</title>
-</svg>
-
-
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m9 17 8-5-8-5z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/swimming-centre-m.svg b/data/styles/default/dark/symbols/swimming-centre-m.svg
new file mode 100644
index 000000000..95115dbef
--- /dev/null
+++ b/data/styles/default/dark/symbols/swimming-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#0a6074" r="8.25"/><path d="m10.946875 4.3125c-.09885 0-.27115.048-.3515625.094l-2.488 1.4063125c-.33276875.182-.46285.752125-.2433875 1.0936875l.7571875 1.1875-3.218125 2.1563125 1.73075.8125 1.866-.875 1.866.875.7301875-.875-2.2445625-3.4688125 1.893-1.125c.3762375-.2174.3635125-.5902.3245188-.8125-.03695-.2107-.2784188-.4687-.6219938-.4687zm1.5144375 2.375c-.7169375 0-1.2980625.671625-1.2980625 1.5s.5811688 1.5 1.2980625 1.5c.7169375 0 1.2980625-.671625 1.2980625-1.5s-.5811687-1.5-1.2980625-1.5zm-3.4615625 4.5-1.73075 1-2.1634375-.9375-1.73075.9375v1.5l1.73075-1 2.1634375 1 1.73075-1.0625 1.73075 1.0625 1.73075-1.0625 2.1634375 1.0625v-1.5l-2.1634375-1-1.73075 1z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/swimming-m.svg b/data/styles/default/dark/symbols/swimming-m.svg
index 0b1c95ac4..1f0e9c288 100644
--- a/data/styles/default/dark/symbols/swimming-m.svg
+++ b/data/styles/default/dark/symbols/swimming-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>swimming-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="swimming-m" fill-rule="nonzero" fill="#777777">
-   <path id="Shape" d="m15.115 4.5c-0.15816 0-0.43384 0.0768-0.5625 0.1504l-3.9808 2.2501c-0.53243 0.2912-0.74056 1.2034-0.38942 1.7499l1.2115 1.9-5.149 3.4501 2.7692 1.3 2.9856-1.4 2.9856 1.4 1.1683-1.4-3.5913-5.5501 3.0288-1.8c0.60198-0.34784 0.58162-0.94432 0.51923-1.3-0.05912-0.33712-0.44547-0.74992-0.99519-0.74992zm2.4231 3.8c-1.1471 0-2.0769 1.0746-2.0769 2.4 0 1.3254 0.92987 2.4 2.0769 2.4 1.1471 0 2.0769-1.0746 2.0769-2.4 0-1.3254-0.92987-2.4-2.0769-2.4zm-5.5385 7.2-2.7692 1.6-3.4615-1.5-2.7692 1.5v2.4l2.7692-1.6 3.4615 1.6 2.7692-1.7 2.7692 1.7 2.7692-1.7 3.4615 1.7v-2.4l-3.4615-1.6-2.7692 1.6z" stroke-width="1.5"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m11.33625 3.375c-.11862 0-.32538.0576-.421875.1128l-2.9856 1.687575c-.3993225.2184-.55542.90255-.292065 1.312425l.908625 1.425-3.86175 2.587575 2.0769.975 2.2392-1.05 2.2392 1.05.876225-1.05-2.693475-4.162575 2.2716-1.35c.451485-.26088.436215-.70824.3894225-.975-.04434-.25284-.3341025-.56244-.7463925-.56244zm1.817325 2.85c-.860325 0-1.557675.80595-1.557675 1.8s.6974025 1.8 1.557675 1.8c.860325 0 1.557675-.80595 1.557675-1.8s-.6974025-1.8-1.557675-1.8zm-4.153875 5.4-2.0769 1.2-2.596125-1.125-2.0769 1.125v1.8l2.0769-1.2 2.596125 1.2 2.0769-1.275 2.0769 1.275 2.0769-1.275 2.596125 1.275v-1.8l-2.596125-1.2-2.0769 1.2z" fill="#0a6074"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/table-tennis-centre-m.svg b/data/styles/default/dark/symbols/table-tennis-centre-m.svg
new file mode 100644
index 000000000..de6c2eb58
--- /dev/null
+++ b/data/styles/default/dark/symbols/table-tennis-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m12.349375 9.659375c.5856563 0 1.1231875.193225 1.56425.5117812.2935563-.6226562.4406563-1.29731245.4406563-1.97174995 0-2.1528125-1.6606875-4.5540625-4.52993755-4.5540625-1.2541875 0-2.5191875.495075-3.462875 1.4396875l-1.1436875 1.14425c-.03242937.0515625-.05398062.06828125-.0841125.1183875l4.8270625 4.81712495c.43855625-.877 1.33825005-1.50549995 2.38862505-1.50549995zm-2.630125 2.1924375-4.992375-4.982125c-.271175.4739875-.40591875.9584375-.40591875 1.42825 0 .6375.24501875 1.2515625.7175 1.7243125l.7658125.7663125-1.9329375 1.698c-.15016875.1306063-.22618125.313625-.22618125.4971688 0 .1676062.0634375.3355499.19174375.4643875l.7124375.714125c.128575.128625.296275.1922062.46345625.1922062.1830625 0 .3655375-.0761875.4958875-.2267625l1.6954375-1.93875.7521875.7525625c.49421875.49445 1.1384375.735625 1.78625.735625.094825 0 .1926-.005625.287075-.0158687-.22095625-.3885875-.3582125-.8329375-.3582125-1.3115-.0002925-.1638126.0016875-.3225063.04783125-.4979063zm2.61125-1.5055c-1.10875 0-2.0084375.8790625-2.0084375 1.98575 0 1.087875.8995 2.0043125 2.0084375 2.0043125 1.090125 0 2.0084375-.8790625 2.0084375-2.0043125.0002106-1.087875-.8995-1.98575-2.0084375-1.98575z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/table-tennis-m.svg b/data/styles/default/dark/symbols/table-tennis-m.svg
index d592e3068..1975fe1d4 100644
--- a/data/styles/default/dark/symbols/table-tennis-m.svg
+++ b/data/styles/default/dark/symbols/table-tennis-m.svg
@@ -1 +1 @@
-<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g><g fill="#777777"><path d="m17.359 13.055c0.93705 0 1.7971 0.30916 2.5028 0.81885 0.46969-0.99625 0.70505-2.0757 0.70505-3.1548 0-3.4445-2.6571-7.2865-7.2479-7.2865-2.0067 0-4.0307 0.79212-5.5406 2.3035l-1.8299 1.8308c-0.051887 0.0825-0.086369 0.10925-0.13458 0.18942l7.7233 7.7074c0.70169-1.4032 2.1412-2.4088 3.8218-2.4088zm-4.2082 3.5079-7.9878-7.9714c-0.43388 0.75838-0.64947 1.5335-0.64947 2.2852 0 1.02 0.39203 2.0025 1.148 2.7589l1.2253 1.2261-3.0927 2.7168c-0.24027 0.20897-0.36189 0.5018-0.36189 0.79547 0 0.26817 0.1015 0.53688 0.30679 0.74302l1.1399 1.1426c0.20572 0.2058 0.47404 0.30753 0.74153 0.30753 0.2929 0 0.58486-0.1219 0.79342-0.36282l2.7127-3.102 1.2035 1.2041c0.79075 0.79112 1.8215 1.177 2.858 1.177 0.15172 0 0.30816-9e-3 0.45932-0.02539-0.35353-0.62174-0.57314-1.3327-0.57314-2.0984-4.68e-4 -0.2621 0.0027-0.51601 0.07653-0.79665zm4.178-2.4088c-1.774 0-3.2135 1.4065-3.2135 3.1772 0 1.7406 1.4392 3.2069 3.2135 3.2069 1.7442 0 3.2135-1.4065 3.2135-3.2069 3.37e-4 -1.7406-1.4392-3.1772-3.2135-3.1772z" stroke-opacity="0"/></g></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.01925 9.79125c.7027875 0 1.347825.23187 1.8771.6141375.3522675-.7471875.5287875-1.556775.5287875-2.3661 0-2.583375-1.992825-5.464875-5.435925-5.464875-1.505025 0-3.023025.59409-4.15545 1.727625l-1.372425 1.3731c-.03891525.061875-.06477675.0819375-.100935.142065l5.792475 5.78055c.5262675-1.0524 1.6059-1.8066 2.86635-1.8066zm-3.15615 2.630925-5.99085-5.97855c-.32541.568785-.4871025 1.150125-.4871025 1.7139 0 .765.2940225 1.501875.861 2.069175l.918975.919575-2.319525 2.0376c-.1802025.1567275-.2714175.37635-.2714175.5966025 0 .2011275.076125.40266.2300925.557265l.854925.85695c.15429.15435.35553.2306475.5561475.2306475.219675 0 .438645-.091425.595065-.272115l2.034525-2.3265.902625.903075c.5930625.59334 1.366125.88275 2.1435.88275.11379 0 .23112-.00675.34449-.0190425-.2651475-.466305-.429855-.999525-.429855-1.5738-.000351-.196575.002025-.3870075.0573975-.5974875zm3.1335-1.8066c-1.3305 0-2.410125 1.054875-2.410125 2.3829 0 1.30545 1.0794 2.405175 2.410125 2.405175 1.30815 0 2.410125-1.054875 2.410125-2.405175.0002527-1.30545-1.0794-2.3829-2.410125-2.3829z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/tennis-centre-m.svg b/data/styles/default/dark/symbols/tennis-centre-m.svg
new file mode 100644
index 000000000..e346eaaeb
--- /dev/null
+++ b/data/styles/default/dark/symbols/tennis-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m12.1089278 10.0336112c.5216329 0 1.0483609.1994517 1.4472482.598339.7977827.8029017.7977827 2.0967139 0 2.8944965-.3989194.3988873-.9256153.598331-1.4472482.598331-.521633 0-1.048361-.1994437-1.4472483-.598331-.79778266-.8029017-.79778266-2.0967138 0-2.8944965.3989194-.3988953.9256233-.598339 1.4472483-.598339zm0 1.0227735c-.2710387 0-.5318551.1073965-.7210687.29661-.3988873.3989195-.3988873 1.048361 0 1.4472483.1892136.1943326.45003.301729.7210687.301729.2710386 0 .531847-.1073964.7210686-.2966099.3988873-.3989195.3988873-1.048361 0-1.4472483-.1892136-.1943326-.45003-.3017291-.7210686-.3017291zm-4.10676489-6.8784433c1.49843918-1.498399 3.68719219-1.73876324 4.88387019-.54208525 1.1965575 1.19659763.9511304 3.38543104-.5421656 4.88378985-.8181706.81826705-1.9841501 1.28875172-2.79219504 1.29897945l-.7441048-.00297886c-.69260928.00825034-1.47396717.09874953-2.0685827.69336511l-2.16834098 2.1683409-.72618769-.7261877 2.16834097-2.16834094c.82334596-.82331381.68015847-2.00464256.6903862-2.8126875.0102864-.81310778.48072848-1.97394409 1.29897945-2.79219506zm4.15775489.17896728c-.7875525-.78244948-2.35759471-.53694204-3.43662199.54208525-1.0790514 1.07910765-1.32452669 2.6541805-.54208525 3.43662195.78756054.78244948 2.35760274.53694204 3.43662994-.54208525 1.0790434-1.07910765 1.3245187-2.6541805.5420773-3.43662195z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/tennis-m.svg b/data/styles/default/dark/symbols/tennis-m.svg
index e0901a8f3..0e2d617f5 100644
--- a/data/styles/default/dark/symbols/tennis-m.svg
+++ b/data/styles/default/dark/symbols/tennis-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>tennis-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="tennis-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5,5)" fill="#777777">
-    <g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)">
-     <path id="Shape" d="m11.785 0.94818c-1.4891-1.4891-4.2127-1.19-6.0773 0.67455-1.0182 1.0182-1.6036 2.4627-1.6164 3.4745-0.012727 1.0055 0.16545 2.4755-0.85909 3.5l-2.6982 2.6982 0.90364 0.90364 2.6982-2.6982c1.0245-1.0245 2.4945-0.84636 3.5-0.85909 1.0055-0.012727 2.4564-0.59818 3.4745-1.6164 1.8582-1.8645 2.1636-4.5882 0.67455-6.0773zm-5.8545 5.8482c-0.97364-0.97364-0.66818-2.9336 0.67455-4.2764 1.3427-1.3427 3.2964-1.6482 4.2764-0.67455 0.97364 0.97364 0.66818 2.9336-0.67454 4.2764-1.3427 1.3427-3.2964 1.6482-4.2764 0.67455z"/>
-     <path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909-0.33727 0-0.66182-0.13364-0.89727-0.37546-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12.7307133 10.8403335c.6259596 0 1.2580331.239342 1.7366979.7180067.9573392.9634821.9573392 2.5160567 0 3.4733959-.4787033.4786647-1.1107383.7179971-1.7366979.7179971s-1.2580331-.2393324-1.7366979-.7179971c-.9573392-.9634821-.9573392-2.5160567 0-3.4733959.4787033-.4786744 1.110748-.7180067 1.7366979-.7180067zm0 1.2273282c-.3252463 0-.6382261.1288757-.8652823.3559319-.4786648.4787034-.4786648 1.2580332 0 1.736698.2270562.2331991.540036.3620748.8652823.3620748s.6382165-.1288757.8652823-.3559319c.4786648-.4787034.4786648-1.2580332 0-1.7366979-.2270562-.2331992-.540036-.3620749-.8652823-.3620749zm-4.9281178-8.25413202c1.79812701-1.7980788 4.4246307-2.08651588 5.8606443-.6505023 1.4358689 1.43591715 1.1413564 4.06251725-.6505988 5.86054782-.9818047.9819205-2.3809801 1.5465021-3.35063405 1.5587753l-.89292576-.0035746c-.83113114.0099004-1.7687606.1184994-2.48229924.8320381l-2.60200917 2.6020092-.87142524-.8714253 2.60200917-2.6020091c.98801515-.98797662.81619016-2.40557112.82846345-3.37522505.01234368-.97572933.57687416-2.3687329 1.55877534-3.35063407zm4.9893058.21476074c-.945063-.93893938-2.82911359-.64433045-4.12394633.65050229-1.29486168 1.29492918-1.58943203 3.18501661-.65050229 4.12394634.94507264.93893938 2.82912322.64433046 4.12395602-.65050229 1.294852-1.29492918 1.5894223-3.18501661.6504926-4.12394634z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/theatre-m.svg b/data/styles/default/dark/symbols/theatre-m.svg
index 35ed55a65..d8e033d4b 100644
--- a/data/styles/default/dark/symbols/theatre-m.svg
+++ b/data/styles/default/dark/symbols/theatre-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>theatre-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="theatre-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
-   <g id="Group" transform="translate(5 5)" fill="#000">
-    <path id="Shape" d="m0 9.45c0 2.128 1.722 3.85 3.85 3.85s3.85-1.722 3.85-3.85v-4.55h-7.7v4.55zm3.85 1.4c-0.966 0-1.75-0.469-1.75-1.05h3.5c0 0.581-0.784 1.05-1.75 1.05zm1.75-3.85c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm-3.5 0c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7z"/>
-    <path id="Shape" d="m6.3 0v4.2h2.1v1.75c0-0.581 0.784-1.05 1.75-1.05s1.75 0.469 1.75 1.05h-3.5v1.75 0.273c0.525 0.266 1.12 0.427 1.75 0.427 2.128 0 3.85-1.722 3.85-3.85v-4.55h-7.7zm2.1 3.556c-0.385 0-0.7-0.315-0.7-0.7s0.315-0.7 0.7-0.7 0.7 0.315 0.7 0.7c0 0.392-0.315 0.7-0.7 0.7zm3.5 0c-0.385 0-0.7-0.315-0.7-0.7s0.315-0.7 0.7-0.7 0.7 0.315 0.7 0.7c0 0.392-0.315 0.7-0.7 0.7z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><g fill="#000" transform="translate(5 5)"><path d="m0 9.45c0 2.128 1.722 3.85 3.85 3.85s3.85-1.722 3.85-3.85v-4.55h-7.7zm3.85 1.4c-.966 0-1.75-.469-1.75-1.05h3.5c0 .581-.784 1.05-1.75 1.05zm1.75-3.85c.385 0 .7.315.7.7s-.315.7-.7.7-.7-.315-.7-.7.315-.7.7-.7zm-3.5 0c.385 0 .7.315.7.7s-.315.7-.7.7-.7-.315-.7-.7.315-.7.7-.7z"/><path d="m6.3 0v4.2h2.1v1.75c0-.581.784-1.05 1.75-1.05s1.75.469 1.75 1.05h-3.5v1.75.273c.525.266 1.12.427 1.75.427 2.128 0 3.85-1.722 3.85-3.85v-4.55h-7.7zm2.1 3.556c-.385 0-.7-.315-.7-.7s.315-.7.7-.7.7.315.7.7c0 .392-.315.7-.7.7zm3.5 0c-.385 0-.7-.315-.7-.7s.315-.7.7-.7.7.315.7.7c0 .392-.315.7-.7.7z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/theatre-s.svg b/data/styles/default/dark/symbols/theatre-s.svg
index f26d5b424..db08fad04 100644
--- a/data/styles/default/dark/symbols/theatre-s.svg
+++ b/data/styles/default/dark/symbols/theatre-s.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>theatre-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="theatre-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
-   <g id="Group" transform="translate(3.3333 3.3333)" fill="#000">
-    <path id="Shape" d="m0 6.3c0 1.4187 1.148 2.5667 2.5667 2.5667 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333v3.0333zm2.5667 0.93333c-0.644 0-1.1667-0.31267-1.1667-0.7h2.3333c0 0.38733-0.52267 0.7-1.1667 0.7zm1.1667-2.5667c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.25667-0.21 0.46667-0.46667 0.46667-0.25667 0-0.46667-0.21-0.46667-0.46667 0-0.25667 0.21-0.46667 0.46667-0.46667zm-2.3333 0c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.25667-0.21 0.46667-0.46667 0.46667s-0.46667-0.21-0.46667-0.46667c0-0.25667 0.21-0.46667 0.46667-0.46667z"/>
-    <path id="Shape" d="m4.2 0v2.8h1.4v1.1667c0-0.38733 0.52267-0.7 1.1667-0.7s1.1667 0.31267 1.1667 0.7h-2.3333v1.1667 0.182c0.35 0.17733 0.74667 0.28467 1.1667 0.28467 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333zm1.4 2.3707c-0.25667 0-0.46667-0.21-0.46667-0.46667s0.21-0.46667 0.46667-0.46667 0.46667 0.21 0.46667 0.46667c0 0.26133-0.21 0.46667-0.46667 0.46667zm2.3333 0c-0.25667 0-0.46667-0.21-0.46667-0.46667s0.21-0.46667 0.46667-0.46667c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.26133-0.21 0.46667-0.46667 0.46667z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="8" cy="8" fill="#000" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#802D19" r="7.3333"/><g fill="#000" transform="translate(3.3333 3.3333)"><path d="m0 6.3c0 1.4187 1.148 2.5667 2.5667 2.5667s2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333v3.0333zm2.5667.93333c-.644 0-1.1667-.31267-1.1667-.7h2.3333c0 .38733-.52267.7-1.1667.7zm1.1667-2.5667c.25667 0 .46667.21.46667.46667s-.21.46667-.46667.46667-.46667-.21-.46667-.46667.21-.46667.46667-.46667zm-2.3333 0c.25667 0 .46667.21.46667.46667s-.21.46667-.46667.46667-.46667-.21-.46667-.46667.21-.46667.46667-.46667z"/><path d="m4.2 0v2.8h1.4v1.1667c0-.38733.52267-.7 1.1667-.7s1.1667.31267 1.1667.7h-2.3333v1.1667.182c.35.17733.74667.28467 1.1667.28467 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333zm1.4 2.3707c-.25667 0-.46667-.21-.46667-.46667s.21-.46667.46667-.46667.46667.21.46667.46667c0 .26133-.21.46667-.46667.46667zm2.3333 0c-.25667 0-.46667-.21-.46667-.46667s.21-.46667.46667-.46667.46667.21.46667.46667c0 .26133-.21.46667-.46667.46667z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/theme_park-m.svg b/data/styles/default/dark/symbols/theme_park-m.svg
index 349c28cf7..9cdb2fffb 100644
--- a/data/styles/default/dark/symbols/theme_park-m.svg
+++ b/data/styles/default/dark/symbols/theme_park-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6E4426"/>
- <path d="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m12 5v1.1429h2.4l-.6-.57143.6-.57143h-2.4zm0 1.7143 4.2 4v1.1428s.1464.57143.9.57143.9-.57143.9-.57143v-1.1428zm0 0 .6 4v1.1428s.2976.57143 1.2.57143 1.2-.57143 1.2-.57143v-1.1428zm0 0-3 4v1.1428s.2976.57143 1.2.57143 1.2-.57143 1.2-.57143v-1.1428zm0 0-6 4v1.1428s.1464.57143.9.57143.9-.57143.9-.57143v-1.1428zm-3.6 5.7143s-.5952.57143-1.5.57143c-.129 0-.24645-.01457-.35625-.03571l-.54375 4.0357h4.2l.6-2.2857h2.4l.6 2.2857h4.2l-.54375-4.0357c-.1098.02114-.22725.03571-.35625.03571-1.0422 0-1.5-.57143-1.5-.57143s-.6888.57143-1.8.57143c-.9582 0-1.8-.57143-1.8-.57143s-.8466.57143-1.8.57143c-1.0956 0-1.8-.57143-1.8-.57143z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/theme_park-s.svg b/data/styles/default/dark/symbols/theme_park-s.svg
index 00e1aecfa..28a1830b4 100644
--- a/data/styles/default/dark/symbols/theme_park-s.svg
+++ b/data/styles/default/dark/symbols/theme_park-s.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
- <circle cx="8" cy="8" r="7" fill="#6E4426"/>
- <path d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#000"/>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#000" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#802D19" r="7"/><path d="m8 3v.7619h1.6l-.4-.38095.4-.38095zm0 1.1429 2.8 2.6667v.7619s.0976.38095.6.38095.6-.38095.6-.38095v-.7619zm0 0 .4 2.6667v.7619s.1984.38095.8.38095.8-.38095.8-.38095v-.7619zm0 0-2 2.6667v.7619s.1984.38095.8.38095.8-.38095.8-.38095v-.7619zm0 0-4 2.6667v.7619s.0976.38095.6.38095.6-.38095.6-.38095v-.7619zm-2.4 3.8095s-.3968.38095-1 .38095c-.086 0-.1643-.0097143-.2375-.02381l-.3625 2.6905h2.8l.4-1.5238h1.6l.4 1.5238h2.8l-.3625-2.6905c-.0732.014095-.1515.02381-.2375.02381-.6948 0-1-.38095-1-.38095s-.4592.38095-1.2.38095c-.6388 0-1.2-.38095-1.2-.38095s-.5644.38095-1.2.38095c-.7304 0-1.2-.38095-1.2-.38095z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/tire-repair-m.svg b/data/styles/default/dark/symbols/tire-repair-m.svg
index faa12d35e..26507a48a 100644
--- a/data/styles/default/dark/symbols/tire-repair-m.svg
+++ b/data/styles/default/dark/symbols/tire-repair-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>tire-repair-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="tire-repair-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m12 5c-3.8661 0-7 2.9847-7 6.6667 0 2.9347 1.5094 3.4588 1.5094 4.3542 0 0.406-1.6863 0.97917 3.0625 0.97917h4.8562c4.7488 0 3.0625-0.57317 3.0625-0.97917-7e-4 -0.89533 1.5094-1.4195 1.5094-4.3542 0-3.682-3.1339-6.6667-7-6.6667zm0 2c2.7062 0 4.9 2.0893 4.9 4.6667 0 2.5773-2.1938 4.6667-4.9 4.6667s-4.9-2.0893-4.9-4.6667c0-2.5773 2.1938-4.6667 4.9-4.6667zm0 0.66667c-0.1596 0-0.32655 0.0041667-0.48125 0.020833l-0.21875 2.1042c-0.2366 0.081333-0.46795 0.20283-0.65625 0.35417l-2.0125-0.85417c-0.1869 0.24067-0.35385 0.4935-0.48125 0.77083l1.7938 1.25c-0.0217 0.116-0.04375 0.23283-0.04375 0.35417 0 0.12133 0.02205 0.23883 0.04375 0.35417l-1.7938 1.25c0.1274 0.27733 0.29435 0.53083 0.48125 0.77083l2.0125-0.85417c0.1883 0.15133 0.41965 0.27283 0.65625 0.35417l0.21875 2.1042c0.154 0.017333 0.32165 0.020833 0.48125 0.020833s0.32655-0.0041667 0.48125-0.020833l0.21875-2.1042c0.2366-0.081333 0.46795-0.20283 0.65625-0.35417l2.0125 0.85417c0.1869-0.24067 0.35385-0.4935 0.48125-0.77083l-1.7938-1.25c0.021-0.116 0.04375-0.23283 0.04375-0.35417 0-0.12133-0.02205-0.23883-0.04375-0.35417l1.7938-1.25c-0.1274-0.27733-0.29435-0.53083-0.48125-0.77083l-2.0125 0.85417c-0.1883-0.15133-0.41965-0.27283-0.65625-0.35417l-0.21875-2.1042c-0.154-0.017333-0.32165-0.020833-0.48125-0.020833zm0 3c0.5796 0 1.05 0.448 1.05 1s-0.4704 1-1.05 1-1.05-0.448-1.05-1 0.4704-1 1.05-1z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><path d="m12 5c-3.8661 0-7 2.9847-7 6.6667 0 2.9347 1.5094 3.4588 1.5094 4.3542 0 .406-1.6863.97917 3.0625.97917h4.8562c4.7488 0 3.0625-.57317 3.0625-.97917-.0007-.89533 1.5094-1.4195 1.5094-4.3542 0-3.682-3.1339-6.6667-7-6.6667zm0 2c2.7062 0 4.9 2.0893 4.9 4.6667 0 2.5773-2.1938 4.6667-4.9 4.6667s-4.9-2.0893-4.9-4.6667c0-2.5773 2.1938-4.6667 4.9-4.6667zm0 .66667c-.1596 0-.32655.0041667-.48125.020833l-.21875 2.1042c-.2366.081333-.46795.20283-.65625.35417l-2.0125-.85417c-.1869.24067-.35385.4935-.48125.77083l1.7938 1.25c-.0217.116-.04375.23283-.04375.35417 0 .12133.02205.23883.04375.35417l-1.7938 1.25c.1274.27733.29435.53083.48125.77083l2.0125-.85417c.1883.15133.41965.27283.65625.35417l.21875 2.1042c.154.017333.32165.020833.48125.020833s.32655-.0041667.48125-.020833l.21875-2.1042c.2366-.081333.46795-.20283.65625-.35417l2.0125.85417c.1869-.24067.35385-.4935.48125-.77083l-1.7938-1.25c.021-.116.04375-.23283.04375-.35417 0-.12133-.02205-.23883-.04375-.35417l1.7938-1.25c-.1274-.27733-.29435-.53083-.48125-.77083l-2.0125.85417c-.1883-.15133-.41965-.27283-.65625-.35417l-.21875-2.1042c-.154-.017333-.32165-.020833-.48125-.020833zm0 3c.5796 0 1.05.448 1.05 1s-.4704 1-1.05 1-1.05-.448-1.05-1 .4704-1 1.05-1z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/toilets-m.svg b/data/styles/default/dark/symbols/toilets-m.svg
index d4a350e2d..ca252a513 100644
--- a/data/styles/default/dark/symbols/toilets-m.svg
+++ b/data/styles/default/dark/symbols/toilets-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>toilets-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="toilets-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
-   <path id="Shape" d="m8.1818 7.6923c0.75682 0 1.3636-0.59904 1.3636-1.3462 0-0.74712-0.60682-1.3462-1.3636-1.3462s-1.3636 0.59904-1.3636 1.3462c0 0.74712 0.60682 1.3462 1.3636 1.3462zm7.6364 7.5385v3.7692h-2.1818v-3.7692h-2.1818l1.9091-5.9231s0.27273-1.0769 1.3636-1.0769 1.3636 1.0769 1.3636 1.0769l1.9091 5.9231h-2.1818zm-6.5455-1.6154v5.3846h-2.1818v-5.3846h-1.0909v-3.8847c0-0.82838 0.66274-1.4999 1.5017-1.4999h1.3602c0.82937 0 1.5017 0.67108 1.5017 1.4999v3.8847h-1.0909zm6.9584-7.2692c0 0.74712-0.62972 1.3462-1.4151 1.3462s-1.4151-0.59904-1.4151-1.3462c0-0.74712 0.62972-1.3462 1.4151-1.3462s1.4151 0.59904 1.4151 1.3462z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#51585E" r="11"/><path d="m8.1818 7.6923c.75682 0 1.3636-.59904 1.3636-1.3462 0-.74712-.60682-1.3462-1.3636-1.3462s-1.3636.59904-1.3636 1.3462c0 .74712.60682 1.3462 1.3636 1.3462zm7.6364 7.5385v3.7692h-2.1818v-3.7692h-2.1818l1.9091-5.9231s.27273-1.0769 1.3636-1.0769 1.3636 1.0769 1.3636 1.0769l1.9091 5.9231zm-6.5455-1.6154v5.3846h-2.1818v-5.3846h-1.0909v-3.8847c0-.82838.66274-1.4999 1.5017-1.4999h1.3602c.82937 0 1.5017.67108 1.5017 1.4999v3.8847zm6.9584-7.2692c0 .74712-.62972 1.3462-1.4151 1.3462s-1.4151-.59904-1.4151-1.3462c0-.74712.62972-1.3462 1.4151-1.3462s1.4151.59904 1.4151 1.3462z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/toll_booth-m.svg b/data/styles/default/dark/symbols/toll_booth-m.svg
index 37c23c93a..8447e81ac 100644
--- a/data/styles/default/dark/symbols/toll_booth-m.svg
+++ b/data/styles/default/dark/symbols/toll_booth-m.svg
@@ -1,10 +1,7 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>toll_booth-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="toll_booth-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
-   <path id="Shape" d="m10.2 4-3.5 2.1v10.5h-0.7v1.4h8.4v-1.4h-0.7v-3.2156l0.98438-0.63438-0.15312-1.5312-0.83125 0.50312v-5.6219l-3.5-2.1zm-2.1 3.5h4.2v4.9h-4.2v-4.9zm11.134 0.7-0.56875 0.35 0.15312 1.5312 1.1812-0.7-0.76562-1.1812zm-1.2031 0.7-1.1812 0.76562 0.13125 1.5531 1.2031-0.7875-0.15312-1.5312zm-1.75 1.1156-1.1812 0.76562 0.13125 1.5531 1.2031-0.76562-0.15312-1.5531z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-m</title>
+    <g id="toll_booth-m" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M6.60018429,3 L3.60018429,4.8 L3.60018429,13.8 L3.00018429,13.8 L3.00018429,15 L10.2001843,15 L10.2001843,13.8 L9.60018429,13.8 L9.60018429,11.0437714 L10.4439386,10.5000171 L10.3126929,9.18756 L9.60019286,9.61880571 L9.60019286,4.80003429 L6.60019286,3 L6.60018429,3 Z M4.80018429,6 L8.40018429,6 L8.40018429,10.2 L4.80018429,10.2 L4.80018429,6 L4.80018429,6 Z M14.3436129,6.6 L13.8561129,6.9 L13.9873586,8.21245714 L14.9998157,7.61245714 L14.34357,6.6 L14.3436129,6.6 Z M13.3123843,7.2 L12.2999271,7.85624571 L12.4124271,9.18747429 L13.4436557,8.51247429 L13.31241,7.2 L13.3123843,7.2 Z M11.8123843,8.15622857 L10.7999271,8.81247429 L10.9124271,10.1437029 L11.9436557,9.48745714 L11.81241,8.15622857 L11.8123843,8.15622857 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/toll_booth-s.svg b/data/styles/default/dark/symbols/toll_booth-s.svg
index 0bb4a5c71..20a9464fb 100644
--- a/data/styles/default/dark/symbols/toll_booth-s.svg
+++ b/data/styles/default/dark/symbols/toll_booth-s.svg
@@ -1,10 +1,7 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>toll_booth-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="toll_booth-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#51585E"/>
-   <polygon id="Path" points="6.501 4 5.001 5.036 5.001 11 4 11 4 12 9 12 9 11.036 8 11 8 10.096 13 7 13 6 8 9 8.089 5.036" fill="#000"/>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-s</title>
+    <g id="toll_booth-s" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M4.50856084,0.999846424 L7.00863763,2.49992107 L7.00863763,6.51568727 L10.9615733,3.99993857 L11.5084615,4.84367877 L7.00863048,7.70319517 L7.00863048,10.0001229 L7.50864584,10.0001229 L7.50864584,11.0001536 L1.50846155,11.0001536 L1.50846155,10.0001229 L2.00847691,10.0001229 L2.00847691,2.4998925 L4.50856084,0.999846424 Z M6.00859977,3.49992321 L3.00850762,3.49992321 L3.00850762,7.00003072 L6.00859977,7.00003072 L6.00859977,3.49992321 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/vehicle_inspection-m.svg b/data/styles/default/dark/symbols/vehicle_inspection-m.svg
index 1141f5be1..9b8b34017 100644
--- a/data/styles/default/dark/symbols/vehicle_inspection-m.svg
+++ b/data/styles/default/dark/symbols/vehicle_inspection-m.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#51585E"/>
- <g stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width="1.333">
-  <path d="m12.668 4.666h5.1992-5.1992zm0 2.668h5.1992-5.1992zm0 2.666h5.1992-5.1992z" fill="none"/>
-  <path d="m4.6666 8.6666 1.3333 2.6666 4-7.9999" fill="none"/>
-  <path d="m16.666 19.333v-4l-1.3333-2.6666h-6.6666l-1.3333 2.6666v4" fill="none"/>
-  <path d="m7.3333 15.333h9.3332v2.6666h-9.3332z" fill="#000"/>
- </g>
- <circle cx="8.6666" cy="16.666" r=".66666" fill="#51585E"/>
- <circle cx="15.333" cy="16.666" r=".66666" fill="#51585E"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#574469" r="11"/><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"><g fill="none"><path d="m12.668 4.666h5.1992zm0 2.668h5.1992zm0 2.666h5.1992z"/><path d="m4.6666 8.6666 1.3333 2.6666 4-7.9999"/><path d="m16.666 19.333v-4l-1.3333-2.6666h-6.6666l-1.3333 2.6666v4"/></g><path d="m7.3333 15.333h9.3332v2.6666h-9.3332z" fill="#000"/></g><g fill="#574469"><circle cx="8.6666" cy="16.666" r=".66666"/><circle cx="15.333" cy="16.666" r=".66666"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/volleyball-centre-m.svg b/data/styles/default/dark/symbols/volleyball-centre-m.svg
new file mode 100644
index 000000000..bb25a0096
--- /dev/null
+++ b/data/styles/default/dark/symbols/volleyball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9 3.375c-3.105 0-5.625 2.52-5.625 5.625s2.52 5.625 5.625 5.625 5.625-2.52 5.625-5.625-2.52-5.625-5.625-5.625zm.5625 1.164375c1.726875.21375 3.133125 1.4175 3.67875 3.015l-3.67875-2.12625zm-2.8125.568125c.66375-.388125 1.873125-.59625 1.6875-.57375v4.134375l-1.6875.973125zm-1.895625 5.63625c-.225-.54-.354375-1.125-.354375-1.74375 0-1.13625.4275-2.17125 1.125-2.964375v4.26375zm.568125.973125 3.5775-2.07 1.6875.973125-3.92625 2.266875c-.523125-.298125-.97875-.691875-1.33875-1.17zm3.5775 1.783125c-.30375 0-.601875-.03375-.88875-.09l3.70125-2.1375.765.43875c-.82125 1.085625-2.115 1.78875-3.5775 1.78875zm.5625-4.82625v-1.94625l3.9375 2.278125c0 .61875-.129375 1.20375-.354375 1.738125z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/volleyball-m.svg b/data/styles/default/dark/symbols/volleyball-m.svg
index 055d43fbe..5c100c152 100644
--- a/data/styles/default/dark/symbols/volleyball-m.svg
+++ b/data/styles/default/dark/symbols/volleyball-m.svg
@@ -1,7 +1 @@
-<svg enable-background="new 0 0 24 24" fill="#000000" version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <g>
-   <path d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 1.863c2.763 0.342 5.013 2.268 5.886 4.824l-5.886-3.402zm-4.5 0.909c1.062-0.621 2.997-0.954 2.7-0.918v6.615l-2.7 1.557zm-3.033 9.018c-0.36-0.864-0.567-1.8-0.567-2.79 0-1.818 0.684-3.474 1.8-4.743v6.822zm0.909 1.557 5.724-3.312 2.7 1.557-6.282 3.627c-0.837-0.477-1.566-1.107-2.142-1.872zm4.302 2.709m1.422 0.144c-0.486 0-0.963-0.054-1.422-0.144l5.922-3.42 1.224 0.702c-1.314 1.737-3.384 2.862-5.724 2.862zm0.9-7.722v-3.114l6.3 3.645c0 0.99-0.207 1.926-0.567 2.781z" fill="#777777" stroke-width=".9"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c-3.726 0-6.75 3.024-6.75 6.75s3.024 6.75 6.75 6.75 6.75-3.024 6.75-6.75-3.024-6.75-6.75-6.75zm.675 1.39725c2.07225.2565 3.75975 1.701 4.4145 3.618l-4.4145-2.5515zm-3.375.68175c.7965-.46575 2.24775-.7155 2.025-.6885v4.96125l-2.025 1.16775zm-2.27475 6.7635c-.27-.648-.42525-1.35-.42525-2.0925 0-1.3635.513-2.6055 1.35-3.55725v5.1165zm.68175 1.16775 4.293-2.484 2.025 1.16775-4.7115 2.72025c-.62775-.35775-1.1745-.83025-1.6065-1.404zm4.293 2.13975c-.3645 0-.72225-.0405-1.0665-.108l4.4415-2.565.918.5265c-.9855 1.30275-2.538 2.1465-4.293 2.1465zm.675-5.7915v-2.3355l4.725 2.73375c0 .7425-.15525 1.4445-.42525 2.08575z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/waterfall-m.svg b/data/styles/default/dark/symbols/waterfall-m.svg
index 870e1d31a..635eb39b2 100644
--- a/data/styles/default/dark/symbols/waterfall-m.svg
+++ b/data/styles/default/dark/symbols/waterfall-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>waterfall-m</title>
- <g fill="none" fill-rule="evenodd" opacity=".6">
-  <g transform="matrix(1.5,0,0,1.5,-6,-6)" fill-rule="nonzero">
-   <g transform="translate(.48187 1.2332)" fill="#14a0c2">
-    <path d="m6.5337 14c1.1503 0 1.9171 0.51148 2.6839 0.51123 0.76684 2.56e-4 1.1503-0.51123 2.3005-0.51123s1.5337 0.51097 2.3005 0.51123c0.76684 2.56e-4 1.5337-0.51123 2.6839-0.51123 0.50348 0 1.0417 0.19335 1.5337 0.31952v1.0385s-0.99562-0.33552-1.5337-0.33552c-0.76684 0-1.5337 0.51123-2.6839 0.51123s-1.5337-0.51097-2.3005-0.51123c-0.78714 0.01774-1.1503 0.51123-2.3005 0.51123-1.1503 0-1.9171-0.51148-2.6839-0.51123-0.76684 2.56e-4 -1.5337 0.33552-1.5337 0.33552v-1.0385c0.5063-0.11252 1.0014-0.31952 1.5337-0.31952zm-1.5337 2.3195c0.5063-0.11252 1.0014-0.31952 1.5337-0.31952 1.1503 0 1.9171 0.51148 2.6839 0.51123 0.76684 2.56e-4 1.1503-0.51123 2.3005-0.51123s1.5337 0.51097 2.3005 0.51123c0.76684 2.56e-4 1.5337-0.51123 2.6839-0.51123 0.50348 0 1.0417 0.19335 1.5337 0.31952v1.0385s-0.99562-0.33552-1.5337-0.33552c-0.76684 0-1.5337 0.51123-2.6839 0.51123s-1.5337-0.51097-2.3005-0.51123c-0.78714 0.01774-1.1503 0.51123-2.3005 0.51123-1.1503 0-1.9171-0.51148-2.6839-0.51123-0.76684 2.56e-4 -1.5337 0.33552-1.5337 0.33552zm5.9106-12.32c0.08439 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.91e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992c-1.91e-4 0.53307 0.38342 1.0661 0.38342 1.8658 0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.013305-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658-1.92e-4 -0.53307-0.25164-1.0661-0.25164-1.0661zm-2 0c0.084391 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.917e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992 0.38342 1.0661 0.38342 1.8658c0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.013305-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658s-0.25164-1.0661-0.25164-1.0661zm4 0c0.08439 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.91e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992c-1.91e-4 0.53307 0.38342 1.0661 0.38342 1.8658 0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.013305-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658-1.92e-4 -0.53307-0.25164-1.0661-0.25164-1.0661zm2.002 0c0.08439 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.92e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992 0.38342 1.0661 0.38342 1.8658c0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.0133-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658-1.91e-4 -0.53307-0.25164-1.0661-0.25164-1.0661z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.5337 14c1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552v-1.0385c.5063-.11252 1.0014-.31952 1.5337-.31952zm-1.5337 2.3195c.5063-.11252 1.0014-.31952 1.5337-.31952 1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552zm5.9106-12.32c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm-2 0c.084391.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.0001917.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658s-.25164-1.0661-.25164-1.0661zm4 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm2.002 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000192.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.0133-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000191-.53307-.25164-1.0661-.25164-1.0661z" fill="#0a6074" transform="matrix(1.5 0 0 1.5 -5.2772 -4.1503)"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/waterfall-s.svg b/data/styles/default/dark/symbols/waterfall-s.svg
index c62d7625b..dfc37e69f 100644
--- a/data/styles/default/dark/symbols/waterfall-s.svg
+++ b/data/styles/default/dark/symbols/waterfall-s.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>waterfall-s</title>
- <g fill="none" fill-rule="evenodd" opacity=".6">
-  <g transform="translate(-.5 -.0071245)" fill-rule="nonzero">
-   <path d="m3.3382 10.996c1.1912 0 1.9853 0.50738 2.7794 0.50712 0.79412 2.54e-4 1.1912-0.50712 2.3824-0.50712 1.1912 0 1.5882 0.50687 2.3824 0.50712 0.79412 2.54e-4 1.5882-0.50712 2.7794-0.50712 0.52139 0 1.0787 0.19179 1.5882 0.31695v1.0301s-1.031-0.33283-1.5882-0.33283c-0.79412 0-1.5882 0.50712-2.7794 0.50712-1.1912 0-1.5882-0.50687-2.3824-0.50712-0.81515 0.0176-1.1912 0.50712-2.3824 0.50712-1.1912 0-1.9853-0.50738-2.7794-0.50712-0.79412 2.53e-4 -1.5882 0.33283-1.5882 0.33283v-1.0301c0.52431-0.11162 1.0371-0.31695 1.5882-0.31695zm0 3c1.1912 0 1.9853 0.50738 2.7794 0.50712 0.79412 2.54e-4 1.1912-0.50712 2.3824-0.50712 1.1912 0 1.5882 0.50687 2.3824 0.50712 0.79412 2.54e-4 1.5882-0.50712 2.7794-0.50712 0.52139 0 1.0787 0.19179 1.5882 0.31695v1.0301s-1.031-0.33283-1.5882-0.33283c-0.79412 0-1.5882 0.50712-2.7794 0.50712-1.1912 0-1.5882-0.50687-2.3824-0.50712-0.81515 0.0176-1.1912 0.50712-2.3824 0.50712-1.1912 0-1.9853-0.50738-2.7794-0.50712-0.79412 2.53e-4 -1.5882 0.33283-1.5882 0.33283v-1.0301c0.52431-0.11162 1.0371-0.31695 1.5882-0.31695zm2.7923-13.5c0.12794 0.34913 0.36329 0.69058 0.36329 1.0576 0 0.7932-0.58155 1.322-0.58126 1.8508-2.908e-4 0.5288 0.58126 0.7932 0.58126 1.5864 0 0.7932-0.58097 1.0576-0.58126 1.5864-2.908e-4 0.5288 0.58126 1.0576 0.58126 1.8508 0 0.34719-0.21983 0.71832-0.36329 1.0576h-1.1807s0.38148-0.68656 0.38148-1.0576c0-0.5288-0.58126-1.0576-0.58126-1.8508 0-0.7932 0.58097-1.0576 0.58126-1.5864-0.02017-0.5428-0.58126-0.7932-0.58126-1.5864 0-0.7932 0.58155-1.322 0.58126-1.8508-2.906e-4 -0.5288-0.38148-1.0576-0.38148-1.0576zm3 0c0.12794 0.34913 0.36329 0.69058 0.36329 1.0576 0 0.7932-0.58155 1.322-0.58126 1.8508-2.907e-4 0.5288 0.58126 0.7932 0.58126 1.5864 0 0.7932-0.58097 1.0576-0.58126 1.5864-2.907e-4 0.5288 0.58126 1.0576 0.58126 1.8508 0 0.34719-0.21983 0.71832-0.36329 1.0576h-1.1807s0.38148-0.68656 0.38148-1.0576c0-0.5288-0.58126-1.0576-0.58126-1.8508 0-0.7932 0.58097-1.0576 0.58126-1.5864-0.02017-0.5428-0.58126-0.7932-0.58126-1.5864 0-0.7932 0.58155-1.322 0.58126-1.8508-2.905e-4 -0.5288-0.38148-1.0576-0.38148-1.0576zm3 0c0.12794 0.34913 0.36329 0.69058 0.36329 1.0576 0 0.7932-0.58156 1.322-0.58126 1.8508-2.91e-4 0.5288 0.58126 0.7932 0.58126 1.5864 0 0.7932-0.58097 1.0576-0.58126 1.5864-2.91e-4 0.5288 0.58126 1.0576 0.58126 1.8508 0 0.34719-0.21983 0.71832-0.36329 1.0576h-1.1807s0.38148-0.68656 0.38148-1.0576c0-0.5288-0.58126-1.0576-0.58126-1.8508 0-0.7932 0.58097-1.0576 0.58126-1.5864-0.02017-0.5428-0.58126-0.7932-0.58126-1.5864 0-0.7932 0.58155-1.322 0.58126-1.8508-2.91e-4 -0.5288-0.38148-1.0576-0.38148-1.0576z" fill="#14a0c2" stroke-width="1.5"/>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m2.8382 10.989c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.1918 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm0 3c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.19179 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm2.7923-13.5c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002908.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002908.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002907.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002907.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58156 1.322-.58126 1.8508-.000291.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.000291.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.000291-.5288-.38148-1.0576-.38148-1.0576z" fill="#0a6074" stroke-width="1.5"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/wholesale-m.svg b/data/styles/default/dark/symbols/wholesale-m.svg
index c63651d70..db8b86b63 100644
--- a/data/styles/default/dark/symbols/wholesale-m.svg
+++ b/data/styles/default/dark/symbols/wholesale-m.svg
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#6B425C"/>
- <g fill="#000" stroke="#6B425C" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667">
+ <circle cx="12" cy="12" r="11" fill="#574469"/>
+ <g fill="#000" stroke="#574469" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667">
   <ellipse cx="8.6666" cy="6.6666" rx="2.3331" ry="2.3333"/>
   <ellipse cx="12.667" cy="5.3333" rx="2.3331" ry="2.3333"/>
   <ellipse cx="11.333" cy="8.6666" rx="2.3331" ry="2.3333"/>
   <ellipse cx="15.333" cy="7.3333" rx="2.3331" ry="2.3333"/>
  </g>
- <rect x="4" y="9.3332" width="16" height="2.6668" fill="#6B425C" stroke="#6B425C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
+ <rect x="4" y="9.3332" width="16" height="2.6668" fill="#574469" stroke="#574469" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
  <g fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333">
   <rect x="4.6666" y="9.9999" width="14.667" height="1.3333"/>
   <rect x="4.6666" y="13.333" width="14.667" height="1.3333"/>
   <rect x="4.6666" y="16.666" width="14.667" height="1.3333"/>
  </g>
  <g stroke-linecap="round" stroke-width="1.333">
-  <rect x="5.9999" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#6B425C" stroke="#6B425C"/>
-  <rect x="15.333" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#6B425C" stroke="#6B425C"/>
+  <rect x="5.9999" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#574469" stroke="#574469"/>
+  <rect x="15.333" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#574469" stroke="#574469"/>
   <rect x="16" y="8.6665" width="1.3333" height="10.667" fill="#000" stroke="#000" stroke-linejoin="round"/>
   <rect x="6.6666" y="8.6665" width="1.3333" height="10.667" fill="#000" stroke="#000" stroke-linejoin="round"/>
  </g>
diff --git a/data/styles/default/dark/symbols/windmill-m.svg b/data/styles/default/dark/symbols/windmill-m.svg
index 7b6093c95..56ce77a0d 100644
--- a/data/styles/default/dark/symbols/windmill-m.svg
+++ b/data/styles/default/dark/symbols/windmill-m.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 12.967-2.7672 3.3823-0.24053 2.6503h6.0144l-0.23409-2.7692-2.7726-3.2633zm5.6869 0.13275-4.6388-2.949 4.6388-2.9508c0.3812-0.24337 0.41771-0.67295 0.081609-0.96149l-1.2134-1.0426c-0.33503-0.28762-0.83542-0.25535-1.1189 0.071904l-3.4351 3.9833-3.4394-3.9833c-0.28241-0.32726-0.7828-0.35952-1.1178-0.071904l-1.2155 1.0426c-0.33503 0.28762-0.29744 0.71812 0.083757 0.95964l4.642 2.9508-4.641 2.9518c-0.3812 0.24245-0.41771 0.67203-0.081609 0.96056l1.2123 1.0426c0.33503 0.28762 0.83542 0.25535 1.12-0.07006l3.4362-3.9842 3.4362 3.9815c0.28348 0.32818 0.7828 0.35952 1.1189 0.070982l1.2155-1.0408c0.3361-0.28854 0.29744-0.71904-0.083757-0.96149z" fill="#777"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12 12.967-2.7672 3.3823-.24053 2.6503h6.0144l-.23409-2.7692-2.7726-3.2633zm5.6869.13275-4.6388-2.949 4.6388-2.9508c.3812-.24337.41771-.67295.081609-.96149l-1.2134-1.0426c-.33503-.28762-.83542-.25535-1.1189.071904l-3.4351 3.9833-3.4394-3.9833c-.28241-.32726-.7828-.35952-1.1178-.071904l-1.2155 1.0426c-.33503.28762-.29744.71812.083757.95964l4.642 2.9508-4.641 2.9518c-.3812.24245-.41771.67203-.081609.96056l1.2123 1.0426c.33503.28762.83542.25535 1.12-.07006l3.4362-3.9842 3.4362 3.9815c.28348.32818.7828.35952 1.1189.070982l1.2155-1.0408c.3361-.28854.29744-.71904-.083757-.96149z" fill="#6E4426"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/yoga-centre-m.svg b/data/styles/default/dark/symbols/yoga-centre-m.svg
new file mode 100644
index 000000000..0ae413aaf
--- /dev/null
+++ b/data/styles/default/dark/symbols/yoga-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#2B5C4B" r="8.25"/><path d="m9 3.8034c-.71750073 0-1.29915.58164927-1.29915 1.29915s.58164927 1.29915 1.29915 1.29915 1.29915-.58164927 1.29915-1.29915-.58164927-1.29915-1.29915-1.29915zm-.33747 3.247875c-.38325 0-.747855.1693425-.994725.46815l-.8703 1.03905c-.94185 1.117275-2.18865 1.740675-3.643725 1.740675v1.29915c1.799325 0 3.371325-.759975 4.547025-2.1111v1.461525l-2.5209 1.007325c-.4352175.1753875-.7269375.6042075-.7269375 1.078425 0 .64308.5190525 1.162125 1.162125 1.162125h1.436175v-.3247875c0-.8964.7275225-1.6239 1.6239-1.6239h1.948725c.1818825 0 .3247875.142905.3247875.3247875s-.142905.3247875-.3247875.3247875h-1.948725c-.539145 0-.9744.4352175-.9744.9744v.3247875h4.68405c.64308 0 1.162125-.5190525 1.162125-1.162125 0-.4741875-.29175-.903075-.7269375-1.078425l-2.5209-1.007325v-1.461525c1.1757 1.351125 2.7477 2.1111 4.547025 2.1111v-1.29915c-1.455075 0-2.70195-.6233925-3.63735-1.740675l-.8703-1.03905c-.24684-.2988075-.611415-.46815-.99465-.46815z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/yoga-m.svg b/data/styles/default/dark/symbols/yoga-m.svg
index 23414fa9d..bb732ca9a 100644
--- a/data/styles/default/dark/symbols/yoga-m.svg
+++ b/data/styles/default/dark/symbols/yoga-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#51585E"/>
-	<path d="m12 5.0712a1.7322 1.7322 0 0 0-1.7322 1.7322 1.7322 1.7322 0 0 0 1.7322 1.7322 1.7322 1.7322 0 0 0 1.7322-1.7322 1.7322 1.7322 0 0 0-1.7322-1.7322zm-0.44996 4.3305c-0.511 0-0.99714 0.22579-1.3263 0.6242l-1.1604 1.3854c-1.2558 1.4897-2.9182 2.3209-4.8583 2.3209v1.7322c2.3991 0 4.4951-1.0133 6.0627-2.8148v1.9487l-3.3612 1.3431c-0.58029 0.23385-0.96925 0.80561-0.96925 1.4379 0 0.85744 0.69207 1.5495 1.5495 1.5495h1.9149v-0.43305c0-1.1952 0.97003-2.1652 2.1652-2.1652h2.5983c0.24251 0 0.43305 0.19054 0.43305 0.43305s-0.19054 0.43305-0.43305 0.43305h-2.5983c-0.71886 0-1.2992 0.58029-1.2992 1.2992v0.43305h6.2454c0.85744 0 1.5495-0.69207 1.5495-1.5495 0-0.63225-0.389-1.2041-0.96925-1.4379l-3.3612-1.3431v-1.9487c1.5676 1.8015 3.6636 2.8148 6.0627 2.8148v-1.7322c-1.9401 0-3.6026-0.83119-4.8498-2.3209l-1.1604-1.3854c-0.32912-0.39841-0.81522-0.6242-1.3262-0.6242z" fill="#000"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.000055 2.64855417c-.87694534 0-1.58785.71090466-1.58785 1.58785s.71090466 1.58785 1.58785 1.58785 1.58785-.71090466 1.58785-1.58785-.71090466-1.58785-1.58785-1.58785zm-.41246333 3.969625c-.46841667 0-.914045.20697416-1.215775.57218333l-1.0637 1.26995c-1.15115 1.36555833-2.67501667 2.1274917-4.45344167 2.1274917v1.58785c2.199175 0 4.12050833-.9288584 5.557475-2.58023337v1.78630837l-3.0811 1.231175c-.5319325.2143625-.88847917.7384758-.88847917 1.318075 0 .7859866.6343975 1.420375 1.420375 1.420375h1.755325v-.3969625c0-1.0956.88919417-1.9847667 1.98476667-1.9847667h2.381775c.2223008 0 .3969625.1746617.3969625.3969625s-.1746617.3969625-.3969625.3969625h-2.381775c-.658955 0-1.19093333.5319325-1.19093333 1.1909333v.3969625h5.72495003c.7859866 0 1.420375-.6343975 1.420375-1.420375 0-.5795625-.3565834-1.1037583-.8884792-1.318075l-3.0811-1.231175v-1.7863083c1.4369667 1.651375 3.3583 2.5802333 5.557475 2.5802333v-1.58785c-1.778425 0-3.3023833-.76192413-4.44565-2.12749163l-1.0637-1.26995c-.3016933-.36520917-.747285-.57218334-1.21568333-.57218334z" fill="#51585E"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/zoo-m.svg b/data/styles/default/dark/symbols/zoo-m.svg
index e516e5cba..130a7f420 100644
--- a/data/styles/default/dark/symbols/zoo-m.svg
+++ b/data/styles/default/dark/symbols/zoo-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>zoo-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="zoo-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
-   <path id="Path" d="m14.778 5c-1.4815 2.1538-1.692 3.9524-3.3333 5.3846-1.5679 1.368-4.4444 0.89837-4.4444 2.8718v0.71788c0 0.71798 0.74074 1.4011 0.74074 2.1538v0.71798c0 1.0769-0.37038 1.0769-0.74074 2.1538h0.74074l1.4815-2.1538v2.1538h1.1111v-4.3077h1.1111v4.3077h1.1111v-3.2308l1.1111 3.2308h0.74074l-1.1343-4.5096c0.43667-0.25825 0.39352-0.73565 0.39352-1.2339v-2.1538l1.6667-3.9488 1.6667 0.53846c0-0.050615-5.778e-4 -0.49754 0-0.53846 0 0-0.27057-0.26223-0.37037-0.35894l-1.8519-1.7949z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#802D19" r="11"/><path d="m14.778 5c-1.4815 2.1538-1.692 3.9524-3.3333 5.3846-1.5679 1.368-4.4444.89837-4.4444 2.8718v.71788c0 .71798.74074 1.4011.74074 2.1538v.71798c0 1.0769-.37038 1.0769-.74074 2.1538h.74074l1.4815-2.1538v2.1538h1.1111v-4.3077h1.1111v4.3077h1.1111v-3.2308l1.1111 3.2308h.74074l-1.1343-4.5096c.43667-.25825.39352-.73565.39352-1.2339v-2.1538l1.6667-3.9488 1.6667.53846c0-.050615-.0005778-.49754 0-.53846 0 0-.27057-.26223-.37037-.35894l-1.8519-1.7949z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/zoo-s.svg b/data/styles/default/dark/symbols/zoo-s.svg
index 54dd54cd0..ad5a9904d 100644
--- a/data/styles/default/dark/symbols/zoo-s.svg
+++ b/data/styles/default/dark/symbols/zoo-s.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>zoo-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="zoo-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
-   <path id="Path" d="m9.8519 3.3333c-0.98765 1.4359-1.128 2.6349-2.2222 3.5897-1.0453 0.91201-2.963 0.59891-2.963 1.9146v0.47858c0 0.47866 0.49383 0.93405 0.49383 1.4359v0.47866c0 0.71795-0.24692 0.71795-0.49383 1.4359h0.49383l0.98765-1.4359v1.4359h0.74074v-2.8718h0.74074v2.8718h0.74074v-2.1538l0.74074 2.1538h0.49383l-0.75618-3.0064c0.29111-0.17216 0.26235-0.49043 0.26235-0.82263v-1.4359l1.1111-2.6325 1.1111 0.35897c0-0.033744-3.852e-4 -0.33169 0-0.35897 0 0-0.18038-0.17482-0.24691-0.23929l-1.2346-1.1966z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="8" cy="8" fill="#000" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#802D19" r="7.3333"/><path d="m9.8519 3.3333c-.98765 1.4359-1.128 2.6349-2.2222 3.5897-1.0453.91201-2.963.59891-2.963 1.9146v.47858c0 .47866.49383.93405.49383 1.4359v.47866c0 .71795-.24692.71795-.49383 1.4359h.49383l.98765-1.4359v1.4359h.74074v-2.8718h.74074v2.8718h.74074v-2.1538l.74074 2.1538h.49383l-.75618-3.0064c.29111-.17216.26235-.49043.26235-.82263v-1.4359l1.1111-2.6325 1.1111.35897c0-.033744-.0003852-.33169 0-.35897 0 0-.18038-.17482-.24691-.23929l-1.2346-1.1966z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index e26efe845..d87a3e5cb 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -483,6 +483,9 @@ area|z13-[leisure=stadium],
 area|z13-[leisure=sports_centre],
 {fill-color: @sport0; fill-opacity: 1;}
 
+area|z16-[leisure=fitness_centre][sport=yoga],
+{fill-color: @sport0; fill-opacity: 0.1;}
+
 area|z14-[piste:type=snow_park],
 {fill-color: @piste; fill-opacity: 0.2;}
 
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 690e24bbe..fc939514b 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -44,7 +44,7 @@ node|z18-[office],
 {icon-image: office-m.svg;}
 
 node|z18-[craft],
-{text-color: @shop_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;icon-image: craft-m.svg;}
+{icon-image: craft-m.svg;}
 
 node|z16-[shop],
 {icon-min-distance: 10;}
@@ -443,10 +443,30 @@ node|z15[historic=castle],
 node|z16[historic=fort],
 node|z16[historic=castle],
 {icon-image: remains-m.svg;text-offset: 1;}
-node|z17-[historic=ruins][name],
 node|z17-[historic=fort],
 node|z17-[historic=castle],
 {icon-image: remains-m.svg;}
+node|z17-[historic=ruins][name],
+{icon-image: remains-m.svg;}
+
+node|z12-14[historic=castle][castle_type=castrum]
+node|z12-14[historic=castle][castle_type=defensive]
+node|z12-14[historic=castle][castle_type=fortified_church]
+node|z12-14[historic=castle][castle_type=fortress]
+node|z12-14[historic=castle][castle_type=hillfort]
+node|z12-14[historic=castle][castle_type=kremlin]
+node|z12-14[historic=castle][castle_type=shiro]
+node|z12-14[historic=fort]
+{icon-image: castle-s.svg;}
+node|z15-[historic=castle][castle_type=castrum]
+node|z15-[historic=castle][castle_type=defensive]
+node|z15-[historic=castle][castle_type=fortified_church]
+node|z15-[historic=castle][castle_type=fortress]
+node|z15-[historic=castle][castle_type=hillfort]
+node|z15-[historic=castle][castle_type=kremlin]
+node|z15-[historic=castle][castle_type=shiro]
+node|z15-[historic=fort]
+{icon-image: castle-m.svg;}
 
 node|z17-[historic=archaeological_site],
 {icon-image: archaeological-site-m.svg;}
@@ -766,7 +786,7 @@ node|z16-[barrier=turnstile],
 node|z17-[barrier=wicket_gate],
 node|z16-[barrier=cycle_barrier],
 node|z16-[amenity=nightclub],
-node|z16-[amenity=townhall],
+node|z15-[amenity=townhall],
 node|z16-[amenity=bank],
 node|z16-[amenity=taxi],
 node|z16-[leisure=dog_park],
@@ -800,7 +820,7 @@ node|z17-[amenity=social_facility],
 node|z17-[amenity=animal_shelter],
 node|z17-[amenity=kindergarten],
 node|z17-[amenity=childcare],
-node|z17-[amenity=school],
+node|z16-[amenity=school],
 node|z17-[amenity=driving_school],
 node|z17-[amenity=language_school],
 node|z17-[amenity=music_school],
@@ -826,6 +846,39 @@ node|z17-[amenity=parcel_locker],
 node|z17-[amenity=public_bath],
 node|z17-[aeroway=gate],
 node|z17-[sport],
+node|z16-[leisure=sports_centre],
+node|z16-[leisure=sports_centre][sport=american_football],
+node|z16-[leisure=sports_centre][sport=basketball],
+node|z16-[leisure=sports_centre][sport=baseball],
+node|z16-[leisure=sports_centre][sport=equestrian],
+node|z16-[leisure=sports_centre][sport=soccer],
+node|z16-[leisure=sports_centre][sport=futsal],
+node|z16-[leisure=sports_centre][sport=tennis],
+node|z16-[leisure=sports_centre][sport=skiing],
+node|z16-[leisure=sports_centre][sport=archery],
+node|z16-[leisure=sports_centre][sport=shooting],
+node|z16-[leisure=sports_centre][sport=australian_football],
+node|z16-[leisure=sports_centre][sport=cricket],
+node|z16-[leisure=sports_centre][sport=curling],
+node|z16-[leisure=sports_centre][sport=scuba_diving],
+node|z16-[leisure=sports_centre][sport=climbing],
+node|z16-[leisure=sports_centre][sport=golf],
+node|z16-[leisure=sports_centre][sport=skateboard],
+node|z16-[leisure=sports_centre][sport=table_tennis],
+node|z16-[leisure=sports_centre][sport=volleyball],
+node|z16-[leisure=sports_centre][sport=beachvolleyball],
+node|z16-[leisure=sports_centre][sport=yoga],
+node|z16-[leisure=sports_centre][sport=padel],
+node|z16-[leisure=sports_centre][sport=handball],
+node|z16-[leisure=sports_centre][sport=ice_hockey],
+node|z16-[leisure=sports_centre][sport=field_hockey],
+node|z16-[leisure=sports_centre][sport=badminton],
+node|z16-[leisure=sports_centre][sport=pelota],
+node|z16-[leisure=sports_centre][sport=multi],
+node|z16-[leisure=sports_centre][sport=athletics],
+node|z16-[leisure=sports_centre][sport=gymnastics],
+node|z16-[leisure=sports_centre][sport=bowls],
+node|z15-[leisure=sports_centre][sport=swimming],
 node|z17-[highway=ladder],
 node|z18-[amenity=dojo],
 node|z18-[amenity=vending_machine],
@@ -840,6 +893,7 @@ node|z18-[amenity=bureau_de_change],
 node|z18-[amenity=money_transfer],
 node|z18-[amenity=waste_disposal],
 node|z18-[amenity=recycling],
+node|z16-[amenity=recycling][recycling_type=centre],
 node|z18-[amenity=waste_transfer_station],
 node|z18-[amenity=hunting_stand],
 node|z18-[building=guardhouse],
@@ -978,7 +1032,7 @@ node|z17-[amenity=childcare],
 {icon-image: kindergarten-m.svg;}
 node|z18-[amenity=childcare],
 {font-size: 11;}
-node|z17-[amenity=school],
+node|z16-[amenity=school],
 {icon-image: school-m.svg;}
 node|z18-[amenity=school],
 {font-size: 11;}
@@ -1005,16 +1059,17 @@ node|z17-[leisure=pitch],
 node|z17-[leisure=ice_rink]
 {icon-image: pitch-m.svg;icon-min-distance: 10;}
 node|z17-[leisure=fitness_station]
-{icon-image: fitness_station-m.svg;icon-min-distance: 10;}
-node|z17-[leisure=sports_centre]
+{icon-image: fitness-m.svg;icon-min-distance: 10;}
+node|z16-[leisure=sports_centre],
+{icon-image: sports_centre-m.svg;icon-min-distance: 9;}
 node|z17-[leisure=sports_hall]
 {icon-image: sports_centre-m.svg;icon-min-distance: 10;}
-node|z17-[leisure=dance]
+node|z16-[leisure=dance]
 {icon-image: dance-m.svg;icon-min-distance: 10;}
-node|z17-[leisure=fitness_centre]
+node|z16-[leisure=fitness_centre]
 {icon-image: fitness_centre-m.svg;icon-min-distance: 10;}
 node|z17-[leisure=sauna]
-{icon-image: public_bath-m.svg;icon-min-distance: 10;}
+{icon-image: sauna-m.svg;icon-min-distance: 10;}
 node|z17-[leisure=playground],
 {icon-image: playground-m.svg;font-size: 11;icon-min-distance: 10;}
 node|z17-[leisure=swimming_pool],
@@ -1022,76 +1077,136 @@ node|z17-[leisure=swimming_pool],
 node|z17-[leisure=swimming_pool][access=private],
 {icon-image: zero-icon.svg;}
 node|z15-[leisure=golf_course],
-node|z17-[leisure=miniature_golf],
 {icon-image: golf-m.svg;icon-min-distance: 10;}
+node|z16-[leisure=miniature_golf],
+{icon-image: golf-centre-m.svg;icon-min-distance: 10;}
 
-node|z17-[amenity=dojo]
-{icon-image: martial-arts-m.svg;}
+node|z16-[amenity=dojo]
+{icon-image: martial-arts-centre-m.svg;}
 
 node|z17-[sport],
 {icon-image: pitch-m.svg; icon-min-distance: 10; }
 
 node|z17-[sport=american_football],
 {icon-image: america-football-m.svg;}
+node|z16-[leisure=sports_centre][sport=american_football],
+{icon-image: america-football-centre-m.svg;}
 node|z17-[sport=basketball],
 {icon-image: basketball-m.svg;}
+node|z16-[leisure=sports_centre][sport=basketball],
+{icon-image: basketball-centre-m.svg;}
 node|z17-[sport=baseball],
 {icon-image: baseball-m.svg;}
+node|z16-[leisure=sports_centre][sport=baseball],
+{icon-image: baseball-centre-m.svg;}
 node|z17-[sport=equestrian],
 {icon-image: equestrian-m.svg;}
+node|z16-[leisure=sports_centre][sport=equestrian],
+{icon-image: equestrian-centre-m.svg;}
 node|z17-[sport=soccer],
+node|z17-[sport=futsal],
 {icon-image: soccer-m.svg;}
+node|z16-[leisure=sports_centre][sport=soccer],
+node|z16-[leisure=sports_centre][sport=futsal],
+{icon-image: soccer-centre-m.svg;}
 node|z17-[sport=tennis],
 {icon-image: tennis-m.svg;}
+node|z16-[leisure=sports_centre][sport=tennis],
+{icon-image: tennis-centre-m.svg;}
 node|z17-[sport=skiing],
 {icon-image: skiing-m.svg;}
+node|z16-[leisure=sports_centre][sport=skiing],
+{icon-image: skiing-centre-m.svg;}
 node|z17-[sport=archery],
-{icon-image: archery-m.svg;}
 node|z17-[sport=shooting],
 {icon-image: archery-m.svg;}
+node|z16-[leisure=sports_centre][sport=archery],
+node|z16-[leisure=sports_centre][sport=shooting],
+{icon-image: archery-centre-m.svg;}
 node|z17-[sport=australian_football],
 {icon-image: australian-football-m.svg;}
+node|z16-[leisure=sports_centre][sport=australian_football],
+{icon-image: australian-football-centre-m.svg;}
 node|z17-[sport=cricket],
 {icon-image: cricket-m.svg;}
+node|z16-[leisure=sports_centre][sport=cricket],
+{icon-image: cricket-centre-m.svg;}
 node|z17-[sport=curling],
 {icon-image: curling-m.svg;}
+node|z16-[leisure=sports_centre][sport=curling],
+{icon-image: curling-centre-m.svg;}
 node|z17-[sport=scuba_diving],
 {icon-image: diving-m.svg;}
+node|z16-[leisure=sports_centre][sport=scuba_diving],
+{icon-image: diving-centre-m.svg;}
 node|z17-[sport=9pin],
-{icon-image: bowling-m.svg;}
 node|z17-[sport=10pin],
 {icon-image: bowling-m.svg;}
 node|z17-[sport=chess],
 {icon-image: chess-m.svg;}
 node|z17-[sport=climbing],
 {icon-image: climbing-m.svg;}
+node|z16-[leisure=sports_centre][sport=climbing],
+{icon-image: climbing-centre-m.svg;}
 node|z17-[sport=golf],
 {icon-image: golf-m.svg;}
+node|z16-[leisure=sports_centre][sport=golf],
+{icon-image: golf-centre-m.svg;}
 node|z17-[sport=skateboard],
 {icon-image: skateboard-m.svg;}
+node|z16-[leisure=sports_centre][sport=skateboard],
+{icon-image: skateboard-centre-m.svg;}
 node|z17-[sport=swimming],
 {icon-image: swimming-m.svg;}
+node|z15-[leisure=sports_centre][sport=swimming],
+{icon-image: swimming-centre-m.svg; icon-min-distance: 8; }
 node|z17-[sport=table_tennis],
 {icon-image: table-tennis-m.svg;}
+node|z16-[leisure=sports_centre][sport=table_tennis],
+{icon-image: table-tennis-centre-m.svg;}
 node|z17-[sport=volleyball],
 node|z17-[sport=beachvolleyball],
 {icon-image: volleyball-m.svg;}
+node|z16-[leisure=sports_centre][sport=volleyball],
+node|z16-[leisure=sports_centre][sport=beachvolleyball],
+{icon-image: volleyball-centre-m.svg;}
 node|z17-[sport=yoga],
 {icon-image: yoga-m.svg;}
+node|z16-[leisure=sports_centre][sport=yoga],
+node|z16-[leisure=fitness_centre][sport=yoga],
+{icon-image: yoga-centre-m.svg;}
 node|z17-[sport=padel],
 {icon-image: padel-m.svg;}
+node|z16-[leisure=sports_centre][sport=padel],
+{icon-image: padel-centre-m.svg;}
 node|z17-[sport=handball],
 {icon-image: handball-m.svg;}
-node|z17-[sport=futsal],
-{icon-image: soccer-m.svg;}
+node|z16-[leisure=sports_centre][sport=handball],
+{icon-image: handball-centre-m.svg;}
 node|z17-[sport=ice_hockey],
-{icon-image: hockey-m.svg;}
 node|z17-[sport=field_hockey],
 {icon-image: hockey-m.svg;}
+node|z16-[leisure=sports_centre][sport=ice_hockey],
+node|z16-[leisure=sports_centre][sport=field_hockey],
+{icon-image: hockey-centre-m.svg;}
 node|z17-[sport=badminton],
 {icon-image: badminton-m.svg;}
+node|z16-[leisure=sports_centre][sport=badminton],
+{icon-image: badminton-centre-m.svg;}
 node|z17-[sport=pelota],
 {icon-image: pelota-m.svg;}
+node|z16-[leisure=sports_centre][sport=pelota],
+{icon-image: pelota-centre-m.svg;}
+node|z17-[sport=multi],
+node|z17-[sport=athletics],
+node|z17-[sport=gymnastics],
+node|z17-[sport=bowls],
+{icon-image: pitch-m.svg;}
+node|z16-[leisure=sports_centre][sport=multi],
+node|z16-[leisure=sports_centre][sport=athletics],
+node|z16-[leisure=sports_centre][sport=gymnastics],
+node|z16-[leisure=sports_centre][sport=bowls],
+{icon-image: sports_centre-m.svg;}
 
 node|z18-[sport],
 {font-size: 11; }
@@ -1177,7 +1292,7 @@ node|z16-[amenity=fountain],
 node|z19-[amenity=fountain],
 {icon-image: fountain-m.svg;icon-min-distance: 20;}
 
-node|z14[man_made=lighthouse],
+node|z13-14[man_made=lighthouse],
 {icon-image: lighthouse-s.svg;text-offset: 1;icon-min-distance: 5;}
 node|z15-[man_made=lighthouse],
 {icon-image: lighthouse-m.svg;}
@@ -1312,7 +1427,8 @@ node|z17-[amenity=prison],
 node|z18-[amenity=prison],
 {font-size: 11;}
 
-node|z16-[amenity=townhall],
+node|z15-[amenity=townhall],
+{icon-image: public-building-m.svg;}
 node|z17-[office=diplomatic],
 {icon-image: embassy-m.svg;}
 node|z17-[amenity=townhall],
@@ -1367,6 +1483,10 @@ node|z17-[amenity=telephone]
 node|z17-[emergency=phone]
 {icon-image: emergency-phone-m.svg;}
 
+
+node|z16-[amenity=recycling][recycling_type=centre],
+{icon-image: recycling-centre-m.svg;}
+
 node|z17-[amenity=recycling],
 node|z17-[amenity=waste_transfer_station],
 {icon-image: recycling-m.svg;}
@@ -1386,7 +1506,7 @@ node|z18-[power=generator][generator:source=wind],
 node|z15-[power=plant][plant:source=wind],
 {icon-image: power_plant_wind-m.svg;}
 node|z16-[power=plant][plant:source=wind],
-{text: name;text-color: @industry_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
+{text: name;text-color: @neutral_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
 
 node|z17-[amenity=shower],
 {icon-image: shower-m.svg;}
@@ -1561,6 +1681,9 @@ node|z16-[shop=sports],
 node|z16-[shop=ticket],
 node|z16-[shop=toys],
 node|z16-[shop=stationery],
+node|z16-[shop=agrarian],
+node|z16-[shop=trade],
+node|z16-[shop=gas],
 node|z17-[shop=variety_store],
 node|z17-[shop=money_lender],
 node|z17-[shop=pawnbroker],
@@ -1589,6 +1712,10 @@ node|z16[shop=supermarket],
 node|z17-[shop=supermarket],
 {icon-image: supermarket-m.svg;font-size: 11;icon-min-distance: 8;}
 
+node|z16[shop=agrarian],
+node|z16[shop=trade],
+node|z16[shop=gas],
+{icon-image: shop-industry-m.svg;}
 node|z16[shop=cheese],
 {icon-image: cheese-m.svg;}
 node|z16-[shop=pasta],
@@ -1733,6 +1860,10 @@ node|z16[shop=rental],
 node|z16[shop=rental][rental=bike],
 {icon-image: shop-rental-bicycle-m.svg;}
 
+node|z17-[shop=agrarian],
+node|z17-[shop=trade],
+node|z17-[shop=gas],
+{icon-image: shop-industry-m.svg;icon-min-distance: 24;}
 node|z17-[shop=cheese],
 {icon-image: cheese-m.svg;icon-min-distance: 24;}
 node|z17-[shop=alcohol],
@@ -1879,7 +2010,7 @@ node|z17-[shop=massage],
 node|z17-[shop=money_lender],
 {icon-image: bank-m.svg;icon-min-distance: 24;}
 node|z17-[shop=pawnbroker],
-{icon-image: bookmaker-m.svg;icon-min-distance: 24;}
+{icon-image: shop-m.svg;icon-min-distance: 24;}
 node|z17-[shop=rental],
 {icon-image: rental-m.svg;icon-min-distance: 24;}
 node|z17-[shop=rental][rental=bike],
@@ -1953,7 +2084,10 @@ area|z15-[highway=rest_area],
 {text-position: center;}
 
 node|z14-[amenity=fuel],
-node|z14-[amenity=charging_station][motorcar?],
+node|z15-[amenity=charging_station][motorcar?][!capacity],
+node|z15-[amenity=charging_station][motorcar?][capacity=1],
+node|z15-[amenity=charging_station][motorcar?][capacity=2],
+node|z14-[amenity=charging_station][motorcar?][capacity?],
 area|z14-[highway=services],
 area|z15-[highway=rest_area],
 area|z15-[landuse=garages],
@@ -1981,14 +2115,23 @@ node|z17-[amenity=fuel],
 node|z18-[amenity=fuel],
 {font-size: 11;}
 
-node|z14[amenity=charging_station][motorcar?],
-{icon-image: charging-station-s.svg;text-offset: 1;font-size: 10;icon-min-distance: 20;}
-node|z15[amenity=charging_station][motorcar?],
-{icon-image: charging-station-m.svg;icon-min-distance: 20;}
-node|z16[amenity=charging_station],
-{icon-image: charging-station-m.svg;icon-min-distance: 10;}
-node|z17-[amenity=charging_station],
+node|z15-[amenity=charging_station][motorcar?][!capacity],
+node|z15-[amenity=charging_station][motorcar?][capacity=1],
+node|z15-[amenity=charging_station][motorcar?][capacity=2],
+node|z16-[amenity=charging_station],
+{icon-image: charging-point-m.svg;}
+
+node|z14[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging-station-s.svg;}
+node|z15-[amenity=charging_station][motorcar?][capacity?],
 {icon-image: charging-station-m.svg;}
+
+node|z14[amenity=charging_station][motorcar?][capacity?],
+{text-offset: 1;font-size: 10;icon-min-distance: 20;}
+node|z15[amenity=charging_station][motorcar?],
+{icon-min-distance: 20;}
+node|z16[amenity=charging_station],
+{icon-min-distance: 10;}
 node|z18-[amenity=charging_station],
 {font-size: 11;}
 
@@ -2091,145 +2234,83 @@ node|z18-[amenity=parking_space][parking_space=disabled],
 
 /* 8. Colored Labels */
 
-node[shop=mall],
-node[amenity=studio],
-node[shop=alcohol],
-node[shop=antiques],
-node[shop=art],
-node[shop=bakery],
-node[shop=beauty],
-node[shop=beverages],
-node[shop=bicycle],
-node[shop=bookmaker],
-node[shop=books],
-node[shop=butcher],
-node[shop=camera],
-node[shop=car],
-node[shop=caravan],
-node[shop=charity],
-node[shop=cheese],
-node[shop=chemist],
-node[shop=chocolate],
-node[shop=clothes],
-node[shop=computer],
-node[shop=confectionery],
-node[shop=convenience],
-node[shop=copyshop],
-node[shop=cosmetics],
-node[shop=deli],
-node[shop=department_store],
-node[shop=doityourself],
-node[shop=dry_cleaning],
-node[shop=electronics],
-node[shop=erotic],
-node[shop=farm],
-node[shop=florist],
-node[shop=furniture],
-node[shop=garden_centre],
-node[shop=gift],
-node[shop=greengrocer],
-node[shop=grocery],
-node[shop=hairdresser],
-node[shop=hardware],
-node[shop=health_food],
-node[shop=houseware],
-node[shop=interior_decoration],
-node[shop=lighting],
-node[shop=jewelry],
-node[shop=kiosk],
-node[shop=kitchen],
-node[shop=laundry],
-node[amenity=marketplace],
-node[shop=mobile_phone],
-node[shop=motorcycle],
-node[shop=music],
-node[shop=musical_instrument],
-node[shop=optician],
-node[shop=outdoor],
-node[shop=pasta],
-node[shop=pastry],
-node[shop=pet],
-node[shop=photo],
-node[shop=rental],
-node[shop=rental][rental=bike],
-node[shop=seafood],
-node[shop=second_hand],
-node[shop=sewing],
-node[shop=shoes],
-node[shop=sports],
-node[shop=stationery],
-node[shop=supermarket],
-node[shop=tattoo],
-node[shop=ticket],
-node[shop=toys],
-node[shop=video],
-node[shop=video_games],
-node[shop=wine],
-node[leisure=bowling_alley],
-node[shop=variety_store],
+node[amenity=car_rental],
+node[amenity=car_sharing],
 node[amenity=internet_cafe],
+node[amenity=marketplace],
+node[amenity=motorcycle_rental],
 node[shop],
-node[shop=auction],
-node[shop=collector],
-node[shop=fabric],
-node[shop=funeral_directors],
-node[shop=hearing_aids],
-node[shop=lottery],
-node[shop=tobacco],
-node[shop=wholesale],
-node[shop=electrical],
 {text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
+node[amenity=car_wash],
+node[amenity=fuel],
+node[amenity=studio],
+node[amenity=vehicle_inspection],
+node[craft],
+node[landuse=industrial][industrial=mine],
+node[landuse=quarry],
+node[man_made=works],
+node[office],
+node[shop=agrarian],
+node[shop=car_parts],
+node[shop=car_repair],
+node[shop=car_repair][service=tyres],
+node[shop=funeral_directors],
+node[shop=gas],
+node[shop=motorcycle_repair],
+node[shop=tattoo],
+node[shop=trade],
+node[shop=tyres],
+node[shop=wholesale],
+{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[craft=tailor],
+node[craft=photographer],
+{text-color: @shop_label}
+
 node[amenity=bar],
 node[amenity=biergarten],
 node[amenity=cafe],
 node[amenity=fast_food],
 node[amenity=food_court],
-node[amenity=pub],
-node[amenity=restaurant],
 node[amenity=ice_cream],
 node[amenity=nightclub],
-node[amenity=stripclub],
+node[amenity=pub],
+node[amenity=restaurant],
 {text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-node[amenity=arts_centre],
+node[amenity=casino],
 node[amenity=cinema],
-node[amenity=community_centre],
-node[amenity=place_of_worship]
-node[amenity=social_facility],
+node[amenity=gambling],
+node[amenity=stripclub],
 node[amenity=theatre],
-node[attraction=amusement_ride],
-node[attraction=animal],
-node[attraction=big_wheel],
-node[attraction=bumper_car],
-node[attraction=carousel],
-node[attraction=historic],
-node[attraction=maze],
-node[attraction=roller_coaster],
+node[leisure=adult_gaming_centre],
+node[leisure=amusement_arcade],
+node[leisure=bowling_alley],
 node[leisure=escape_game],
-node[leisure=stadium],
+node[shop=bookmaker],
+node[shop=lottery],
 node[tourism=aquarium],
-node[tourism=attraction],
-node[tourism=gallery],
-node[tourism=museum],
 node[tourism=theme_park],
-node[tourism=zoo]
 node[tourism=zoo],
-node[historic=ship],
+{text-color: @entertainment_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=arts_centre],
+node[amenity=community_centre],
 node[amenity=conference_centre],
 node[amenity=events_venue],
 node[amenity=exhibition_centre],
-node[leisure=marina],
-node[amenity=casino],
-node[amenity=gambling],
-node[amenity=public_bath],
-node[leisure=adult_gaming_centre],
-node[leisure=amusement_arcade],
-node[shop=massage],
+node[amenity=place_of_worship]
+node[amenity=social_facility],
+node[historic=ship],
+node[leisure=hackerspace],
+node[tourism=attraction],
+node[tourism=gallery],
+node[tourism=museum],
 {text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-node[tourism=alpine_hut],
 node[leisure=resort],
+node[tourism=alpine_hut],
 node[tourism=apartment],
 node[tourism=chalet],
 node[tourism=guest_house],
@@ -2239,15 +2320,22 @@ node[tourism=motel],
 node[tourism=wilderness_hut],
 {text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-area[amenity=hospital],
-node[amenity=clinic],
-node[amenity=dentist],
-node[amenity=doctors],
-node[amenity=hospital],
-node[amenity=pharmacy],
-node[amenity=veterinary],
-node[healthcare],
-{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+node[leisure=dance],
+node[leisure=fitness_centre],
+node[leisure=sports_centre],
+node[leisure=stadium],
+{text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[landuse=plant_nursery],
+{text-color: @nature_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=public_bath],
+node[leisure=beach_resort],
+node[leisure=marina],
+node[leisure=sports_centre][sport=scuba_diving],
+node[leisure=sports_centre][sport=swimming],
+node[shop=massage],
+{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
 area[amenity=university][name]
 node[aeroway=gate],
@@ -2259,6 +2347,7 @@ node[amenity=childcare],
 node[amenity=college],
 node[amenity=courthouse],
 node[amenity=driving_school],
+node[amenity=fire_station],
 node[amenity=kindergarten],
 node[amenity=language_school],
 node[amenity=library],
@@ -2272,37 +2361,22 @@ node[amenity=school],
 node[amenity=townhall],
 node[amenity=university][name],
 node[barrier=border_control],
-node[leisure=beach_resort],
-node[leisure=hackerspace],
-node[office],
-node[amenity=fuel],
-node[landuse=industrial][industrial=mine],
-node[landuse=quarry],
-node[tourism=information][information=office],
-node[amenity=vehicle_inspection],
-node[shop=car_parts],
-node[shop=car_repair],
-node[shop=car_repair][service=tyres],
-node[shop=tyres],
-node[shop=dry_cleaning],
-node[shop=laundry],
-node[shop=motorcycle_repair],
-node[amenity=car_wash],
-node[amenity=motorcycle_rental],
-node[leisure=dance],
-node[leisure=fitness_centre],
-node[leisure=sports_centre],
-node[leisure=sports_hall],
-node[man_made=works],
-node[shop=money_lender],
-node[shop=pawnbroker],
-node[sport=yoga],
-node[amenity=car_rental],
-node[amenity=car_sharing],
-node[amenity=fire_station],
 node[building=guardhouse],
+node[office=diplomatic],
 node[office=security],
-{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+node[shop=money_lender],
+node[tourism=information][information=office],
+{text-color: @neutral_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=hospital],
+node[amenity=clinic],
+node[amenity=dentist],
+node[amenity=doctors],
+node[amenity=hospital],
+node[amenity=pharmacy],
+node[amenity=veterinary],
+node[healthcare],
+{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
 node[amenity=bicycle_rental],
 node[amenity=taxi],
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index bf30a19d2..e2421fc37 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -42,7 +42,40 @@ leisure-playground                                  # area z15- (also has icon z
 === 200
 
 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre                               # area z13- (also has icon z17-, caption(optional) z17-)
+leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
+leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
 === 190
 
 amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
@@ -53,13 +86,14 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 
 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-fire_station                                # area z15- (also has icon z18-, caption(optional) z18-)
 amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z18-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
@@ -85,7 +119,7 @@ aeroway-terminal                                    # area z14- (also has captio
 === 150
 
 leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z17-, caption(optional) z17-)
+leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
 === 140
 
 landuse-flowerbed                                   # area z16-
@@ -193,7 +227,7 @@ amenity-clinic                                      # area z13- (also has icon z
 amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
 amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
 amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
 amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index bb28c151b..db528d63a 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -305,7 +305,7 @@ highway-secondary-tunnel                            # pathtext z10- (also has sh
 === 5600
 
 man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
-man_made-lighthouse                                 # icon z14- (also has caption(optional) z14-)
+man_made-lighthouse                                 # icon z13- (also has caption(optional) z14-)
 natural-peak                                        # icon z13- (also has caption(optional) z13-)
 natural-volcano                                     # icon z12- (also has caption(optional) z13-)
 === 5400
@@ -375,6 +375,9 @@ amenity-charging_station-motorcar                   # icon z14- (also has captio
 amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
+amenity-charging_station-motorcar-small             # icon z16- (also has caption(optional) z16-, area z15-)
+=== 4260
+
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250
 
@@ -748,7 +751,7 @@ piste:type-sled                                     # pathtext z15- (also has li
 piste:type-snow_park                                # caption z15- (also has area z14-)
 === 2770
 
-amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
+amenity-townhall                                    # icon z15- (also has caption(optional) z15-)
 leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
@@ -896,7 +899,7 @@ landuse-military-danger_area                        # icon z16- (also has captio
 
 amenity-sanitary_dump_station                       # icon z15- (also has caption(optional) z15-)
 leisure-golf_course                                 # icon z15- (also has caption(optional) z17-, area z12-)
-leisure-miniature_golf                              # icon z17- (also has caption(optional) z17-, area z14-)
+leisure-miniature_golf                              # icon z16- (also has caption(optional) z17-, area z14-)
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
 natural-wetland-fen                                 # caption z16- (also has area z11-)
@@ -917,6 +920,43 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
+leisure-sports_centre-sport-swimming                # icon z15- (also has caption(optional) z15-, area z13-)
+=== 1620
+
+leisure-fitness_centre-sport-yoga                   # icon z16- (also has caption(optional) z17-, area z16-)
+leisure-sports_centre-sport-american_football       # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-archery                 # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-athletics               # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-australian_football     # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-badminton               # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-baseball                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-basketball              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-beachvolleyball         # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-bowls                   # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-climbing                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-cricket                 # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-curling                 # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-equestrian              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-field_hockey            # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-futsal                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-golf                    # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-gymnastics              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-handball                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-ice_hockey              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-multi                   # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-padel                   # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-pelota                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-scuba_diving            # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-shooting                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-skateboard              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-skiing                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-soccer                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-table_tennis            # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-tennis                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-volleyball              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-yoga                    # icon z16- (also has caption(optional) z16-, area z13-)
+=== 1610
+
 amenity-animal_shelter                              # icon z17- (also has caption(optional) z17-)
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
@@ -925,7 +965,7 @@ amenity-driving_school                              # icon z17- (also has captio
 amenity-language_school                             # icon z17- (also has caption(optional) z17-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z17-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z18-, area z15-)
+amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -939,7 +979,7 @@ healthcare-optometrist                              # icon z17- (also has captio
 healthcare-physiotherapist                          # icon z17- (also has caption(optional) z17-)
 healthcare-sample_collection                        # icon z17- (also has caption(optional) z17-)
 leisure-escape_game                                 # icon z17- (also has caption(optional) z17-)
-leisure-fitness_centre                              # icon z17- (also has caption(optional) z17-)
+leisure-fitness_centre                              # icon z16- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
 office-estate_agent                                 # icon z18- (also has caption(optional) z18-)
@@ -1000,7 +1040,7 @@ shop-video_games                                    # icon z16- (also has captio
 
 aeroway-gate                                        # icon z17- (also has caption(optional) z17-)
 amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z13-)
-amenity-school                                      # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-school                                      # icon z16- (also has caption(optional) z16-, area z13-)
 amenity-studio                                      # icon z16- (also has caption(optional) z16-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
@@ -1067,12 +1107,12 @@ sport-soccer                                        # icon z17- (also has captio
 === 1300
 
 amenity-atm                                         # icon z18- (also has caption(optional) z18-)
-amenity-dojo                                        # icon z17- (also has caption(optional) z18-)
+amenity-dojo                                        # icon z16- (also has caption(optional) z18-)
 isoline-step_50                                     # pathtext z16- (also has line z14-)
 landuse-recreation_ground                           # caption z15- (also has area z12-)
-leisure-dance                                       # icon z17- (also has caption(optional) z17-)
+leisure-dance                                       # icon z16- (also has caption(optional) z17-)
 leisure-recreation_ground                           # caption z17-
-leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z13-)
+leisure-sports_centre                               # icon z16- (also has caption(optional) z16-, area z13-)
 leisure-sports_hall                                 # icon z17- (also has caption(optional) z17-)
 === 1250
 
@@ -1160,7 +1200,7 @@ leisure-amusement_arcade                            # icon z17- (also has captio
 office-company                                      # icon z18- (also has caption(optional) z18-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
-shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
+shop-agrarian                                       # icon z16- (also has caption(optional) z16-)
 shop-auction                                        # icon z18- (also has caption(optional) z18-)
 shop-bookmaker                                      # icon z18- (also has caption(optional) z18-)
 shop-carpet                                         # icon z18- (also has caption(optional) z18-)
@@ -1170,7 +1210,7 @@ shop-curtain                                        # icon z18- (also has captio
 shop-fabric                                         # icon z18- (also has caption(optional) z18-)
 shop-fishing                                        # icon z18- (also has caption(optional) z18-)
 shop-funeral_directors                              # icon z18- (also has caption(optional) z18-)
-shop-gas                                            # icon z18- (also has caption(optional) z18-)
+shop-gas                                            # icon z16- (also has caption(optional) z16-)
 shop-hearing_aids                                   # icon z18- (also has caption(optional) z18-)
 shop-herbalist                                      # icon z18- (also has caption(optional) z18-)
 shop-hifi                                           # icon z18- (also has caption(optional) z18-)
@@ -1179,7 +1219,7 @@ shop-medical_supply                                 # icon z18- (also has captio
 shop-outpost                                        # icon z18- (also has caption(optional) z18-)
 shop-pet_grooming                                   # icon z18- (also has caption(optional) z18-)
 shop-storage_rental                                 # icon z18- (also has caption(optional) z18-)
-shop-trade                                          # icon z18- (also has caption(optional) z18-)
+shop-trade                                          # icon z16- (also has caption(optional) z16-)
 shop-watches                                        # icon z18- (also has caption(optional) z18-)
 shop-wholesale                                      # icon z18- (also has caption(optional) z18-)
 === 500
@@ -1475,7 +1515,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -4200
 
 # man_made-communications_tower                     # caption(optional) z15- (also has icon z14-)
-# man_made-lighthouse                               # caption(optional) z14- (also has icon z14-)
+# man_made-lighthouse                               # caption(optional) z14- (also has icon z13-)
 # natural-peak                                      # caption(optional) z13- (also has icon z13-)
 # natural-volcano                                   # caption(optional) z13- (also has icon z12-)
 # === -4600
@@ -1543,6 +1583,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
+# amenity-charging_station-motorcar-small           # caption(optional) z16- (also has icon z16-, area z15-)
+# === -5740
+
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750
 
@@ -1741,7 +1784,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # natural-rock                                      # caption(optional) z17- (also has icon z17-)
 # === -7150
 
-# amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
+# amenity-townhall                                  # caption(optional) z15- (also has icon z15-)
 # leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250
@@ -1880,10 +1923,47 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
 # leisure-golf_course                               # caption(optional) z17- (also has icon z15-, area z12-)
-# leisure-miniature_golf                            # caption(optional) z17- (also has icon z17-, area z14-)
+# leisure-miniature_golf                            # caption(optional) z17- (also has icon z16-, area z14-)
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
+# leisure-sports_centre-sport-swimming              # caption(optional) z15- (also has icon z15-, area z13-)
+# === -8380
+
+# leisure-fitness_centre-sport-yoga                 # caption(optional) z17- (also has icon z16-, area z16-)
+# leisure-sports_centre-sport-american_football     # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-archery               # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-athletics             # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-australian_football   # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-badminton             # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-baseball              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-basketball            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-beachvolleyball       # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-bowls                 # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-climbing              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-cricket               # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-curling               # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-equestrian            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-field_hockey          # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-futsal                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-golf                  # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-gymnastics            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-handball              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-ice_hockey            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-multi                 # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-padel                 # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-pelota                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-scuba_diving          # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-shooting              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-skateboard            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-skiing                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-soccer                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-table_tennis          # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-tennis                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-volleyball            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-yoga                  # caption(optional) z16- (also has icon z16-, area z13-)
+# === -8390
+
 # amenity-animal_shelter                            # caption(optional) z17- (also has icon z17-)
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
@@ -1892,7 +1972,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-language_school                           # caption(optional) z17- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z17- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z18- (also has icon z17-, area z15-)
+# amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -1906,7 +1986,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-physiotherapist                        # caption(optional) z17- (also has icon z17-)
 # healthcare-sample_collection                      # caption(optional) z17- (also has icon z17-)
 # leisure-escape_game                               # caption(optional) z17- (also has icon z17-)
-# leisure-fitness_centre                            # caption(optional) z17- (also has icon z17-)
+# leisure-fitness_centre                            # caption(optional) z17- (also has icon z16-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
 # office-estate_agent                               # caption(optional) z18- (also has icon z18-)
@@ -1967,7 +2047,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # aeroway-gate                                      # caption(optional) z17- (also has icon z17-)
 # amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z13-)
-# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-school                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # amenity-studio                                    # caption(optional) z16- (also has icon z16-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
@@ -2033,9 +2113,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8700
 
 # amenity-atm                                       # caption(optional) z18- (also has icon z18-)
-# amenity-dojo                                      # caption(optional) z18- (also has icon z17-)
-# leisure-dance                                     # caption(optional) z17- (also has icon z17-)
-# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-dojo                                      # caption(optional) z18- (also has icon z16-)
+# leisure-dance                                     # caption(optional) z17- (also has icon z16-)
+# leisure-sports_centre                             # caption(optional) z16- (also has icon z16-, area z13-)
 # leisure-sports_hall                               # caption(optional) z17- (also has icon z17-)
 # === -8750
 
@@ -2104,7 +2184,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # office-company                                    # caption(optional) z18- (also has icon z18-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
-# shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
+# shop-agrarian                                     # caption(optional) z16- (also has icon z16-)
 # shop-auction                                      # caption(optional) z18- (also has icon z18-)
 # shop-bookmaker                                    # caption(optional) z18- (also has icon z18-)
 # shop-carpet                                       # caption(optional) z18- (also has icon z18-)
@@ -2114,7 +2194,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-fabric                                       # caption(optional) z18- (also has icon z18-)
 # shop-fishing                                      # caption(optional) z18- (also has icon z18-)
 # shop-funeral_directors                            # caption(optional) z18- (also has icon z18-)
-# shop-gas                                          # caption(optional) z18- (also has icon z18-)
+# shop-gas                                          # caption(optional) z16- (also has icon z16-)
 # shop-hearing_aids                                 # caption(optional) z18- (also has icon z18-)
 # shop-herbalist                                    # caption(optional) z18- (also has icon z18-)
 # shop-hifi                                         # caption(optional) z18- (also has icon z18-)
@@ -2123,7 +2203,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-outpost                                      # caption(optional) z18- (also has icon z18-)
 # shop-pet_grooming                                 # caption(optional) z18- (also has icon z18-)
 # shop-storage_rental                               # caption(optional) z18- (also has icon z18-)
-# shop-trade                                        # caption(optional) z18- (also has icon z18-)
+# shop-trade                                        # caption(optional) z16- (also has icon z16-)
 # shop-watches                                      # caption(optional) z18- (also has icon z18-)
 # shop-wholesale                                    # caption(optional) z18- (also has icon z18-)
 # === -9500
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index ff1323deb..51bfd0191 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -229,11 +229,16 @@
 @subway_label: #333333;
 @indigenous_label: #6A512F;
 @shop_label: #8C5678;
+@industry_label: #907E9E;
 @food_label: #BA7141;
+@entertainment_label: #D16B53;
 @culture_label: #82512D;
 @hotel_label: #54413B;
+@sport_label: #459177;
+@nature_label: #40662A;
+@water_label: #06829E;
+@neutral_label: #494F54;
 @healthcare_label: #A6454B;
-@industry_label: #494F54;
 @public_transport_label: #234B73;
 
 /* 6.4 Road labels */
diff --git a/data/styles/default/light/symbols/america-football-centre-m.svg b/data/styles/default/light/symbols/america-football-centre-m.svg
new file mode 100644
index 000000000..107ce767a
--- /dev/null
+++ b/data/styles/default/light/symbols/america-football-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m3.375 9c.354075.878875.9090625 1.657375 1.607125 2.275125v-4.55025c-.698125.61774375-1.2530625 1.3961875-1.607125 2.275125zm11.25 0c-.354075-.8789375-.9090625-1.657375-1.607125-2.275125v4.55025c.698125-.6177438 1.2530625-1.3961875 1.607125-2.275125zm-5.625-3.790625c-1.18275 0-2.285125.33649375-3.2143125.9165625v5.7480625c.929125.580075 2.0315.9165625 3.2143125.9165625s2.285125-.3364938 3.2143125-.9165625v-5.7480625c-.8576538-.53545385-1.862929-.86335385-2.9428259-.91063163zm2.4106875 2.5865v2.4106875h-.8035625v-.8035625h-1.205375v.8035625h-.8035625v-.8035625h-1.205375v.8035625h-.8035625v-2.4106875h.8035625v.8035625h1.205375v-.8035625h.8035625v.8035625h1.205375v-.8035625z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/america-football-m.svg b/data/styles/default/light/symbols/america-football-m.svg
index f2c63565f..e7f537dd9 100644
--- a/data/styles/default/light/symbols/america-football-m.svg
+++ b/data/styles/default/light/symbols/america-football-m.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>america-football-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="america-football-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(6 9.6071)" fill="#747E86">
-    <path id="Path" d="m-3 2.3929c0.56652 1.4062 1.4545 2.6518 2.5714 3.6402v-7.2804c-1.117 0.98839-2.0049 2.2339-2.5714 3.6402z"/>
-    <path d="m15 2.3929c-0.56652-1.4063-1.4545-2.6518-2.5714-3.6402v7.2804c1.117-0.98839 2.0049-2.2339 2.5714-3.6402z"/>
-    <path id="Shape" transform="translate(-6 -9.6071)" d="m12 5.935c-1.8924 0-3.6562 0.53839-5.1429 1.4665v9.1969c1.4866 0.92812 3.2504 1.4665 5.1429 1.4665s3.6562-0.53839 5.1429-1.4665v-9.1969c-1.4866-0.92812-3.2504-1.4665-5.1429-1.4665zm3.8571 5.4241v2.5714h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-1.2857h-1.9286v1.2857h-1.2857v-3.8571h1.2857v1.2857h1.9286v-1.2857h1.2857v1.2857h1.9286v-1.2857h1.2857z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m2.25 9c.42489 1.05465 1.090875 1.98885 1.92855 2.73015v-5.4603c-.83775.7412925-1.503675 1.675425-1.92855 2.73015zm13.5 0c-.42489-1.054725-1.090875-1.98885-1.92855-2.73015v5.4603c.83775-.7412925 1.503675-1.675425 1.92855-2.73015zm-6.75-4.54875c-1.4193 0-2.74215.4037925-3.857175 1.099875v6.897675c1.11495.69609 2.4378 1.099875 3.857175 1.099875s2.74215-.4037925 3.857175-1.099875v-6.897675c-1.0291846-.64254462-2.2355148-1.03602462-3.53139108-1.09275796zm2.892825 3.1038v2.892825h-.964275v-.964275h-1.44645v.964275h-.964275v-.964275h-1.44645v.964275h-.964275v-2.892825h.964275v.964275h1.44645v-.964275h.964275v.964275h1.44645v-.964275z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/animal-m.svg b/data/styles/default/light/symbols/animal-m.svg
index e3312c4c5..4bf204a36 100644
--- a/data/styles/default/light/symbols/animal-m.svg
+++ b/data/styles/default/light/symbols/animal-m.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="0 0 24 24"
-   width="18"
-   height="18"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <title
-     id="title1">animal-m</title>
-  <path
-     id="Path"
-     d="M 16.069622,1.670709 C 13.882633,4.8501398 13.571882,7.5052255 11.149025,9.6194413 8.8344727,11.63888 4.5882073,10.945616 4.5882073,13.858771 v 1.059733 c 0,1.059883 1.0934782,2.068306 1.0934782,3.179442 v 1.059883 c 0,1.589704 -0.5467534,1.589704 -1.0934782,3.179426 h 1.0934782 l 2.1869842,-3.179426 v 3.179426 h 1.640192 v -6.359018 h 1.6402033 v 6.359018 h 1.640205 v -4.769297 l 1.640205,4.769297 h 1.093492 l -1.674454,-6.657053 c 0.644611,-0.381233 0.58092,-1.085969 0.58092,-1.821488 v -3.179419 l 2.460359,-5.8292145 2.460373,0.7948732 c 0,-0.074715 -8.44e-4,-0.734467 0,-0.7948732 0,0 -0.399405,-0.3871019 -0.546738,-0.5298655 L 16.069669,1.670589 Z"
-     fill="#9C6136"
-     style="stroke-width:1.47601" />
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.069622 1.670709c-2.186989 3.1794308-2.49774 5.8345165-4.920597 7.9487323-2.3145523 2.0194387-6.5608177 1.3261747-6.5608177 4.2393297v1.059733c0 1.059883 1.0934782 2.068306 1.0934782 3.179442v1.059883c0 1.589704-.5467534 1.589704-1.0934782 3.179426h1.0934782l2.1869842-3.179426v3.179426h1.640192v-6.359018h1.6402033v6.359018h1.640205v-4.769297l1.640205 4.769297h1.093492l-1.674454-6.657053c.644611-.381233.58092-1.085969.58092-1.821488v-3.179419l2.460359-5.8292145 2.460373.7948732c0-.074715-.000844-.734467 0-.7948732 0 0-.399405-.3871019-.546738-.5298655l-2.733758-2.649626z" fill="#747E86" stroke-width="1.47601"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/aquarium-m.svg b/data/styles/default/light/symbols/aquarium-m.svg
index 3e8219a37..b381600d4 100644
--- a/data/styles/default/light/symbols/aquarium-m.svg
+++ b/data/styles/default/light/symbols/aquarium-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
+ <circle cx="12" cy="12" r="11" fill="#EB785D"/>
  <path d="m12.95 8c-2.1868 0-4.0964 1.3312-5.1593 2.4702l-2.1226-1.6054c-0.29483-0.22312-0.735 0.014583-0.65965 0.35632l0.58771 2.6678-0.58795 2.668c-0.075347 0.34174 0.36483 0.5792 0.65965 0.35632l2.1226-1.6054c1.0629 1.1387 2.9728 2.4699 5.1596 2.4699 3.341 0 6.0496-3.1111 6.0496-3.8889s-2.7086-3.8889-6.0496-3.8889zm2.125 4.4722c-0.32205 0-0.58333-0.26128-0.58333-0.58333 0-0.32229 0.26128-0.58333 0.58333-0.58333 0.32229 0 0.58333 0.26104 0.58333 0.58333 0 0.32205-0.26128 0.58333-0.58333 0.58333z" fill="#fff"/>
 </svg>
diff --git a/data/styles/default/light/symbols/arcade-m.svg b/data/styles/default/light/symbols/arcade-m.svg
index 687659869..2b0c8b649 100644
--- a/data/styles/default/light/symbols/arcade-m.svg
+++ b/data/styles/default/light/symbols/arcade-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
- <path d="m4.4472 4.9836v2.158h4.3159v-2.158zm10.79 0v2.158h4.3159v-2.158zm-6.4738 2.1622v2.1579h2.1579v-2.1579zm4.3159 0v2.1579h2.1579v-2.1579zm-6.4738 2.16v2.1579h-2.1579v7.5528h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-7.5528h-2.1579v-2.1579zm2.1579 2.1579h2.1579v2.1579h-2.1579zm4.3159 0h2.1579v2.1579h-2.1579z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m4.4472 4.9836v2.158h4.3159v-2.158zm10.79 0v2.158h4.3159v-2.158zm-6.4738 2.1622v2.1579h2.1579v-2.1579zm4.3159 0v2.1579h2.1579v-2.1579zm-6.4738 2.16v2.1579h-2.1579v7.5528h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-7.5528h-2.1579v-2.1579zm2.1579 2.1579h2.1579v2.1579h-2.1579zm4.3159 0h2.1579v2.1579h-2.1579z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/archery-centre-m.svg b/data/styles/default/light/symbols/archery-centre-m.svg
new file mode 100644
index 000000000..03ffdff6d
--- /dev/null
+++ b/data/styles/default/light/symbols/archery-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9 3.375c-3.106625 0-5.625 2.5184375-5.625 5.625s2.518375 5.625 5.625 5.625c3.1065625 0 5.625-2.5184375 5.625-5.625s-2.5184375-5.625-5.625-5.625zm0 1.125c2.4853125 0 4.5 2.0146875 4.5 4.5s-2.0146875 4.5-4.5 4.5-4.5-2.0146875-4.5-4.5 2.0146875-4.5 4.5-4.5zm0 1.125c-1.8639375 0-3.375 1.5110625-3.375 3.375s1.5110625 3.375 3.375 3.375 3.375-1.5110625 3.375-3.375-1.5110625-3.375-3.375-3.375zm0 1.125c1.242625 0 2.25 1.007375 2.25 2.25s-1.007375 2.25-2.25 2.25-2.25-1.007375-2.25-2.25 1.007375-2.25 2.25-2.25zm0 1.125c-.6213375 0-1.125.5036625-1.125 1.125s.5036625 1.125 1.125 1.125 1.125-.5036625 1.125-1.125-.5036625-1.125-1.125-1.125z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/archery-m.svg b/data/styles/default/light/symbols/archery-m.svg
index 1522ef192..41f85500e 100644
--- a/data/styles/default/light/symbols/archery-m.svg
+++ b/data/styles/default/light/symbols/archery-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>archery-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="archery-m" fill-rule="nonzero">
-   <path id="Shape" d="m12 3c-4.9706 0-9 4.0295-9 9s4.0294 9 9 9c4.9705 0 9-4.0295 9-9s-4.0295-9-9-9zm0 1.8c3.9765 0 7.2 3.2235 7.2 7.2s-3.2235 7.2-7.2 7.2c-3.9765 0-7.2-3.2235-7.2-7.2s3.2235-7.2 7.2-7.2zm0 1.8c-2.9823 0-5.4 2.4177-5.4 5.4s2.4177 5.4 5.4 5.4c2.9823 0 5.4-2.4177 5.4-5.4s-2.4177-5.4-5.4-5.4zm0 1.8c1.9882 0 3.6 1.6118 3.6 3.6s-1.6118 3.6-3.6 3.6c-1.9882 0-3.6-1.6118-3.6-3.6s1.6118-3.6 3.6-3.6zm0 1.8c-0.99414 0-1.8 0.80586-1.8 1.8s0.80586 1.8 1.8 1.8 1.8-0.80586 1.8-1.8-0.80586-1.8-1.8-1.8z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c-3.72795 0-6.75 3.022125-6.75 6.75s3.02205 6.75 6.75 6.75c3.727875 0 6.75-3.022125 6.75-6.75s-3.022125-6.75-6.75-6.75zm0 1.35c2.982375 0 5.4 2.417625 5.4 5.4s-2.417625 5.4-5.4 5.4-5.4-2.417625-5.4-5.4 2.417625-5.4 5.4-5.4zm0 1.35c-2.236725 0-4.05 1.813275-4.05 4.05s1.813275 4.05 4.05 4.05 4.05-1.813275 4.05-4.05-1.813275-4.05-4.05-4.05zm0 1.35c1.49115 0 2.7 1.20885 2.7 2.7s-1.20885 2.7-2.7 2.7-2.7-1.20885-2.7-2.7 1.20885-2.7 2.7-2.7zm0 1.35c-.745605 0-1.35.604395-1.35 1.35s.604395 1.35 1.35 1.35 1.35-.604395 1.35-1.35-.604395-1.35-1.35-1.35z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/atm-m.svg b/data/styles/default/light/symbols/atm-m.svg
index ef7add937..1fe4f5120 100644
--- a/data/styles/default/light/symbols/atm-m.svg
+++ b/data/styles/default/light/symbols/atm-m.svg
@@ -1,13 +1,7 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>atm-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="atm-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <g id="bx-credit-card" transform="translate(7 8)" fill="#fff">
-    <path id="Shape" d="m9 0h-8c-0.5515 0-1 0.4485-1 1v6c0 0.5515 0.4485 1 1 1h8c0.5515 0 1-0.4485 1-1v-6c0-0.5515-0.4485-1-1-1zm-8 1h8v1h-8v-1zm0 6v-3h8.0005l5e-4 3h-8.001z"/>
-    <polygon id="Path" points="2 5 5 5 5 6 2 6"/>
-   </g>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>atm-m</title>
+    <g id="atm-m" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M13.8,4.2 C14.4618,4.2 15,4.7382 15,5.4 L15,12.6 C15,13.2618 14.4618,13.8 13.8,13.8 L4.2,13.8 C3.5382,13.8 3,13.2618 3,12.6 L3,5.4 C3,4.7382 3.5382,4.2 4.2,4.2 L13.8,4.2 Z M13.8006,9 L4.2,9 L4.2,12.6 L13.8012,12.6 L13.8006,9 Z M9,10.2 L9,11.4 L5.4,11.4 L5.4,10.2 L9,10.2 Z M13.8,5.4 L4.2,5.4 L4.2,6.6 L13.8,6.6 L13.8,5.4 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/australian-football-centre-m.svg b/data/styles/default/light/symbols/australian-football-centre-m.svg
new file mode 100644
index 000000000..e1bb0b191
--- /dev/null
+++ b/data/styles/default/light/symbols/australian-football-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m13.5900833 5.15308333c-.0943529-.35776-.3754508-.63884166-.7332-.73520416-.4698091-.1258075-1.2030416-.27519917-2.0600666-.29289542l3.0783458 3.08224583c-.0157219-.855075-.1611892-1.584375-.2850304-2.0541625zm-9.18016663 7.69383337c.09435291.35776.37545625.6388416.7332.7352041.46980916.1258075 1.20304166.2751992 2.06006666.2928954l-3.07834583-3.0822458c.01572621.855075.16118917 1.584375.28503042 2.0541625zm-.20246959-3.30833753 4.24991667 4.25777083c2.60460415-.3813496 4.89070835-2.3333375 5.33693335-5.33498333l-4.25186668-4.25777084c-2.60460417.38134959-4.89070834 2.3333375-5.33498334 5.33498334zm6.23729162-2.42964584c.0609376-.0609375.1611892-.0609375.2221267 0l.2221267.22212667c.0609375.0609375.0609375.16118917 0 .22212667l-.5562917.55629166.5562917.55629167c.0609375.0609375.0609375.16118917 0 .22212667l-.2221267.22212666c-.0609375.0609375-.1611891.0609375-.2221267 0l-.55629162-.55629166-.44425333.44621958.55629165.55629167c.0609375.0609375.0609375.16118916 0 .22212666l-.22212665.22212672c-.0609375.0609375-.16118917.0609375-.22212667 0l-.55629166-.55629172-.44425334.44425334.55629167.55629168c.0609375.0609375.0609375.1611892 0 .2221267l-.22212667.2221266c-.0609375.0609375-.16118916.0609375-.22212666 0l-.55629167-.5562916-.55629167.5562916c-.0609375.0609375-.16118916.0609375-.22212666 0l-.22212667-.2221266c-.0609375-.0609375-.0609375-.1611892 0-.2221267l.55629167-.55629168-.55629167-.55434167c-.0609375-.0609375-.0609375-.16118917 0-.22212667l.22212667-.22212666c.0609375-.0609375.16118916-.0609375.22212666 0l.55629167.55629166.44425333-.44425333-.55629166-.55629167c-.0609375-.0609375-.0609375-.16118916 0-.22212666l.22212666-.22212667c.0609375-.0609375.16118917-.0609375.22212667 0l.55629167.55629167.44425333-.44425334-.55629167-.55629166c-.0609375-.0609375-.0609375-.16118917 0-.22212667l.22212667-.22212667c.0609375-.0609375.16118917-.0609375.22212667 0l.55629166.55629167z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/australian-football-m.svg b/data/styles/default/light/symbols/australian-football-m.svg
index c4670ba69..0a804cbdd 100644
--- a/data/styles/default/light/symbols/australian-football-m.svg
+++ b/data/styles/default/light/symbols/australian-football-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>australian-football-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="australian-football-m" fill-rule="nonzero">
-   <path id="Shape" d="m20.474 4.898c-0.17419-0.66048-0.69314-1.1794-1.3536-1.3573-0.86734-0.23226-2.221-0.50806-3.8032-0.54073l5.6831 5.6903c-0.029025-1.5786-0.29758-2.925-0.52621-3.7923zm-16.948 14.204c0.17419 0.66048 0.69315 1.1794 1.3536 1.3573 0.86734 0.23226 2.221 0.50806 3.8032 0.54073l-5.6831-5.6903c0.029033 1.5786 0.29758 2.925 0.52621 3.7923zm-0.37379-6.1077 7.846 7.8605c4.8085-0.70403 9.029-4.3077 9.8528-9.8492l-7.8496-7.8605c-4.8085 0.70403-9.029 4.3077-9.8492 9.8492zm11.515-4.4855c0.1125-0.1125 0.29758-0.1125 0.41008 0l0.41008 0.41008c0.1125 0.1125 0.1125 0.29758 0 0.41008l-1.027 1.027 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82379 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-0.82016 0.82016 1.027 1.027c0.1125 0.1125 0.1125 0.29758 0 0.41008l-0.41008 0.41008c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-1.027-1.027-1.027 1.027c-0.1125 0.1125-0.29758 0.1125-0.41008 0l-0.41008-0.41008c-0.1125-0.1125-0.1125-0.29758 0-0.41008l1.027-1.027-1.027-1.0234c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027 0.82016-0.82016-1.027-1.027c-0.1125-0.1125-0.1125-0.29758 0-0.41008l0.41008-0.41008c0.1125-0.1125 0.29758-0.1125 0.41008 0l1.027 1.027z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m15.3555 3.6735c-.1306425-.49536-.519855-.88455-1.0152-1.017975-.650505-.174195-1.66575-.381045-2.8524-.4055475l4.262325 4.267725c-.0217687-1.18395-.223185-2.19375-.3946575-2.844225zm-12.711 10.653c.1306425.49536.5198625.88455 1.0152 1.017975.650505.174195 1.66575.381045 2.8524.4055475l-4.262325-4.267725c.02177475 1.18395.223185 2.19375.3946575 2.844225zm-.2803425-4.580775 5.8845 5.895375c3.606375-.5280225 6.77175-3.230775 7.3896-7.3869l-5.8872-5.895375c-3.606375.5280225-6.77175 3.230775-7.3869 7.3869zm8.63625-3.364125c.084375-.084375.223185-.084375.30756 0l.30756.30756c.084375.084375.084375.223185 0 .30756l-.77025.77025.77025.77025c.084375.084375.084375.223185 0 .30756l-.30756.30756c-.084375.084375-.223185.084375-.30756 0l-.77025-.77025-.61512.6178425.77025.77025c.084375.084375.084375.223185 0 .30756l-.30756.30756c-.084375.084375-.223185.084375-.30756 0l-.77025-.77025-.61512.61512.77025.77025c.084375.084375.084375.223185 0 .30756l-.30756.30756c-.084375.084375-.223185.084375-.30756 0l-.77025-.77025-.77025.77025c-.084375.084375-.223185.084375-.30756 0l-.30756-.30756c-.084375-.084375-.084375-.223185 0-.30756l.77025-.77025-.77025-.76755c-.084375-.084375-.084375-.223185 0-.30756l.30756-.30756c.084375-.084375.223185-.084375.30756 0l.77025.77025.61512-.61512-.77025-.77025c-.084375-.084375-.084375-.223185 0-.30756l.30756-.30756c.084375-.084375.223185-.084375.30756 0l.77025.77025.61512-.61512-.77025-.77025c-.084375-.084375-.084375-.223185 0-.30756l.30756-.30756c.084375-.084375.223185-.084375.30756 0l.77025.77025z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/badminton-centre-m.svg b/data/styles/default/light/symbols/badminton-centre-m.svg
new file mode 100644
index 000000000..995e413c2
--- /dev/null
+++ b/data/styles/default/light/symbols/badminton-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m12.7313508 9.82556299c.1056601-.04571972.1933655-.04626856.2727698-.00191111.2382375.13307232.4073221.67024232.8039762 1.59928862l.67281 1.5725036-.0631696.1272899-.0065015.0212053c-.0132124.0323449-.0513542.092849-.1552474.117571l-.058347.0112987c-.0455174.0073375-.1053065.0144405-.1855655.0222397l-2.2990448.1808494-.2344888.1004951c-.6929012.2982318-1.3148903.0737004-1.55525454-.5857318-.21353741-.585729.05236021-1.0929947.68808144-1.414016l.2033508-.0959897c.1161228-.0638878.2576594-.1934694.9892017-.8578153l.5179985-.4843062c.1681828-.15611166.2964157-.26406541.4094307-.31297121zm-1.8528836 2.28265391-.0775275.0335081c-.5620782.2442796-.4176666 1.0364509.1741907.9896139.0429559-.0033812.1113398-.0205996.1792193-.0446945l.1241773-.051013zm-.1787822-8.82937389c1.6767328.00719254 2.9148895 1.37226679 2.6310156 3.18140547-.4214251 2.68423767-3.61705232 4.33764022-5.55987095 2.87603019l-.14164783-.10623833-1.46719633 1.46626526.04402422.0708239c.05256053.0850446.0588378.2396929.0133974.3254088-.01778806.0335379-.24163156.2656084-.53102621.5571036l-.85946905.8506962c-.28614068.2782313-.50990651.4893976-.53708347.5006188-.07919852.0326996-.14653833.0349195-.24118746.0076591-.16189584-.0466115-.42303238-.3740784-.42303238-.5302115 0-.0804628.1999662-.3232331.44313338-.5761763l.84128207-.8527488c.66496545-.6640648.72938656-.7172411.92178802-.6260929l.12143017.0604719 1.41133314-1.42298819c.02749365-.02927165.04248539-.04615148.04248539-.0480794 0-.00449602-.00809283-.01863336-.02123173-.03773776l-.0515082-.0675401c-.97011074-1.1709737-.65757013-3.19655826.69197019-4.485874.1378354-.13168456.25317808-.23377606.34901869-.30724547l.19804252-.14357402c.05926658-.04134743.14115535-.09480839.26550515-.16650456l.20745508-.11474155c.07492791-.0406859.1558354-.08220607.24333256-.1197472.10914909-.04632246.25359009-.09525677.43834579-.14930699.26696789-.07810477.52855404-.12274643.78149194-.13681348zm2.9525703 9.28394759-.2796376-.6526925-1.6251328.70058.1177197.2708587 1.8567696-.1464305zm-.8807074-2.0289934-1.3800937 1.2499664.1186802.2756414 1.6241527-.7005898-.2625083-.6074548c-.0438536-.0990676-.0752525-.1668059-.1002309-.2175632zm-2.0414076-6.53811121h-.1359341c-.68584483.02097325-1.44073476.32488934-2.0883573.9542338-1.62327062 1.57745289-1.24119488 3.99098374.66516559 4.20067702 1.71426901.18856323 3.47528681-1.43201223 3.47328111-3.19665626-.0013755-1.226445-.8604456-1.9324604-1.9141553-1.95825456z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/badminton-m.svg b/data/styles/default/light/symbols/badminton-m.svg
index 082a81883..4e717e446 100644
--- a/data/styles/default/light/symbols/badminton-m.svg
+++ b/data/styles/default/light/symbols/badminton-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(.84005 0 0 .84005 -30.981 -1.1458)" fill="#747E86"><path d="m54.633 4.9941c-0.63366-0.00271-1.2975 0.089825-1.9785 0.28906-0.37703 0.1103-0.67179 0.21016-0.89453 0.30469-0.35711 0.15322-0.66043 0.33892-0.91992 0.47852-0.50752 0.29262-0.66844 0.43639-0.80664 0.53125-0.22008 0.15106-0.49996 0.39261-0.85156 0.72852-2.754 2.6311-3.3918 6.7647-1.4121 9.1543 0.08238 0.09944 0.14844 0.19649 0.14844 0.21484 0 0.01836-0.66626 0.70121-1.4824 1.5176l-1.4844 1.4844-0.17969-0.08984c-0.44992-0.22778-0.51682-0.18634-1.9492 1.2441-0.57055 0.57351-1.129 1.1393-1.7168 1.7402-0.49623 0.51618-0.9043 1.0116-0.9043 1.1758 0 0.31862 0.5329 0.98688 0.86328 1.082 0.19315 0.05563 0.33057 0.0511 0.49219-0.01563 0.16382-0.06764 3.828-3.6954 3.9336-3.8945 0.09273-0.17492 0.07992-0.49051-0.02734-0.66406l-0.08984-0.14453 1.498-1.4961 1.4961-1.4961 0.28906 0.2168c3.9647 2.9827 10.486-0.39139 11.346-5.8691 0.5793-3.6919-1.9474-6.4776-5.3691-6.4922zm-0.21484 1.4629c0.09331-0.0029 0.18539-0.0023 0.27734 0 2.1503 0.052538 3.9034 1.4933 3.9062 3.9961 0.0041 3.6011-3.5896 6.9082-7.0879 6.5234-3.8903-0.42792-4.67-5.3532-1.3574-8.5723 1.3216-1.2843 2.8621-1.9045 4.2617-1.9473z" stroke-width=".038977"/><path d="m59.336 18.35c-0.16204-0.09052-0.34102-0.0894-0.55664 0.0039-0.42282 0.18297-0.95002 0.77095-1.8926 1.627-1.8246 1.657-1.8506 1.6838-2.1816 1.8281-1.4777 0.64466-2.1192 1.7339-1.6562 3.0039 0.49051 1.3457 1.7598 1.8039 3.1738 1.1953l0.47852-0.20508 2.4824-0.19336c1.8068-0.13958 2.4393-0.18043 2.707-0.24414 0.29682-0.07063 0.33065-0.28438 0.33008-0.2832l0.12891-0.25976-1.373-3.209c-0.80945-1.8959-1.1545-2.9921-1.6406-3.2637zm-0.47461 1.4492c0.07646 0.15536 0.1824 0.3887 0.35938 0.79883l0.38086 0.88477-1.6582 0.7168-1.6562 0.71289-0.10742-0.25-0.13477-0.3125 1.418-1.2871c0.75068-0.68216 1.2596-1.1386 1.3984-1.2637zm1.2266 2.8086 0.37891 0.88086c0.14357 0.33271 0.25641 0.60261 0.32812 0.78906 0.0019 0.0049 4e-3 0.0089 0.0059 0.01367-0.23363 0.01817-0.86052 0.0678-1.8594 0.14648l-1.9297 0.15234-0.13281-0.30469-0.10742-0.24805 1.6582-0.71484zm-5.0898 0.4043 0.4082 0.94726 0.4082 0.94531-0.11719 0.05078c-0.17594 0.07593-0.38507 0.13533-0.50195 0.14453-1.2078 0.09558-1.5025-1.521-0.35547-2.0195z" stroke-width=".048325"/></g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.797451 10.7042953c.1358487-.0587825.2486128-.0594882.3507041-.0024572.3063053.171093.5236998.8617401 1.0336836 2.0562282l.8650415 2.0217903-.0812181.1636586-.008359.0272639c-.0169874.0415863-.0660268.1193773-.1996038.1511627l-.0750177.0145269c-.0585223.009434-.135394.0185663-.2385841.0285939l-2.9559148.2325206-.3014855.1292081c-.8908731.3834408-1.6905734.0947576-1.9996131-.7530838-.27454807-.7530801.0673203-1.4052789.8846762-1.8180206l.261451-.1234153c.1493008-.0821415.3312764-.2487463 1.2718308-1.1029053l.665998-.6226794c.216235-.2007151.381106-.3395127.5264109-.4023916zm-2.3822789 2.9348407-.0996782.0430819c-.7226719.3140737-.5369999 1.3325797.2239594 1.2723607.0552291-.0043472.1431512-.0264852.2304248-.0574644l.1596566-.0655882zm-.2298628-11.35205214c2.1557993.00924757 3.747715 1.76434303 3.3827343 4.09037848-.5418323 3.45116271-4.65049581 5.57696596-7.14840548 3.69775306l-.18211864-.1365921-1.88639528 1.8851982.05660257.0910593c.06757782.109343.0756486.3081766.01722522.4183827-.02287036.0431202-.31066914.3414965-.68274798.7162761l-1.10503163 1.0937522c-.36789517.3577261-.65559408.6292256-.6905359.6436528-.10182666.0420424-.18840641.0448964-.31009815.0098475-.20815179-.0599292-.54389878-.4809581-.54389878-.6817006 0-.1034522.25709941-.4155854.56974291-.7407981l1.08164838-1.0963913c.85495559-.8537976.93778272-.9221671 1.18515603-.8049767l.15612451.0777496 1.81457118-1.82955616c.03534897-.03763498.05462407-.05933762.05462407-.06181637 0-.00578059-.01040507-.02395717-.02729795-.04851997l-.06622481-.08683728c-1.24728524-1.50553761-.84544733-4.10986062.88967595-5.76755229.17721695-.16930872.32551467-.30056922.44873831-.39502988l.2546261-.18459517c.07619989-.05316099.18148546-.1218965.34136377-.21407729l.26672795-.14752486c.09633589-.05231044.2003598-.10569351.31285615-.15396069.14033455-.05955744.32604441-.12247299.56358744-.19196612.34324446-.10042042.67956956-.15781683 1.00477536-.17590304zm3.7961617 11.93650404-.359534-.8391761-2.0894564.9007457.1513539.3482469 2.3872751-.1882678zm-1.132338-2.6087057-1.7744061 1.6070996.1525888.3543961 2.0881963-.9007583-.3375107-.7810134c-.0563832-.1273726-.0967532-.2144647-.1288683-.279724zm-2.6246669-8.40614307h-.1747724c-.8818005.02696561-1.85237327.41771487-2.68503083 1.22687203-2.08706223 2.02815371-1.59582199 5.13126481.8552129 5.40087046 2.20406023.24243838 4.46822593-1.84115859 4.46564723-4.10998663-.0017685-1.57685785-1.1062873-2.48459194-2.4610569-2.51775586z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bank-m.svg b/data/styles/default/light/symbols/bank-m.svg
index 8a39c9c16..9bc3fcb7e 100644
--- a/data/styles/default/light/symbols/bank-m.svg
+++ b/data/styles/default/light/symbols/bank-m.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <g fill-rule="evenodd">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#747E86"/>
-  <path d="m6 7.7692 6-2.7692 6 2.7692v0.92308h-0.92308v6.9231h0.92308v1.3846h-12v-1.3846h0.92308v-6.9231h-0.92308zm8.3077 4.9242c0-1.0203-1.0379-1.847-2.3097-1.847-0.42256 0-0.77128-0.27557-0.77128-0.61675s0.34462-0.61675 0.77128-0.61675c0.42667 0 0.77128 0.27885 0.77128 0.61675h1.5385c0-0.80046-0.6441-1.4763-1.5385-1.7322v-0.72829h-1.5385v0.72829c-0.89436 0.25589-1.5385 0.93169-1.5385 1.7322 0 1.0203 1.0379 1.847 2.3097 1.847 0.42667 0 0.77128 0.27557 0.77128 0.61675s-0.34462 0.61675-0.77128 0.61675c-0.42667 0-0.77128-0.27885-0.77128-0.61675h-1.5385c0 0.80046 0.6441 1.4763 1.5385 1.7322v0.72829h1.5385v-0.72829c0.89436-0.25589 1.5385-0.93169 1.5385-1.7322z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#747E86" r="11"/><path d="m6 7.7692 6-2.7692 6 2.7692v.92308h-.92308v6.9231h.92308v1.3846h-12v-1.3846h.92308v-6.9231h-.92308zm8.3077 4.9242c0-1.0203-1.0379-1.847-2.3097-1.847-.42256 0-.77128-.27557-.77128-.61675s.34462-.61675.77128-.61675c.42667 0 .77128.27885.77128.61675h1.5385c0-.80046-.6441-1.4763-1.5385-1.7322v-.72829h-1.5385v.72829c-.89436.25589-1.5385.93169-1.5385 1.7322 0 1.0203 1.0379 1.847 2.3097 1.847.42667 0 .77128.27557.77128.61675s-.34462.61675-.77128.61675c-.42667 0-.77128-.27885-.77128-.61675h-1.5385c0 .80046.6441 1.4763 1.5385 1.7322v.72829h1.5385v-.72829c.89436-.25589 1.5385-.93169 1.5385-1.7322z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/banknote-m.svg b/data/styles/default/light/symbols/banknote-m.svg
index af0b7d639..9e2b7c979 100644
--- a/data/styles/default/light/symbols/banknote-m.svg
+++ b/data/styles/default/light/symbols/banknote-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>banknote-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="banknote-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11.143" fill="#747E86"/>
-   <path id="Shape" d="m18.286 8.8571h-0.81943l-1.548-2.58c-0.082286-0.136-0.21714-0.23257-0.37314-0.26514-0.15486-0.032-0.31886 0.0022857-0.44857 0.094286l-3.8509 2.7509h1.9663l2.0451-1.4606 0.87657 1.4606h-2.4194v1.1429h4v4.5714h-6.8571v-1.1429h-1.1429v1.7143c0 0.316 0.256 0.57143 0.57143 0.57143h3.9326l-0.128 0.256c-0.097143 0.19486-0.29257 0.31543-0.51029 0.31543h-3.6291l-1.3794-1.3794v-2.9549l1.3794-1.38h2.0491v0.57143c0 0.31486-0.256 0.57143-0.57143 0.57143h-1.1429v1.1429h1.1429c0.94514 0 1.7143-0.76914 1.7143-1.7143v-1.1429c0-0.31543-0.25543-0.57143-0.57143-0.57143h-2.8571c-0.15143 0-0.29714 0.059429-0.404 0.168l-1.0474 1.0469c-0.08-0.041714-0.16629-0.072-0.26286-0.072h-2.2857c-0.31543 0-0.57143 0.256-0.57143 0.57143v4.5714c0 0.316 0.256 0.57143 0.57143 0.57143h2.2857c0.096571 0 0.18286-0.029714 0.26286-0.072l1.0474 1.048c0.10686 0.10629 0.25257 0.16686 0.404 0.16686h3.8657c0.65371 0 1.2411-0.36286 1.5331-0.948l0.38286-0.76629h2.7897c0.316 0 0.57143-0.25543 0.57143-0.57143v-5.7143c0-0.31543-0.25543-0.57143-0.57143-0.57143zm-10.857 6.2857h-1.1429v-3.4286h1.1429v3.4286z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#747E86" r="11.143"/><path d="m18.286 8.8571h-.81943l-1.548-2.58c-.082286-.136-.21714-.23257-.37314-.26514-.15486-.032-.31886.0022857-.44857.094286l-3.8509 2.7509h1.9663l2.0451-1.4606.87657 1.4606h-2.4194v1.1429h4v4.5714h-6.8571v-1.1429h-1.1429v1.7143c0 .316.256.57143.57143.57143h3.9326l-.128.256c-.097143.19486-.29257.31543-.51029.31543h-3.6291l-1.3794-1.3794v-2.9549l1.3794-1.38h2.0491v.57143c0 .31486-.256.57143-.57143.57143h-1.1429v1.1429h1.1429c.94514 0 1.7143-.76914 1.7143-1.7143v-1.1429c0-.31543-.25543-.57143-.57143-.57143h-2.8571c-.15143 0-.29714.059429-.404.168l-1.0474 1.0469c-.08-.041714-.16629-.072-.26286-.072h-2.2857c-.31543 0-.57143.256-.57143.57143v4.5714c0 .316.256.57143.57143.57143h2.2857c.096571 0 .18286-.029714.26286-.072l1.0474 1.048c.10686.10629.25257.16686.404.16686h3.8657c.65371 0 1.2411-.36286 1.5331-.948l.38286-.76629h2.7897c.316 0 .57143-.25543.57143-.57143v-5.7143c0-.31543-.25543-.57143-.57143-.57143zm-10.857 6.2857h-1.1429v-3.4286h1.1429z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/baseball-centre-m.svg b/data/styles/default/light/symbols/baseball-centre-m.svg
new file mode 100644
index 000000000..5927c9b77
--- /dev/null
+++ b/data/styles/default/light/symbols/baseball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9 3.375c1.47875 0 2.8169375.57375 3.81775 1.501875-1.585625.6975-2.69325 2.278125-2.69325 4.123125s1.1076875 3.425625 2.69325 4.123125c-1.0008125.928125-2.339 1.501875-3.81775 1.501875s-2.8169375-.57375-3.81775-1.501875c1.585625-.6975 2.69325-2.278125 2.69325-4.123125s-1.1076875-3.425625-2.69325-4.123125c1.0008125-.928125 2.339-1.501875 3.81775-1.501875zm-4.6073125 2.4075c1.3606875.433125 2.355875 1.71 2.355875 3.2175s-.9951875 2.784375-2.355875 3.2175c-.640975-.91125-1.0176875-2.019375-1.0176875-3.2175s.3766875-2.30625 1.0176875-3.2175zm9.2148125 0c.640975.91125 1.0176875 2.019375 1.0176875 3.2175s-.3766875 2.30625-1.0176875 3.2175c-1.3606875-.433125-2.355875-1.71-2.355875-3.2175s.9951875-2.784375 2.355875-3.2175z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/baseball-m.svg b/data/styles/default/light/symbols/baseball-m.svg
index a9df35910..2718a2042 100644
--- a/data/styles/default/light/symbols/baseball-m.svg
+++ b/data/styles/default/light/symbols/baseball-m.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>baseball-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="baseball-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5 5)" fill="#747E86" stroke-width="1.2854">
-    <path id="Path" d="m-0.3717 1.852c-1.0256 1.458-1.6283 3.231-1.6283 5.148s0.60274 3.69 1.6283 5.148c2.1771-0.693 3.7694-2.736 3.7694-5.148s-1.5923-4.455-3.7694-5.148z"/>
-    <path d="m14.372 1.852c-2.1771 0.693-3.7694 2.736-3.7694 5.148s1.5923 4.455 3.7694 5.148c1.0256-1.458 1.6283-3.231 1.6283-5.148s-0.60274-3.69-1.6283-5.148z"/>
-    <path d="m8.7992 7c0-2.952 1.7722-5.481 4.3092-6.597-1.6013-1.485-3.7424-2.403-6.1084-2.403s-4.5071 0.918-6.1084 2.403c2.5369 1.116 4.3092 3.645 4.3092 6.597s-1.7722 5.481-4.3092 6.597c1.6013 1.485 3.7424 2.403 6.1084 2.403s4.5071-0.918 6.1084-2.403c-2.5369-1.116-4.3092-3.645-4.3092-6.597z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c1.7745 0 3.380325.6885 4.5813 1.80225-1.90275.837-3.2319 2.73375-3.2319 4.94775s1.329225 4.11075 3.2319 4.94775c-1.200975 1.11375-2.8068 1.80225-4.5813 1.80225s-3.380325-.6885-4.5813-1.80225c1.90275-.837 3.2319-2.73375 3.2319-4.94775s-1.329225-4.11075-3.2319-4.94775c1.200975-1.11375 2.8068-1.80225 4.5813-1.80225zm-5.528775 2.889c1.632825.51975 2.82705 2.052 2.82705 3.861s-1.194225 3.34125-2.82705 3.861c-.76917-1.0935-1.221225-2.42325-1.221225-3.861s.452025-2.7675 1.221225-3.861zm11.057775 0c.76917 1.0935 1.221225 2.42325 1.221225 3.861s-.452025 2.7675-1.221225 3.861c-1.632825-.51975-2.82705-2.052-2.82705-3.861s1.194225-3.34125 2.82705-3.861z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/basketball-centre-m.svg b/data/styles/default/light/symbols/basketball-centre-m.svg
new file mode 100644
index 000000000..a0d5f20e0
--- /dev/null
+++ b/data/styles/default/light/symbols/basketball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m13.7546134 5.9473025c.4692301.72928538.7801657 1.57729163.8706197 2.487485h-2.7475402c.1865613-1.10240812.8988866-2.01825487 1.8769205-2.487485zm-4.1891509-2.57228562c1.3511566.135681 2.5609789.7462455 3.4655189 1.66774562-1.2324358.68405838-2.1143623 1.92780088-2.2952703 3.392025h-1.1702486zm-5.31982588 2.57228562c.97803388.46923013 1.69035913 1.38507688 1.8769205 2.487485h-2.74754025c.090454-.91019337.40138963-1.75819962.87061975-2.487485zm4.18915088-2.57228562v5.05977062h-1.17024863c-.180908-1.46422412-1.0628345-2.70796662-2.29527025-3.392025.89888663-.92150012 2.11436225-1.53206462 3.46551888-1.66774562zm2.3009236 6.19044562c.180908 1.4642241 1.0628345 2.7079666 2.2952703 3.392025-.8988867.9215001-2.1143623 1.5320646-3.4655189 1.6677456v-5.0597706zm3.889522 0c-.090454.9101934-.4013896 1.7581996-.8706197 2.487485-.9780339-.4692301-1.6903592-1.3850769-1.8769205-2.487485zm-6.1904456 0v5.0597706c-1.35115663-.135681-2.56097888-.7462455-3.46551888-1.6677456 1.23243576-.6840584 2.11436225-1.9278009 2.29527025-3.392025zm-2.31223038 0c-.18656137 1.0967548-.90454 2.0182549-1.8769205 2.487485-.46923012-.7292854-.78016575-1.5772916-.87061975-2.487485z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/basketball-m.svg b/data/styles/default/light/symbols/basketball-m.svg
index c7e22d1d3..08f5554c2 100644
--- a/data/styles/default/light/symbols/basketball-m.svg
+++ b/data/styles/default/light/symbols/basketball-m.svg
@@ -1,17 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>basketball-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="basketball-m" fill-rule="nonzero">
-   <g id="Group" transform="matrix(1.2922 0 0 1.2922 2.9548 2.9548)" fill="#747E86">
-    <path id="Path" d="m10.563 6.3h3.402c-0.112-1.127-0.497-2.177-1.078-3.08-1.211 0.581-2.093 1.715-2.324 3.08z"/>
-    <path d="m3.437 6.3c-0.231-1.365-1.113-2.499-2.324-3.08-0.581 0.903-0.966 1.953-1.078 3.08z"/>
-    <path d="m9.149 6.3c0.224-1.813 1.316-3.353 2.842-4.2-1.12-1.141-2.618-1.897-4.291-2.065v6.265z"/>
-    <path d="m4.851 6.3h1.449v-6.265c-1.673 0.168-3.178 0.924-4.291 2.065 1.526 0.847 2.618 2.387 2.842 4.2z"/>
-    <path d="m9.149 7.7h-1.449v6.265c1.673-0.168 3.178-0.924 4.291-2.065-1.526-0.847-2.618-2.387-2.842-4.2z"/>
-    <path d="m1.113 10.78c1.204-0.581 2.093-1.722 2.324-3.08h-3.402c0.112 1.127 0.497 2.177 1.078 3.08z"/>
-    <path d="m10.563 7.7c0.231 1.365 1.113 2.499 2.324 3.08 0.581-0.903 0.966-1.953 1.078-3.08z"/>
-    <path d="m4.851 7.7c-0.224 1.813-1.316 3.353-2.842 4.2 1.12 1.141 2.618 1.897 4.291 2.065v-6.265z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m14.705536 5.336763c.5630762.87514245.9361989 1.89274995 1.0447437 2.984982h-3.2970483c.2238737-1.32288975 1.078664-2.42190585 2.2523046-2.984982zm-5.026981-3.08674275c1.6213879.1628172 3.0731746.8954946 4.1586226 2.00129475-1.4789229.82087005-2.5372347 2.31336105-2.7543243 4.07043h-1.4042983zm-6.38379105 3.08674275c1.17364065.56307615 2.02843095 1.66209225 2.2523046 2.984982h-3.2970483c.1085448-1.09223205.48166755-2.10983955 1.0447437-2.984982zm5.02698105-3.08674275v6.07172475h-1.40429835c-.2170896-1.75706895-1.2754014-3.24955995-2.7543243-4.07043 1.07866395-1.10580015 2.5372347-1.83847755 4.15862265-2.00129475zm2.7611083 7.42853475c.2170896 1.757069 1.2754014 3.24956 2.7543243 4.07043-1.0786639 1.1058002-2.5372347 1.8384776-4.1586226 2.0012948v-6.0717248zm4.6674264 0c-.1085448 1.0922321-.4816675 2.1098396-1.0447437 2.984982-1.1736406-.5630761-2.0284309-1.6620922-2.2523046-2.984982zm-7.4285347 0v6.0717248c-1.62138795-.1628172-3.07317465-.8954946-4.15862265-2.0012948 1.4789229-.82087 2.5372347-2.313361 2.7543243-4.07043zm-2.77467645 0c-.22387365 1.3161057-1.085448 2.4219059-2.2523046 2.984982-.56307615-.8751424-.9361989-1.8927499-1.0447437-2.984982z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/beach-m.svg b/data/styles/default/light/symbols/beach-m.svg
index 415ae0573..2da493323 100644
--- a/data/styles/default/light/symbols/beach-m.svg
+++ b/data/styles/default/light/symbols/beach-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>beach-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="beach-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m12.877 13.991 1.1125-1.1123 5.0101 5.0116-1.1102 1.11-5.0124-5.0092zm3.3398-4.457 2.225-2.2246c-3.0729-3.0724-8.0519-3.0802-11.125-0.015557 3.0574-1.0112 6.4649-0.19446 8.8999 2.2402zm-8.9232-2.2168c-3.0652 3.0724-3.0574 8.0506 0.015559 11.123l2.225-2.2246c-2.435-2.4346-3.2519-5.8415-2.2405-8.8984zm0.015559-0.015557-0.0077796 0.0077783c-0.29563 2.3413 0.91021 5.3515 3.3452 7.7939l4.4577-4.457c-2.435-2.4346-5.4535-3.6403-7.7952-3.3447z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0797b8" r="11"/><path d="m12.877 13.991 1.1125-1.1123 5.0101 5.0116-1.1102 1.11-5.0124-5.0092zm3.3398-4.457 2.225-2.2246c-3.0729-3.0724-8.0519-3.0802-11.125-.015557 3.0574-1.0112 6.4649-.19446 8.8999 2.2402zm-8.9232-2.2168c-3.0652 3.0724-3.0574 8.0506.015559 11.123l2.225-2.2246c-2.435-2.4346-3.2519-5.8415-2.2405-8.8984zm.015559-.015557-.0077796.0077783c-.29563 2.3413.91021 5.3515 3.3452 7.7939l4.4577-4.457c-2.435-2.4346-5.4535-3.6403-7.7952-3.3447z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/beekeeper-m.svg b/data/styles/default/light/symbols/beekeeper-m.svg
index f4ac5dd0e..2e52135ca 100644
--- a/data/styles/default/light/symbols/beekeeper-m.svg
+++ b/data/styles/default/light/symbols/beekeeper-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m8.7793 3.5527-0.42383 0.42383-0.42578 0.42383 1.7461 1.75c-0.30791 0.35129-0.54092 0.75567-0.69922 1.2168-0.19425 0.56584-0.17202 1.1453 0.058594 1.7383l0.095703 0.24414 2.8613-1.0078 2.9023 0.9707 0.072266-0.27734c0.17553-0.65417 0.17628-1.2439-0.029297-1.7578-0.15692-0.39225-0.3816-0.75007-0.66406-1.0762l1.7969-1.8008-0.42578-0.42383-0.42383-0.42383-1.8809 1.8848c-0.41314-0.21581-0.87309-0.32422-1.3867-0.32422-0.48309 1e-7 -0.92392 0.10036-1.3223 0.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-0.99908 0.47052-1.4656 1.0767-1.6582 1.7129-0.24708 0.63952 0.012657 1.2548 0.38477 1.627 0.36513 0.3651 1.0132 0.70427 1.7793 0.53711 0.76007-0.16583 1.4524-0.56602 2.1113-1.2285 0.52525-0.52518 0.94732-1.355 1.2422-2.2012 0.28737-0.82465 0.46828-1.4059 0.5332-1.7305l0.076172-0.38281zm0.33594 0 0.076172 0.38281c0.06492 0.32459 0.24584 0.90582 0.5332 1.7305 0.29486 0.84615 0.71694 1.676 1.2422 2.2012 0.65896 0.6625 1.3513 1.0627 2.1113 1.2285 0.76614 0.16716 1.4142-0.17201 1.7793-0.53711 0.37211-0.37213 0.63184-0.98743 0.38477-1.627-0.19263-0.63623-0.65912-1.2424-1.6582-1.7129-0.99908-0.47052-4.4688-1.666-4.4688-1.666zm-0.16797 2.6465c-0.20461 0.67674-0.39347 1.1835-0.82031 1.7852-0.28707 0.37547-0.59242 0.76378-0.96484 1.0625-0.14229 0.11958-0.28868 0.22136-0.4375 0.3125h4.5195c-0.16494-0.092973-0.3145-0.19036-0.46484-0.30859-0.33436-0.28315-0.69887-0.69528-0.96289-1.0938-0.29132-0.5025-0.62864-1.1279-0.86914-1.7578zm-3.9512 4.1602c0.19439 0.39663 0.41526 0.75984 0.65625 1.0898h6.5898c0.24102-0.32994 0.46192-0.69335 0.65625-1.0898h-7.9023zm1.5762 2.0898c0.53884 0.45196 1.1388 0.75512 1.7754 0.87695v1.7559h0.59961 0.59961v-1.7559c0.63593-0.12187 1.2345-0.425 1.7734-0.87695h-4.748z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m8.7793 3.5527-.42383.42383-.42578.42383 1.7461 1.75c-.30791.35129-.54092.75567-.69922 1.2168-.19425.56584-.17202 1.1453.058594 1.7383l.095703.24414 2.8613-1.0078 2.9023.9707.072266-.27734c.17553-.65417.17628-1.2439-.029297-1.7578-.15692-.39225-.3816-.75007-.66406-1.0762l1.7969-1.8008-.42578-.42383-.42383-.42383-1.8809 1.8848c-.41314-.21581-.87309-.32422-1.3867-.32422-.48309.0000001-.92392.10036-1.3223.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-.99908.47052-1.4656 1.0767-1.6582 1.7129-.24708.63952.012657 1.2548.38477 1.627.36513.3651 1.0132.70427 1.7793.53711.76007-.16583 1.4524-.56602 2.1113-1.2285.52525-.52518.94732-1.355 1.2422-2.2012.28737-.82465.46828-1.4059.5332-1.7305l.076172-.38281zm.33594 0 .076172.38281c.06492.32459.24584.90582.5332 1.7305.29486.84615.71694 1.676 1.2422 2.2012.65896.6625 1.3513 1.0627 2.1113 1.2285.76614.16716 1.4142-.17201 1.7793-.53711.37211-.37213.63184-.98743.38477-1.627-.19263-.63623-.65912-1.2424-1.6582-1.7129-.99908-.47052-4.4688-1.666-4.4688-1.666zm-.16797 2.6465c-.20461.67674-.39347 1.1835-.82031 1.7852-.28707.37547-.59242.76378-.96484 1.0625-.14229.11958-.28868.22136-.4375.3125h4.5195c-.16494-.092973-.3145-.19036-.46484-.30859-.33436-.28315-.69887-.69528-.96289-1.0938-.29132-.5025-.62864-1.1279-.86914-1.7578zm-3.9512 4.1602c.19439.39663.41526.75984.65625 1.0898h6.5898c.24102-.32994.46192-.69335.65625-1.0898zm1.5762 2.0898c.53884.45196 1.1388.75512 1.7754.87695v1.7559h.59961.59961v-1.7559c.63593-.12187 1.2345-.425 1.7734-.87695h-4.748z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/blacksmith-m.svg b/data/styles/default/light/symbols/blacksmith-m.svg
index b3ce91672..3eb55ebec 100644
--- a/data/styles/default/light/symbols/blacksmith-m.svg
+++ b/data/styles/default/light/symbols/blacksmith-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m8.1094 4.2692-0.93172 3.4792a0.39995 0.39995 59.988 0 0 0.28292 0.48981l2.3503 0.62909a0.40048 0.40048 150.02 0 0 0.49029-0.28285l0.17307-0.64347a0.40037 0.40037 150.03 0 1 0.49026-0.28274l5.153 1.3808a0.39587 0.39587 149.7 0 0 0.48589-0.28389l0.1662-0.64703a0.40416 0.40416 59.702 0 0-0.28686-0.49094l-5.1394-1.3769a0.40013 0.40013 59.99 0 1-0.28298-0.48992l0.17211-0.64321a0.40026 0.40026 59.999 0 0-0.28294-0.49006l-2.3504-0.63059a0.39982 0.39982 150.01 0 0-0.48981 0.28273zm1.5586 6.9218v0.09258a0.4 0.4 135 0 1-0.4 0.4h-3.7957c-0.22091 0-0.40013 0.17995-0.36889 0.39847 0.1296 0.90626 0.68265 2.3106 2.0042 2.5892 0.21573 0.04548 0.57545 0.04748 0.79636 0.04748h2.0789c0.22091 0 0.40047 0.17909 0.39908 0.4-0.01175 1.8714-0.1716 2.6553-2.2986 2.7373-0.22064 0.0085-0.39974 0.18634-0.39974 0.40725v1.4539a0.4 0.4 45 0 0 0.4 0.4h2.4559a0.4 0.4 135 0 0 0.4-0.4 0.36954 0.36954 139.94 0 1 0.4-0.33633h2.3465a0.4 0.4 45 0 1 0.4 0.4 0.36954 0.36954 40.058 0 0 0.4 0.33633h2.3016a0.4 0.4 135 0 0 0.4-0.4v-1.409a0.4 0.4 45 0 0-0.4-0.4h-0.07109c-0.22091 0-0.58149 0.0054-0.79726-0.04008-1.8741-0.39502-1.8741-3.5854-1.7e-5 -3.9804 0.21578-0.04548 0.57637-0.04008 0.79728-0.04008h1.8113a0.4 0.4 135 0 0 0.4-0.4v-1.2977a0.55355 0.55355 54.148 0 0-0.37978-0.52557l-2.1408-0.70784a2.484 2.484 9.148 0 0-0.77978-0.12557h-5.5594a0.4 0.4 135 0 0-0.4 0.4z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m8.1094 4.2692-.93172 3.4792a.39995.39995 59.988 0 0 .28292.48981l2.3503.62909a.40048.40048 150.02 0 0 .49029-.28285l.17307-.64347a.40037.40037 150.03 0 1 .49026-.28274l5.153 1.3808a.39587.39587 149.7 0 0 .48589-.28389l.1662-.64703a.40416.40416 59.702 0 0 -.28686-.49094l-5.1394-1.3769a.40013.40013 59.99 0 1 -.28298-.48992l.17211-.64321a.40026.40026 59.999 0 0 -.28294-.49006l-2.3504-.63059a.39982.39982 150.01 0 0 -.48981.28273zm1.5586 6.9218v.09258a.4.4 135 0 1 -.4.4h-3.7957c-.22091 0-.40013.17995-.36889.39847.1296.90626.68265 2.3106 2.0042 2.5892.21573.04548.57545.04748.79636.04748h2.0789c.22091 0 .40047.17909.39908.4-.01175 1.8714-.1716 2.6553-2.2986 2.7373-.22064.0085-.39974.18634-.39974.40725v1.4539a.4.4 45 0 0 .4.4h2.4559a.4.4 135 0 0 .4-.4.36954.36954 139.94 0 1 .4-.33633h2.3465a.4.4 45 0 1 .4.4.36954.36954 40.058 0 0 .4.33633h2.3016a.4.4 135 0 0 .4-.4v-1.409a.4.4 45 0 0 -.4-.4h-.07109c-.22091 0-.58149.0054-.79726-.04008-1.8741-.39502-1.8741-3.5854-.000017-3.9804.21578-.04548.57637-.04008.79728-.04008h1.8113a.4.4 135 0 0 .4-.4v-1.2977a.55355.55355 54.148 0 0 -.37978-.52557l-2.1408-.70784a2.484 2.484 9.148 0 0 -.77978-.12557h-5.5594a.4.4 135 0 0 -.4.4z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bookmaker-m.svg b/data/styles/default/light/symbols/bookmaker-m.svg
deleted file mode 100644
index 9cc971e7c..000000000
--- a/data/styles/default/light/symbols/bookmaker-m.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>bookmaker-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="bookmaker-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m15.8 5h-8.4c-0.77 0-1.4 0.63-1.4 1.4v11.2c0 0.77 0.63 1.4 1.4 1.4h8.4c0.77 0 1.4-0.63 1.4-1.4v-11.2c0-0.77-0.63-1.4-1.4-1.4zm-8.4 1.4h3.5v5.6l-1.75-1.05-1.75 1.05v-5.6z" fill="#fff"/>
-  </g>
- </g>
-</svg>
diff --git a/data/styles/default/light/symbols/bowling-m.svg b/data/styles/default/light/symbols/bowling-m.svg
index 2c525398e..8ac67d479 100644
--- a/data/styles/default/light/symbols/bowling-m.svg
+++ b/data/styles/default/light/symbols/bowling-m.svg
@@ -1,15 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>bowls-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="bowls-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(6 5)" fill="#fff">
-    <g transform="matrix(1.2857 0 0 1.2857 -1.8253 -2)" fill="#747E86">
-     <path id="Shape" d="m7.9124 5.4783c-0.91974 0-1.7695 0.29522-2.4664 0.79313-0.32809-0.73957-0.57704-1.2369-0.57704-2.0105v-2.4348c0-1.0068-0.8193-1.8261-1.8261-1.8261s-1.8261 0.8193-1.8261 1.8261v2.4348c0 0.71765-0.21609 1.2003-0.49 1.8115-0.34087 0.76087-0.72739 1.6234-0.72739 3.0581 0 2.6229 1.3385 4.8696 2.4348 4.8696h1.2174c0.60139 0 1.0926-0.56548 1.4231-1.0914 0.75417 0.67565 1.747 1.0914 2.8377 1.0914 2.3496 0 4.2609-1.9113 4.2609-4.2609 0-2.3496-1.9119-4.2609-4.2609-4.2609zm-5.4783-3.6522c0-0.33539 0.2733-0.6087 0.6087-0.6087s0.6087 0.2733 0.6087 0.6087v1.8261h-1.2174zm1.1638 10.957h-1.1127c-0.32443-0.18139-1.2691-1.5564-1.2691-3.6522 0-1.1748 0.30191-1.8474 0.62087-2.5602 0.22887-0.51009 0.46261-1.0323 0.55574-1.7007h1.3002c0.092522 0.66835 0.32687 1.1912 0.55513 1.7007 0.08887 0.19783 0.17652 0.40478 0.2593 0.61843-0.53504 0.71217-0.85583 1.5936-0.85583 2.5504 0 0.79009 0.21974 1.5272 0.59591 2.1621-0.29096 0.58009-0.55757 0.82478-0.64948 0.88139zm4.3144 0c-1.6782 0-3.0435-1.3653-3.0435-3.0435 0-1.6782 1.3653-3.0435 3.0435-3.0435s3.0435 1.3653 3.0435 3.0435c0 1.6782-1.3659 3.0435-3.0435 3.0435z"/>
-     <circle cx="7.9124" cy="9.7391" r="1"/>
-     <circle cx="9.1298" cy="8.5217" r="1"/>
-     <circle cx="6.695" cy="8.5217" r="1"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#747E86" transform="matrix(1.2857 0 0 1.2857 4.1747 3)"><path d="m7.9124 5.4783c-.91974 0-1.7695.29522-2.4664.79313-.32809-.73957-.57704-1.2369-.57704-2.0105v-2.4348c0-1.0068-.8193-1.8261-1.8261-1.8261s-1.8261.8193-1.8261 1.8261v2.4348c0 .71765-.21609 1.2003-.49 1.8115-.34087.76087-.72739 1.6234-.72739 3.0581 0 2.6229 1.3385 4.8696 2.4348 4.8696h1.2174c.60139 0 1.0926-.56548 1.4231-1.0914.75417.67565 1.747 1.0914 2.8377 1.0914 2.3496 0 4.2609-1.9113 4.2609-4.2609s-1.9119-4.2609-4.2609-4.2609zm-5.4783-3.6522c0-.33539.2733-.6087.6087-.6087s.6087.2733.6087.6087v1.8261h-1.2174zm1.1638 10.957h-1.1127c-.32443-.18139-1.2691-1.5564-1.2691-3.6522 0-1.1748.30191-1.8474.62087-2.5602.22887-.51009.46261-1.0323.55574-1.7007h1.3002c.092522.66835.32687 1.1912.55513 1.7007.08887.19783.17652.40478.2593.61843-.53504.71217-.85583 1.5936-.85583 2.5504 0 .79009.21974 1.5272.59591 2.1621-.29096.58009-.55757.82478-.64948.88139zm4.3144 0c-1.6782 0-3.0435-1.3653-3.0435-3.0435s1.3653-3.0435 3.0435-3.0435 3.0435 1.3653 3.0435 3.0435-1.3659 3.0435-3.0435 3.0435z"/><circle cx="7.9124" cy="9.7391" r="1"/><circle cx="9.1298" cy="8.5217" r="1"/><circle cx="6.695" cy="8.5217" r="1"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bowling_alley-m.svg b/data/styles/default/light/symbols/bowling_alley-m.svg
index bef793b5a..db11369da 100644
--- a/data/styles/default/light/symbols/bowling_alley-m.svg
+++ b/data/styles/default/light/symbols/bowling_alley-m.svg
@@ -1,5 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <circle id="Oval" cx="12" cy="12" r="12" fill="#ffffff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
- <path d="m17.814453 3.8535156c-.603341-.0348572-1.292607.2159125-1.726562.7011719-1.070067 1.1965695-.839929 1.9874104-.775391 3.5136719.02518.16606.05859.5019531.05859.5019531l3.320312.6835937s.165185-.2948914.253906-.4375c.662226-1.3766255 1.18416-2.0131914.673833-3.5351562-.236532-.7053955-.89885-1.2598998-1.552735-1.3945312-.081735-.016829-.165761-.0282236-.251953-.0332032zm-7.400391 3.3710938c-2.8975029-.0408224-5.6930185 1.8219273-6.7910151 4.4999996-1.146727 2.630925-.5519058 5.899022 1.4570312 7.951172 1.6254447 1.748763 4.1338307 2.557928 6.4765629 2.195313-.321854-.982015-.590771-2.383672-.416016-3.56836.366972-2.487752 2.212752-5.362092 3-6.921875.353016-.702272.721364-1.5366287.652344-2.7128902-.323073-.2396476-.663199-.4562423-1.025391-.6367188-1.032783-.5308062-2.19257-.8082401-3.353516-.8066406zm-2.0839839 2.5585937c.8368725-.078164 1.3385167 1.0530239.75 1.6308589-.5026045.609137-1.6070395.269157-1.6796875-.517578-.0940179-.556561.3641095-1.107381.9296875-1.1132809zm6.9941409.1191407-.208985.8750002 2.941407.605468.152343-.884765zm-.867188 2.0820312s-2.464867 4.071428-2.732422 6.365234c-.155335 1.331731.148701 2.916223.69336 3.962891 2.507839-.246004 4.359101-1.105793 5.849609-2.160156.904451-2.336395-.083984-7.402344-.083984-7.402344zm-8.4824216.621094c.8360984-.07468 1.338813 1.054191.75 1.632812-.5020198.608577-1.6071071.2708-1.6796875-.515625-.093664-.555925.364611-1.108905.9296875-1.117187zm3.0117187.160156c.8367309-.07827 1.3388649 1.053328.75 1.630859-.5032491.607309-1.6068595.266135-1.6796875-.519531-.094269-.556267.3644171-1.105487.9296875-1.111328z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m17.814453 3.8535156c-.603341-.0348572-1.292607.2159125-1.726562.7011719-1.070067 1.1965695-.839929 1.9874104-.775391 3.5136719.02518.16606.05859.5019531.05859.5019531l3.320312.6835937s.165185-.2948914.253906-.4375c.662226-1.3766255 1.18416-2.0131914.673833-3.5351562-.236532-.7053955-.89885-1.2598998-1.552735-1.3945312-.081735-.016829-.165761-.0282236-.251953-.0332032zm-7.400391 3.3710938c-2.8975029-.0408224-5.6930185 1.8219273-6.7910151 4.4999996-1.146727 2.630925-.5519058 5.899022 1.4570312 7.951172 1.6254447 1.748763 4.1338307 2.557928 6.4765629 2.195313-.321854-.982015-.590771-2.383672-.416016-3.56836.366972-2.487752 2.212752-5.362092 3-6.921875.353016-.702272.721364-1.5366287.652344-2.7128902-.323073-.2396476-.663199-.4562423-1.025391-.6367188-1.032783-.5308062-2.19257-.8082401-3.353516-.8066406zm-2.0839839 2.5585937c.8368725-.078164 1.3385167 1.0530239.75 1.6308589-.5026045.609137-1.6070395.269157-1.6796875-.517578-.0940179-.556561.3641095-1.107381.9296875-1.1132809zm6.9941409.1191407-.208985.8750002 2.941407.605468.152343-.884765zm-.867188 2.0820312s-2.464867 4.071428-2.732422 6.365234c-.155335 1.331731.148701 2.916223.69336 3.962891 2.507839-.246004 4.359101-1.105793 5.849609-2.160156.904451-2.336395-.083984-7.402344-.083984-7.402344zm-8.4824216.621094c.8360984-.07468 1.338813 1.054191.75 1.632812-.5020198.608577-1.6071071.2708-1.6796875-.515625-.093664-.555925.364611-1.108905.9296875-1.117187zm3.0117187.160156c.8367309-.07827 1.3388649 1.053328.75 1.630859-.5032491.607309-1.6068595.266135-1.6796875-.519531-.094269-.556267.3644171-1.105487.9296875-1.111328z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/car-part-m.svg b/data/styles/default/light/symbols/car-part-m.svg
index 570542be6..c07076ab2 100644
--- a/data/styles/default/light/symbols/car-part-m.svg
+++ b/data/styles/default/light/symbols/car-part-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car-part-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="car-part-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m12 5c-3.85 0-7 3.15-7 7s3.15 7 7 7 7-3.15 7-7-3.15-7-7-7zm0 1.4c2.87 0 5.25 2.17 5.6 4.9h-2.1c-0.35-0.77-1.82-1.4-3.5-1.4s-3.15 0.63-3.5 1.4h-2.1c0.35-2.73 2.73-4.9 5.6-4.9zm-5.6 6.3h2.1c0.14 0.91 0.84 2.52 2.8 2.8v2.1c-2.52-0.28-4.62-2.38-4.9-4.9zm6.3 4.9v-2.1c1.96-0.28 2.59-1.89 2.8-2.8h2.1c-0.28 2.52-2.38 4.62-4.9 4.9z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#A389BC" r="11"/><path d="m12 5c-3.85 0-7 3.15-7 7s3.15 7 7 7 7-3.15 7-7-3.15-7-7-7zm0 1.4c2.87 0 5.25 2.17 5.6 4.9h-2.1c-.35-.77-1.82-1.4-3.5-1.4s-3.15.63-3.5 1.4h-2.1c.35-2.73 2.73-4.9 5.6-4.9zm-5.6 6.3h2.1c.14.91.84 2.52 2.8 2.8v2.1c-2.52-.28-4.62-2.38-4.9-4.9zm6.3 4.9v-2.1c1.96-.28 2.59-1.89 2.8-2.8h2.1c-.28 2.52-2.38 4.62-4.9 4.9z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/car-repair-m.svg b/data/styles/default/light/symbols/car-repair-m.svg
index 6aa57037c..1dc9a7f1b 100644
--- a/data/styles/default/light/symbols/car-repair-m.svg
+++ b/data/styles/default/light/symbols/car-repair-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car-repair-m</title>
- <g transform="scale(1.5)" fill="none" fill-rule="evenodd">
-  <g id="car-repair-m" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle cx="8" cy="8" r="7.3333" fill="#747E86"/>
-   <g id="Group" transform="translate(4 3.3333)" fill="#fff">
-    <path id="Shape" d="m1.4737 5.8947v-0.49123h4.9123v0.49123c0 0.27018 0.22105 0.49123 0.49123 0.49123 0.27018 0 0.49123-0.22105 0.49123-0.49123v-3.0996s-0.65825-1.9796-0.76632-2.3039c-0.024561-0.078596-0.058947-0.14246-0.093333-0.19649-0.00982-0.009825-0.014737-0.019649-0.024561-0.034386-0.18667-0.25544-0.45193-0.26035-0.45193-0.26035h-4.2049s-0.26526 0.0049123-0.45193 0.26526c-0.00982 0.009825-0.014737 0.019649-0.024561 0.029474-0.034386 0.054035-0.068772 0.11789-0.093333 0.19649-0.10807 0.32421-0.76632 2.3039-0.76632 2.3039v3.0996c0 0.27018 0.22105 0.49123 0.49123 0.49123 0.27018 0 0.49123-0.22105 0.49123-0.49123zm0.98246-1.7193c-0.27018 0-0.49123-0.22105-0.49123-0.49123 0-0.27018 0.22105-0.49123 0.49123-0.49123 0.27018 0 0.49123 0.22105 0.49123 0.49123 0 0.27018-0.22105 0.49123-0.49123 0.49123zm2.9474 0c-0.27018 0-0.49123-0.22105-0.49123-0.49123 0-0.27018 0.22105-0.49123 0.49123-0.49123 0.27018 0 0.49123 0.22105 0.49123 0.49123 0 0.27018-0.22105 0.49123-0.49123 0.49123zm-3.2765-3.193h3.6056l0.11298 0.33895 0.21123 0.64351h-4.254z"/>
-    <path id="Path" d="m0 7.3733c0 0.26526 0.22105 0.48632 0.48632 0.48632h2.9523v0.98737c0 0.27018 0.22105 0.48632 0.48632 0.48632h0.00491c0.27018 0 0.48632-0.22105 0.48632-0.48632v-0.98737h2.9523c0.27018 0 0.48632-0.22105 0.48632-0.48632 0-0.27018-0.22105-0.48632-0.48632-0.48632h-6.8821c-0.26526-0.0049122-0.48632 0.21614-0.48632 0.48632z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12" stroke-width="1.5"/><circle cx="12" cy="12" fill="#AA96BC" r="10.99995" stroke-width="1.5"/><g fill="#fff" transform="matrix(1.5 0 0 1.5 6 4.99995)"><path d="m1.4737 5.8947v-.49123h4.9123v.49123c0 .27018.22105.49123.49123.49123s.49123-.22105.49123-.49123v-3.0996s-.65825-1.9796-.76632-2.3039c-.024561-.078596-.058947-.14246-.093333-.19649-.00982-.009825-.014737-.019649-.024561-.034386-.18667-.25544-.45193-.26035-.45193-.26035h-4.2049s-.26526.0049123-.45193.26526c-.00982.009825-.014737.019649-.024561.029474-.034386.054035-.068772.11789-.093333.19649-.10807.32421-.76632 2.3039-.76632 2.3039v3.0996c0 .27018.22105.49123.49123.49123s.49123-.22105.49123-.49123zm.98246-1.7193c-.27018 0-.49123-.22105-.49123-.49123s.22105-.49123.49123-.49123.49123.22105.49123.49123-.22105.49123-.49123.49123zm2.9474 0c-.27018 0-.49123-.22105-.49123-.49123s.22105-.49123.49123-.49123.49123.22105.49123.49123-.22105.49123-.49123.49123zm-3.2765-3.193h3.6056l.11298.33895.21123.64351h-4.254z"/><path d="m0 7.3733c0 .26526.22105.48632.48632.48632h2.9523v.98737c0 .27018.22105.48632.48632.48632h.00491c.27018 0 .48632-.22105.48632-.48632v-.98737h2.9523c.27018 0 .48632-.22105.48632-.48632 0-.27018-.22105-.48632-.48632-.48632h-6.8821c-.26526-.0049122-.48632.21614-.48632.48632z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/car-repair-s.svg b/data/styles/default/light/symbols/car-repair-s.svg
index b4397b8cd..b04cb6079 100644
--- a/data/styles/default/light/symbols/car-repair-s.svg
+++ b/data/styles/default/light/symbols/car-repair-s.svg
@@ -1,7 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <g fill-rule="evenodd">
-  <circle cx="8" cy="8" r="8" fill="#FFF" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#747E86"/>
-  <path d="m5.1625 4-0.1625 0.8h-0.075c-0.52 0-0.925 0.405-0.925 0.925v1.475 0.4 0.525c0 0.16 0.115 0.275 0.275 0.275h1.05c0.16 0 0.275-0.115 0.275-0.275v-0.525h4.8v0.525c0 0.16 0.115 0.275 0.275 0.275h1.05c0.16 0 0.275-0.115 0.275-0.275v-0.525-0.4-1.475c0-0.52-0.405-0.925-0.925-0.925h-0.075l-0.1625-0.8h-5.675zm-0.0875 1.6h0.6875c0.12 0 0.2375 0.115 0.2375 0.275v0.25c0 0.16-0.115 0.275-0.275 0.275h-0.65c-0.16 0-0.275-0.115-0.275-0.275v-0.25c0-0.16 0.115-0.275 0.275-0.275zm5.2 0h0.6875c0.12 0 0.2375 0.115 0.2375 0.275v0.25c0 0.16-0.115 0.275-0.275 0.275h-0.6875c-0.12 0-0.2375-0.115-0.2375-0.275v-0.25c0-0.16 0.115-0.275 0.275-0.275zm-6.275 3.4v1h1v1h1v-1h4.0012v1h0.99882v-1h1v-1h-8z" fill="#FFF" fill-rule="nonzero"/>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><circle cx="8" cy="8" fill="#fff" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#AA96BC" r="7"/><path d="m5.1625 4-.1625.8h-.075c-.52 0-.925.405-.925.925v1.475.4.525c0 .16.115.275.275.275h1.05c.16 0 .275-.115.275-.275v-.525h4.8v.525c0 .16.115.275.275.275h1.05c.16 0 .275-.115.275-.275v-.525-.4-1.475c0-.52-.405-.925-.925-.925h-.075l-.1625-.8zm-.0875 1.6h.6875c.12 0 .2375.115.2375.275v.25c0 .16-.115.275-.275.275h-.65c-.16 0-.275-.115-.275-.275v-.25c0-.16.115-.275.275-.275zm5.2 0h.6875c.12 0 .2375.115.2375.275v.25c0 .16-.115.275-.275.275h-.6875c-.12 0-.2375-.115-.2375-.275v-.25c0-.16.115-.275.275-.275zm-6.275 3.4v1h1v1h1v-1h4.0012v1h.99882v-1h1v-1h-8z" fill="#fff" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/car-wash-m.svg b/data/styles/default/light/symbols/car-wash-m.svg
index 1bcd7d680..bab17a3fc 100644
--- a/data/styles/default/light/symbols/car-wash-m.svg
+++ b/data/styles/default/light/symbols/car-wash-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car-wash-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="car-wash-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m14.944 7.501c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm-3.1942 0c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm-3.1942 0c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm7.6149 1.9229c-0.12777-0.37691-0.48551-0.64522-0.90714-0.64522h-7.0272c-0.42163 0-0.77299 0.26831-0.90714 0.64522l-1.2585 3.6222c-0.044718 0.13415-0.070272 0.2747-0.070272 0.42163v4.574c0 0.53023 0.42802 0.95825 0.95825 0.95825 0.53023 0 0.95825-0.42802 0.95825-0.95825v-0.31942h7.666v0.31942c0 0.52384 0.42802 0.95825 0.95825 0.95825 0.52384 0 0.95825-0.42802 0.95825-0.95825v-4.574c0-0.14054-0.025553-0.28747-0.070272-0.42163l-1.2585-3.6222zm-7.9343 6.3819c-0.53023 0-0.95825-0.42802-0.95825-0.95825 0-0.53023 0.42802-0.95825 0.95825-0.95825 0.53023 0 0.95825 0.42802 0.95825 0.95825 0 0.53023-0.42802 0.95825-0.95825 0.95825zm7.0272 0c-0.53023 0-0.95825-0.42802-0.95825-0.95825 0-0.53023 0.42802-0.95825 0.95825-0.95825 0.53023 0 0.95825 0.42802 0.95825 0.95825 0 0.53023-0.42802 0.95825-0.95825 0.95825zm-7.9854-3.1942 0.81132-2.4403c0.089436-0.25553 0.33219-0.43441 0.60689-0.43441h6.1072c0.2747 0 0.51745 0.17887 0.60689 0.43441l0.81132 2.4403h-8.9436z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m14.944 7.501c.53023 0 .95825-.42802.95825-.95825 0-.42163-.42163-1.0477-.7091-1.4182-.12777-.1661-.37691-.1661-.50468 0-.28109.37052-.70272.99658-.70272 1.4182 0 .53023.42802.95825.95825.95825zm-3.1942 0c.53023 0 .95825-.42802.95825-.95825 0-.42163-.42163-1.0477-.7091-1.4182-.12777-.1661-.37691-.1661-.50468 0-.28109.37052-.70272.99658-.70272 1.4182 0 .53023.42802.95825.95825.95825zm-3.1942 0c.53023 0 .95825-.42802.95825-.95825 0-.42163-.42163-1.0477-.7091-1.4182-.12777-.1661-.37691-.1661-.50468 0-.28109.37052-.70272.99658-.70272 1.4182 0 .53023.42802.95825.95825.95825zm7.6149 1.9229c-.12777-.37691-.48551-.64522-.90714-.64522h-7.0272c-.42163 0-.77299.26831-.90714.64522l-1.2585 3.6222c-.044718.13415-.070272.2747-.070272.42163v4.574c0 .53023.42802.95825.95825.95825s.95825-.42802.95825-.95825v-.31942h7.666v.31942c0 .52384.42802.95825.95825.95825.52384 0 .95825-.42802.95825-.95825v-4.574c0-.14054-.025553-.28747-.070272-.42163l-1.2585-3.6222zm-7.9343 6.3819c-.53023 0-.95825-.42802-.95825-.95825s.42802-.95825.95825-.95825.95825.42802.95825.95825-.42802.95825-.95825.95825zm7.0272 0c-.53023 0-.95825-.42802-.95825-.95825s.42802-.95825.95825-.95825.95825.42802.95825.95825-.42802.95825-.95825.95825zm-7.9854-3.1942.81132-2.4403c.089436-.25553.33219-.43441.60689-.43441h6.1072c.2747 0 .51745.17887.60689.43441l.81132 2.4403h-8.9436z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/car_sharing-m.svg b/data/styles/default/light/symbols/car_sharing-m.svg
index 5ae2ff078..fb7a26726 100644
--- a/data/styles/default/light/symbols/car_sharing-m.svg
+++ b/data/styles/default/light/symbols/car_sharing-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>car_sharing-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="car_sharing-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m9.9298 8.8554c0.83557 0 1.549-0.53991 1.819-1.2855h3.323v0.64275c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-0.64275c0.35351 0 0.64275-0.28924 0.64275-0.64275 0-0.35351-0.28924-0.64275-0.64275-0.64275h-4.6085c-0.30852-0.86771-1.2084-1.4398-2.2046-1.2469-0.75201 0.14783-1.3626 0.76487-1.5105 1.5169-0.22496 1.2212 0.70702 2.301 1.8961 2.301zm0-2.571c0.35351 0 0.64275 0.28924 0.64275 0.64275 0 0.35351-0.28924 0.64275-0.64275 0.64275-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275zm5.3926 3.8565h-5.6433c-0.27638 0-0.52062 0.17997-0.61061 0.43707l-1.067 3.2202v4.0557c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-0.64275h6.4275v0.64275c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-4.0557l-1.067-3.2202c-0.089984-0.2571-0.33423-0.43707-0.61061-0.43707zm-4.7499 5.4633c-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275 0.35351 0 0.64275 0.28924 0.64275 0.64275 0 0.35351-0.28924 0.64275-0.64275 0.64275zm3.8565 0c-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275s0.64275 0.28924 0.64275 0.64275c0 0.35351-0.28924 0.64275-0.64275 0.64275zm-4.7113-2.8924 0.42421-1.2855h4.7178l0.42421 1.2855h-5.5662z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#BE75A3" r="11"/><path d="m9.9298 8.8554c.83557 0 1.549-.53991 1.819-1.2855h3.323v.64275c0 .35351.28924.64275.64275.64275s.64275-.28924.64275-.64275v-.64275c.35351 0 .64275-.28924.64275-.64275s-.28924-.64275-.64275-.64275h-4.6085c-.30852-.86771-1.2084-1.4398-2.2046-1.2469-.75201.14783-1.3626.76487-1.5105 1.5169-.22496 1.2212.70702 2.301 1.8961 2.301zm0-2.571c.35351 0 .64275.28924.64275.64275s-.28924.64275-.64275.64275-.64275-.28924-.64275-.64275.28924-.64275.64275-.64275zm5.3926 3.8565h-5.6433c-.27638 0-.52062.17997-.61061.43707l-1.067 3.2202v4.0557c0 .35351.28924.64275.64275.64275s.64275-.28924.64275-.64275v-.64275h6.4275v.64275c0 .35351.28924.64275.64275.64275s.64275-.28924.64275-.64275v-4.0557l-1.067-3.2202c-.089984-.2571-.33423-.43707-.61061-.43707zm-4.7499 5.4633c-.35351 0-.64275-.28924-.64275-.64275s.28924-.64275.64275-.64275.64275.28924.64275.64275-.28924.64275-.64275.64275zm3.8565 0c-.35351 0-.64275-.28924-.64275-.64275s.28924-.64275.64275-.64275.64275.28924.64275.64275-.28924.64275-.64275.64275zm-4.7113-2.8924.42421-1.2855h4.7178l.42421 1.2855h-5.5662z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/carpenter-m.svg b/data/styles/default/light/symbols/carpenter-m.svg
index 8bebbab32..4a52a9c53 100644
--- a/data/styles/default/light/symbols/carpenter-m.svg
+++ b/data/styles/default/light/symbols/carpenter-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m8.0041 4.7771a1.8905 1.8905 0 0 0-1.3379 0.55472l-1.95 1.95a1.8905 1.8905 0 0 0 3.381e-4 2.6737l1.8869 1.8869 2.0503-0.29964 3.4484-3.4506-2.762-2.7604a1.8905 1.8905 0 0 0-1.3359-0.55505zm0.57393 1.992 1.1497 1.1497-2.2237 2.2237-1.1497-1.1497zm4.0813 1.8978-3.4906 3.4906 2.2642 0.40984 0.62677 1.9912 1.7174-0.13698 0.62748 1.9364 1.7174-0.13698 0.76439 2.0179 1.6879-0.05738 1.7988-1.7988-7.714-7.7155z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m8.0041 4.7771a1.8905 1.8905 0 0 0 -1.3379.55472l-1.95 1.95a1.8905 1.8905 0 0 0 .0003381 2.6737l1.8869 1.8869 2.0503-.29964 3.4484-3.4506-2.762-2.7604a1.8905 1.8905 0 0 0 -1.3359-.55505zm.57393 1.992 1.1497 1.1497-2.2237 2.2237-1.1497-1.1497zm4.0813 1.8978-3.4906 3.4906 2.2642.40984.62677 1.9912 1.7174-.13698.62748 1.9364 1.7174-.13698.76439 2.0179 1.6879-.05738 1.7988-1.7988-7.714-7.7155z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/casino-m.svg b/data/styles/default/light/symbols/casino-m.svg
index afe0f662d..1235814da 100644
--- a/data/styles/default/light/symbols/casino-m.svg
+++ b/data/styles/default/light/symbols/casino-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>casino-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="casino-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#9C6136"/>
-   <path id="Shape" d="m16.667 6h-9.3333c-0.73333 0-1.3333 0.6-1.3333 1.3333v9.3333c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-9.3333c0-0.73333-0.6-1.3333-1.3333-1.3333zm-7.6667 10c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm0-6c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm3 3c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm3 3c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm0-6c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m16.667 6h-9.3333c-.73333 0-1.3333.6-1.3333 1.3333v9.3333c0 .73333.6 1.3333 1.3333 1.3333h9.3333c.73333 0 1.3333-.6 1.3333-1.3333v-9.3333c0-.73333-.6-1.3333-1.3333-1.3333zm-7.6667 10c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm0-6c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm3 3c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm3 3c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1zm0-6c-.55333 0-1-.44667-1-1s.44667-1 1-1 1 .44667 1 1-.44667 1-1 1z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/castle-m.svg b/data/styles/default/light/symbols/castle-m.svg
new file mode 100644
index 000000000..42f2b9231
--- /dev/null
+++ b/data/styles/default/light/symbols/castle-m.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>castle-m</title>
+    <g id="castle-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#9C6136" cx="9" cy="9" r="8.25"></circle>
+        <path d="M11.4229281,7.01921423 L6.57676192,7.01921423 C6.19440065,7.01921423 5.88445961,6.7092682 5.88445961,6.32691192 L5.88445961,4.59615615 C5.88445961,4.40501052 6.03947013,4.25 6.23061577,4.25 C6.42176141,4.25 6.57677192,4.40501052 6.57677192,4.59615615 L6.57677192,5.63460962 L7.26907423,5.63460962 L7.26907423,4.94230731 C7.26907423,4.55994603 7.57902026,4.25 7.96137654,4.25 C8.34373281,4.25 8.65367885,4.55995103 8.65367885,4.94230731 L8.65367885,5.63460962 L9.34598115,5.63460962 L9.34598115,4.94230731 C9.34598115,4.55994603 9.65592719,4.25 10.0382835,4.25 C10.4206447,4.25 10.7305858,4.55995103 10.7305858,4.94230731 L10.7305858,5.63460962 L11.4228881,5.63460962 L11.4228881,4.59615615 C11.4228881,4.40501052 11.5778986,4.25 11.7690442,4.25 C11.9601899,4.25 12.1152004,4.40501052 12.1152004,4.59615615 L12.1152004,6.32691192 C12.1152004,6.7092732 11.8052544,7.01921423 11.4228981,7.01921423 L11.4229281,7.01921423 Z M13.1536838,13.250235 L4.84615615,13.250235 C4.65501052,13.250235 4.5,13.0952245 4.5,12.9040788 C4.5,12.7129332 4.65501052,12.5579227 4.84615615,12.5579227 L5.19231231,12.5579227 C5.57467358,12.5579227 5.88461462,12.2479767 5.88461462,11.8656204 C5.88461462,11.8656204 6.57691692,9.09636115 6.57691692,8.40405885 C6.57691692,8.02169757 6.88686296,7.71175654 7.26921923,7.71175654 L10.7307808,7.71175654 C11.113142,7.71175654 11.4230831,8.02170257 11.4230831,8.40405885 C11.4230831,9.09636115 12.1153854,11.8656204 12.1153854,11.8656204 C12.1153854,12.2479817 12.4253314,12.5579227 12.8076877,12.5579227 L13.1538438,12.5579227 C13.3423595,12.5578537 13.49626,12.7087082 13.5,12.8971538 C13.5,13.0952245 13.3449895,13.250235 13.1538438,13.250235 L13.1536838,13.250235 Z M10.0382735,10.8271269 C10.0382735,10.253625 9.57331691,9.78867346 8.99982,9.78867346 C8.42632309,9.78867346 7.96136654,10.25363 7.96136654,10.8271269 L7.96136654,12.5578827 L10.0382735,12.5578827 L10.0382735,10.1347746 L10.0382735,10.8271269 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/castle-s.svg b/data/styles/default/light/symbols/castle-s.svg
new file mode 100644
index 000000000..57277079c
--- /dev/null
+++ b/data/styles/default/light/symbols/castle-s.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>castle-s</title>
+    <g id="castle-s" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="6" cy="6" r="6"></circle>
+        <circle id="Oval" fill="#9C6136" cx="6" cy="6" r="5.25"></circle>
+        <path d="M7.61524321,4.84609462 L4.38455013,4.84609462 C4.12964927,4.84609462 3.92302731,4.63946932 3.92302731,4.3845718 L3.92302731,3.23076474 C3.92302731,3.10333765 4.02636496,3 4.15379205,3 C4.28121915,3 4.3845568,3.10333765 4.3845568,3.23076474 L4.3845568,3.92304897 L4.84607962,3.92304897 L4.84607962,3.46152615 C4.84607962,3.20662529 5.05270491,3 5.30760244,3 C5.56249997,3 5.76912526,3.20662863 5.76912526,3.46152615 L5.76912526,3.92304897 L6.23064808,3.92304897 L6.23064808,3.46152615 C6.23064808,3.20662529 6.43727337,3 6.6921709,3 C6.94707176,3 7.15369372,3.20662863 7.15369372,3.46152615 L7.15369372,3.92304897 L7.61521654,3.92304897 L7.61521654,3.23076474 C7.61521654,3.10333765 7.71855419,3 7.84598129,3 C7.97340838,3 8.07674603,3.10333765 8.07674603,3.23076474 L8.07674603,4.3845718 C8.07674603,4.63947266 7.87012074,4.84609462 7.61522321,4.84609462 L7.61524321,4.84609462 Z M8.76905026,9 L3.23084308,9 C3.10341598,9 3.00007833,8.89666235 3.00007833,8.76923526 C3.00007833,8.64180816 3.10341598,8.53847051 3.23084308,8.53847051 L3.46160782,8.53847051 C3.71650868,8.53847051 3.92313064,8.33184522 3.92313064,8.07694769 C3.92313064,8.07694769 4.38465346,6.23082308 4.38465346,5.76930025 C4.38465346,5.51439939 4.59127875,5.30777743 4.84617628,5.30777743 L7.15382372,5.30777743 C7.40872458,5.30777743 7.61534654,5.51440273 7.61534654,5.76930025 C7.61534654,6.23082308 8.07686936,8.07694769 8.07686936,8.07694769 C8.07686936,8.33184855 8.28349465,8.53847051 8.53839218,8.53847051 L8.76915692,8.53847051 C8.89483073,8.53842451 8.99742839,8.63899156 8.99992167,8.76461869 C8.99992167,8.89666235 8.89658402,9 8.76915692,9 L8.76905026,9 Z M6.69216423,7.38463679 C6.69216423,7.00231217 6.38220129,6.69235256 5.99988,6.69235256 C5.61755871,6.69235256 5.30759577,7.0023155 5.30759577,7.38463679 L5.30759577,8.53844385 L6.69216423,8.53844385 L6.69216423,6.92308064 L6.69216423,7.38463679 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/caterer-m.svg b/data/styles/default/light/symbols/caterer-m.svg
index 453cdbacd..91c85693e 100644
--- a/data/styles/default/light/symbols/caterer-m.svg
+++ b/data/styles/default/light/symbols/caterer-m.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
- <path d="m12 6.668c-3.1385 0-5.5288 2.7084-5.9375 5.998h11.875c-0.40868-3.2897-2.799-5.998-5.9375-5.998z" fill="#fff"/>
- <rect x="3.9999" y="12.666" width="16" height=".66675" fill="#BE75A3"/>
- <path d="m12 9.2229v-2.5564" stroke="#fff" stroke-width="2.667" stroke-linecap="round"/>
- <path d="m5.3333 14h13.333" stroke="#fff" stroke-width="1.333" stroke-linecap="round"/>
- <path d="m8.1773 11.312a4.3334 5 0 0 1 3.8226-2.645" fill="none" stroke="#BE75A3" stroke-linecap="round" stroke-width="1.333"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m12 6.668c-3.1385 0-5.5288 2.7084-5.9375 5.998h11.875c-.40868-3.2897-2.799-5.998-5.9375-5.998z" fill="#fff"/><path d="m3.9999 12.666h16v.66675h-16z" fill="#AA96BC"/><g stroke-linecap="round"><path d="m12 9.2229v-2.5564" stroke="#fff" stroke-width="2.667"/><g stroke-width="1.333"><path d="m5.3333 14h13.333" stroke="#fff"/><path d="m8.1773 11.312a4.3334 5 0 0 1 3.8226-2.645" fill="none" stroke="#AA96BC"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/charging-point-m.svg b/data/styles/default/light/symbols/charging-point-m.svg
new file mode 100644
index 000000000..f197e41cd
--- /dev/null
+++ b/data/styles/default/light/symbols/charging-point-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m3.85038523 3.00000538c-.31869573-.0009545-.62461528.12522209-.84996822.35057503-.22535293.22535293-.35152952.53127248-.35057503.84996821v9.59890278c-.00095449.3186957.1252221.6246153.35057503.8499682.22535294.2253529.53127249.3515295.84996822.350575h4.79945675c.31853461.0007145.62422228-.125568.84938017-.3508948.22515788-.2253268.35121114-.5311091.35025231-.8496484v-2.3992757h.60026894c.3383824 0 .6002689.2609864.6002689.5993689v1.2005378c0 .9863489.8126579 1.7999122 1.7999067 1.7999122.9863489 0 1.7999068-.8135633 1.7999068-1.7999122v-4.20007702c-.000212-.03379448-.0032222-.06750797-.0089995-.10080016.5120734-.17999067.9197523-.58766956 1.1033428-1.09884308h.1052945c.31854.00071996.6242277-.12556257.8493856-.35088937.2251579-.22532679.3512111-.53110908.3502577-.84964844h-1.1996433v-2.39927571c.0085169-.21983635-.1039086-.42671845-.2929997-.53916908-.189091-.11245063-.4245474-.11245063-.6136384 0s-.3015166.31933273-.2929997.53916908v2.39927571h-1.2005378v-2.39927571c.0085169-.21983635-.1039087-.42671845-.2929997-.53916908s-.4245474-.11245063-.6136385 0c-.189091.11245063-.3015166.31933273-.2929997.53916908v2.39927571h-1.1996378c-.0009589.31853936.1250944.62432165.3502523.84964844.2251579.2253268.5308455.35160933.8493855.35088937h.1052946c.1847635.51328337.5900599.91659781 1.1042428 1.09884308-.0057693.03329326-.0087793.06700608-.0089996.10080016v4.20007702c0 .3383825-.2618864.599369-.6002689.599369-.1597823.0024475-.3137516-.0598843-.4268328-.1727959-.1130811-.1129117-.1756439-.2667873-.1734361-.4265731v-1.2005378c0-.9863489-.8126579-1.7999067-1.7999067-1.7999067h-.60026894v-5.99908928c.00095883-.31853935-.12509443-.62432164-.35025231-.84964844-.22515789-.22532679-.53084556-.35160932-.84938017-.3508948zm.59936895 1.20054324h3.59981352c.33298275 0 .60026891.26728616.60026891.59936895v3.00044457h-4.79945138v-3.00044457c0-.33208279.26728615-.59936895.59936895-.59936895zm3.16873585 4.4997669c.06838564.00122217.1341039.02674382.1853904.07199627.0926952.09359516.09359515.23398788.00179991.32848299l-1.4363256 1.66131392 1.07994406 1.0853438c.04521547.0436508.06897825.1049573.0649932.1676785s-.03531576.1205273-.08569213.1581046l-2.35787786 1.8656034c-.11171816.08556-.26822272.0806693-.3743806-.0116994-.04461171-.0428224-.07005363-.1018365-.07056963-.1636726-.00050048-.0618362.02396797-.1212605.06786977-.1648104l1.43722554-1.6586141-1.08084401-1.0880436c-.04521547-.0436508-.06897825-.1049573-.0649932-.1676785.00398505-.0627213.03531576-.1205274.08569213-.1581046l2.35787786-1.8656034c.05421755-.04184026.12146681-.06319428.18989016-.06029688z" fill="#747e86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/charging-point-s.svg b/data/styles/default/light/symbols/charging-point-s.svg
new file mode 100644
index 000000000..8ee7698c2
--- /dev/null
+++ b/data/styles/default/light/symbols/charging-point-s.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>car-charger-s</title>
+    <g id="car-charger-s" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M3.50053103,2.50000004 C3.31462519,2.49944325 3.13617212,2.57304626 3.00471624,2.70450214 C2.87326036,2.83595802 2.79965735,3.01441108 2.80021414,3.20031693 L2.80021414,8.79967687 C2.79965735,8.98558271 2.87326036,9.16403578 3.00471624,9.29549166 C3.13617212,9.42694754 3.31462519,9.50055055 3.50053103,9.50000004 L6.30021414,9.50000004 C6.48602599,9.50041057 6.6643438,9.42674576 6.7956859,9.29530512 C6.927028,9.16386449 7.00055907,8.98549149 6.99999975,8.79967687 L6.99999975,7.40009937 L7.35015661,7.40009937 C7.54754639,7.40009937 7.70031347,7.55234148 7.70031347,7.74973126 L7.70031347,8.45004498 C7.70031347,9.02541518 8.17436391,9.50000004 8.75025908,9.50000004 C9.32562928,9.50000004 9.80021414,9.02541518 9.80021414,8.45004498 L9.80021414,6.00000004 C9.80008102,5.98028659 9.79832511,5.96062039 9.79495496,5.94119994 C10.0936645,5.83620538 10.3314772,5.5983927 10.4385716,5.30020815 L10.4999934,5.30020815 C10.6858084,5.30062812 10.8641262,5.22696331 10.9954683,5.09552268 C11.1268104,4.96408205 11.2003415,4.78570905 11.1997854,4.59989443 L10.4999934,4.59989443 L10.4999934,3.20031693 C10.5049616,3.07207906 10.43938,2.95139783 10.3290769,2.88580163 C10.2187738,2.82020543 10.0814243,2.82020543 9.97112119,2.88580163 C9.86081809,2.95139783 9.79523651,3.07207906 9.80021414,3.20031693 L9.80021414,4.59989443 L9.09989097,4.59989443 L9.09989097,3.20031693 C9.10485915,3.07207906 9.03927757,2.95139783 8.92897447,2.88580163 C8.81867138,2.82020543 8.68132181,2.82020543 8.57101872,2.88580163 C8.46071562,2.95139783 8.39513404,3.07207906 8.40010222,3.20031693 L8.40010222,4.59989443 L7.70031347,4.59989443 C7.69975415,4.78570905 7.77328522,4.96408205 7.90462732,5.09552268 C8.03596942,5.22696331 8.21428723,5.30062812 8.40010222,5.30020815 L8.46152404,5.30020815 C8.56930279,5.59962345 8.80572565,5.8348902 9.10566567,5.94119994 C9.10230029,5.96062101 9.10054441,5.98028682 9.10041594,6.00000004 L9.10041594,8.45004498 C9.10041594,8.64743476 8.94764886,8.79967687 8.75025908,8.79967687 C8.65705272,8.8011046 8.5672373,8.76474437 8.50127329,8.69887926 C8.43530928,8.63301414 8.39881434,8.54325338 8.40010222,8.45004498 L8.40010222,7.74973126 C8.40010222,7.17436106 7.92605178,6.69978565 7.35015661,6.69978565 L6.99999975,6.69978565 L6.99999975,3.20031693 C7.00055907,3.01450231 6.927028,2.8361293 6.7956859,2.70468867 C6.6643438,2.57324804 6.48602599,2.49958323 6.30021414,2.50000004 L3.50053103,2.50000004 Z M3.85016292,3.20031693 L5.95005414,3.20031693 C6.14429408,3.20031693 6.300211,3.35623385 6.300211,3.54994882 L6.300211,5.30020815 L3.50053103,5.30020815 L3.50053103,3.54994882 C3.50053103,3.35623385 3.65644795,3.20031693 3.85016292,3.20031693 Z M5.69859217,5.82518095 C5.73848379,5.82589388 5.77681944,5.84078151 5.80673656,5.86717878 C5.86080876,5.92177595 5.86133373,6.00367171 5.80778651,6.05879385 L4.96992991,7.02789365 L5.59989728,7.66101085 C5.62627297,7.68647382 5.64013459,7.72223596 5.63780998,7.75882333 C5.63548537,7.7954107 5.61720912,7.82913093 5.5878229,7.85105101 L4.21239415,8.93931963 C4.14722523,8.98922968 4.0559309,8.98637673 3.99400547,8.93249499 C3.96798197,8.90751525 3.95314085,8.87309035 3.95283985,8.83701929 C3.9525479,8.80094823 3.96682117,8.76628403 3.99243055,8.74087991 L4.83081212,7.77335503 L4.20031978,7.13866291 C4.17394409,7.11319995 4.16008247,7.07743781 4.16240708,7.04085044 C4.16473169,7.00426307 4.18300794,6.97054283 4.21239415,6.94862276 L5.5878229,5.86035413 C5.61944981,5.83594732 5.65867854,5.8234908 5.69859217,5.82518095 L5.69859217,5.82518095 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/charging-station-m.svg b/data/styles/default/light/symbols/charging-station-m.svg
index 558610e90..924a28a56 100644
--- a/data/styles/default/light/symbols/charging-station-m.svg
+++ b/data/styles/default/light/symbols/charging-station-m.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path d="M6.667 5.333a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2V12a.68.68 0 0 0-.01-.112c.569-.2 1.022-.653 1.226-1.221H20a1.33 1.33 0 0 0 1.333-1.334H20V6.667a.667.667 0 1 0-1.333 0v2.666h-1.334V6.667a.667.667 0 1 0-1.333 0v2.666h-1.333A1.33 1.33 0 0 0 16 10.667h.117a2.022 2.022 0 0 0 1.227 1.221.682.682 0 0 0-.01.112v4.667c0 .376-.291.666-.667.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333Zm.666 1.334h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zm3.521 5a.32.32 0 0 1 .206.08c.103.104.104.26.002.365l-1.596 1.846 1.2 1.206a.238.238 0 0 1-.023.362l-2.62 2.073a.329.329 0 0 1-.416-.013.255.255 0 0 1-.003-.365l1.597-1.843L8 14.169a.238.238 0 0 1 .023-.362l2.62-2.073a.323.323 0 0 1 .211-.067z" style="fill:#747E86;fill-opacity:1;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>car-charging-station-m</title>
+    <g id="car-charging-station-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#747E86" cx="9" cy="9" r="8.25"></circle>
+        <path d="M5.50068347,4.50000005 C5.26166167,4.49928417 5.03222201,4.59391662 4.8632073,4.76293132 C4.6941926,4.93194602 4.59956016,5.16138568 4.60027603,5.40040748 L4.60027603,12.5995845 C4.59956016,12.8386063 4.6941926,13.068046 4.8632073,13.2370607 C5.03222201,13.4060754 5.26166167,13.5007079 5.50068347,13.5 L9.10027603,13.5 C9.33917699,13.5005279 9.56844274,13.405816 9.73731116,13.2368209 C9.90617957,13.0678258 10.0007195,12.8384891 10.0000004,12.5995845 L10.0000004,10.8001278 L10.4502021,10.8001278 C10.7039889,10.8001278 10.9004037,10.9958676 10.9004037,11.2496545 L10.9004037,12.1500578 C10.9004037,12.8898195 11.5098972,13.5 12.2503338,13.5 C12.9900955,13.5 13.6002639,12.8898195 13.6002639,12.1500578 L13.6002639,9.00000005 C13.6001049,8.97465419 13.5978473,8.94936907 13.5935142,8.92439993 C13.9775693,8.78940692 14.2833285,8.48364776 14.4210214,8.10026762 L14.4999923,8.10026762 C14.7388973,8.10080759 14.968163,8.00609569 15.1370314,7.83710059 C15.3058999,7.6681055 15.4004398,7.43876878 15.3997247,7.19986426 L14.4999923,7.19986426 L14.4999923,5.40040748 C14.5063799,5.23553022 14.4220608,5.08036864 14.2802425,4.99603067 C14.1384242,4.9116927 13.9618319,4.9116927 13.8200137,4.99603067 C13.6781954,5.08036864 13.5938762,5.23553022 13.6002639,5.40040748 L13.6002639,7.19986426 L12.6998605,7.19986426 L12.6998605,5.40040748 C12.7062482,5.23553022 12.621929,5.08036864 12.4801107,4.99603067 C12.3382925,4.9116927 12.1617002,4.9116927 12.0198819,4.99603067 C11.8780637,5.08036864 11.7937445,5.23553022 11.8001321,5.40040748 L11.8001321,7.19986426 L10.9004037,7.19986426 C10.8996846,7.43876878 10.9942246,7.6681055 11.163093,7.83710059 C11.3319614,8.00609569 11.5612272,8.10080759 11.8001321,8.10026762 L11.879103,8.10026762 C12.0176757,8.48523015 12.321648,8.78771597 12.7072851,8.92439993 C12.7029582,8.94936987 12.7007007,8.97465448 12.7005355,9.00000005 L12.7005355,12.1500578 C12.7005355,12.4038447 12.5041207,12.5995845 12.2503338,12.5995845 C12.1304971,12.6014202 12.0150201,12.5546713 11.9302092,12.4699876 C11.8453984,12.3853039 11.7984763,12.2698972 11.8001321,12.1500578 L11.8001321,11.2496545 C11.8001321,10.5098928 11.1906387,9.8997244 10.4502021,9.8997244 L10.0000004,9.8997244 L10.0000004,5.40040748 C10.0007195,5.16150297 9.90617957,4.93216625 9.73731116,4.76317115 C9.56844274,4.59417605 9.33917699,4.49946416 9.10027603,4.50000005 L5.50068347,4.50000005 Z M5.95021018,5.40040748 L8.65007032,5.40040748 C8.89980738,5.40040748 9.100272,5.6008721 9.100272,5.84993419 L9.100272,8.10026762 L5.50068347,8.10026762 L5.50068347,5.84993419 C5.50068347,5.6008721 5.70114808,5.40040748 5.95021018,5.40040748 Z M8.32676207,8.77523266 C8.3780513,8.77614928 8.42733999,8.79529052 8.46580487,8.82922986 C8.53532627,8.89942622 8.53600123,9.00472077 8.4671548,9.0755921 L7.3899106,10.3215776 L8.19986864,11.1355854 C8.23378025,11.1683235 8.25160233,11.2143034 8.24861354,11.2613443 C8.24562476,11.3083852 8.22212673,11.3517398 8.18434445,11.3799227 L6.41593605,12.7791252 C6.33214744,12.8432953 6.21476901,12.8396272 6.1351506,12.7703507 C6.10169182,12.7382339 6.08261038,12.6939733 6.08222338,12.6475962 C6.08184802,12.6012191 6.10019936,12.5566509 6.13312571,12.5239885 L7.21104487,11.2800279 L6.40041186,10.4639952 C6.36650026,10.4312571 6.34867817,10.3852772 6.35166696,10.3382363 C6.35465574,10.2911954 6.37815378,10.2478408 6.41593605,10.2196578 L8.18434445,8.82045531 C8.22500761,8.78907512 8.27544455,8.7730596 8.32676207,8.77523266 L8.32676207,8.77523266 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/charging-station-s.svg b/data/styles/default/light/symbols/charging-station-s.svg
index d93cdf6ff..1539e5fe4 100644
--- a/data/styles/default/light/symbols/charging-station-s.svg
+++ b/data/styles/default/light/symbols/charging-station-s.svg
@@ -1,7 +1,9 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <g fill-rule="evenodd">
-  <circle cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#747E86"/>
-  <path d="m4.9543 4h3.4248c0.29547 0 0.50983 0.22388 0.50983 0.50004v6.6111h0.44444v0.88889h-5.3333v-0.88889h0.44444v-6.6111c0-0.27942 0.22826-0.50004 0.50983-0.50004zm6.5584 4.0394 0.45533 2.0732c0.079682 0.33803 0.011383 0.70986-0.21628 1.0141-0.22766 0.29296-0.56916 0.4507-0.93342 0.4507-0.66022 0-1.1839-0.51831-1.1839-1.1718v-0.033803l0.18213-1.6789c0-0.22535-0.18213-0.40563-0.40979-0.40563h-0.51793v-0.48451h0.51793c0.48948 0 0.89927 0.42817 0.89927 0.91268v0.033803l-0.19351 1.6563c0.022766 0.37183 0.31873 0.66479 0.69437 0.66479 0.21628 0 0.40979-0.10141 0.54639-0.25915 0.12522-0.16901 0.15936-0.37183 0.11383-0.58592l-0.44394-2.0732c-0.045533-0.14648-0.079682-0.32676-0.079682-0.48451v-0.50704l-0.22766-0.32676c0.011383-0.84507-0.92204-1.7014-0.92204-1.7014l0.25043-0.39437c1.9124 0.72113 1.7758 2.0169 1.7758 2.0169l-0.3415 0.40563h-0.03415v0.50704c0 0.12394 0.03415 0.23662 0.068299 0.37183zm-5.1794 2.1828 1.6667-2.6843h-1.3333l0.33333-1.7602-1.6667 2.6843h1.3l-0.3 1.7602z" fill="#fff"/>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>car-charging-station-s</title>
+    <g id="car-charging-station-s" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="6" cy="6" r="6"></circle>
+        <circle id="Oval" fill="#747E86" cx="6" cy="6" r="5.25"></circle>
+        <path d="M3.60027378,3.00000535 C3.44092605,2.9995281 3.28796642,3.06261634 3.17529005,3.17529271 C3.06261368,3.28796907 2.99952544,3.44092871 3.00000269,3.60027644 L3.00000269,8.39972356 C2.99952544,8.55907129 3.06261368,8.71203093 3.17529005,8.82470729 C3.28796642,8.93738366 3.44092605,9.0004719 3.60027378,8.99999465 L6.00000269,8.99999465 C6.15926719,9.00035191 6.31211089,8.9372107 6.42468974,8.82454741 C6.53726858,8.71188411 6.60029515,8.5589931 6.59981574,8.39972356 L6.59981574,7.20008677 L6.89994992,7.20008677 C7.06914101,7.20008677 7.20008411,7.33057989 7.20008411,7.49977098 L7.20008411,8.10003935 C7.20008411,8.59321337 7.6064127,8.99999465 8.10003669,8.99999465 C8.59321071,8.99999465 8.99998928,8.59321337 8.99998928,8.10003935 L8.99998928,6.00000535 C8.99988327,5.98310547 8.9983782,5.96624873 8.99548951,5.94960266 C9.25152602,5.8596074 9.45536528,5.65576814 9.54716045,5.4001816 L9.59980767,5.4001816 C9.75907752,5.40054158 9.91192123,5.33740037 10.0245001,5.22473707 C10.1370789,5.11207378 10.2001055,4.95918277 10.1996288,4.79991323 L9.59980767,4.79991323 L9.59980767,3.60027644 C9.60406611,3.49035836 9.54785337,3.3869174 9.45330795,3.33069214 C9.35876252,3.27446687 9.24103443,3.27446687 9.146489,3.33069214 C9.05194358,3.3869174 8.99573084,3.49035836 8.99998928,3.60027644 L8.99998928,4.79991323 L8.3997209,4.79991323 L8.3997209,3.60027644 C8.40397934,3.49035836 8.3477666,3.3869174 8.25322118,3.33069214 C8.15867575,3.27446687 8.04094766,3.27446687 7.94640223,3.33069214 C7.85185681,3.3869174 7.79564407,3.49035836 7.79990251,3.60027644 L7.79990251,4.79991323 L7.20008411,4.79991323 C7.1996047,4.95918277 7.26263127,5.11207378 7.37521011,5.22473707 C7.48778896,5.33740037 7.64063266,5.40054158 7.79990251,5.4001816 L7.85254973,5.4001816 C7.94493144,5.65682306 8.14757942,5.8584801 8.40467064,5.94960266 C8.40178603,5.96624927 8.400281,5.98310566 8.40017088,6.00000535 L8.40017088,8.10003935 C8.40017088,8.26923044 8.26922778,8.39972356 8.10003669,8.39972356 C8.0201456,8.40094733 7.94316102,8.36978145 7.88662049,8.31332569 C7.83007996,8.25686992 7.79879861,8.17993219 7.79990251,8.10003935 L7.79990251,7.49977098 C7.79990251,7.00659696 7.39357392,6.5998184 6.89994992,6.5998184 L6.59981574,6.5998184 L6.59981574,3.60027644 C6.60029515,3.4410069 6.53726858,3.28811589 6.42468974,3.17545259 C6.31211089,3.0627893 6.15926719,2.99964809 6.00000269,3.00000535 L3.60027378,3.00000535 Z M3.89995799,3.60027644 L5.69986316,3.60027644 C5.86635438,3.60027644 5.99999734,3.7339194 5.99999734,3.89996065 L5.99999734,5.4001816 L3.60027378,5.4001816 L3.60027378,3.89996065 C3.60027378,3.7339194 3.73391674,3.60027644 3.89995799,3.60027644 Z M5.48432451,5.85015789 C5.5185173,5.85076898 5.5513764,5.86352979 5.57701963,5.886156 C5.62336719,5.93295353 5.62381716,6.00314983 5.57791958,6.05039734 L4.85975742,6.88105358 L5.39972897,7.42372499 C5.42233669,7.44555036 5.43421806,7.4762036 5.43222554,7.50756418 C5.43023302,7.53892475 5.41456768,7.56782778 5.38937951,7.5866164 L4.21044163,8.51941726 C4.1545826,8.56219725 4.07633039,8.55975187 4.02325149,8.51356756 C4.00094566,8.49215638 3.98822471,8.46264935 3.98796671,8.43173132 C3.98771647,8.4008133 3.99995069,8.37110116 4.02190156,8.34932622 L4.7405137,7.52001991 L4.20009218,6.97599858 C4.17748446,6.9541732 4.16560308,6.92351996 4.1675956,6.89215939 C4.16958813,6.86079881 4.18525347,6.83189578 4.21044163,6.81310716 L5.38937951,5.88030631 C5.41648827,5.8593862 5.45011287,5.84870919 5.48432451,5.85015789 L5.48432451,5.85015789 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/cinema-m.svg b/data/styles/default/light/symbols/cinema-m.svg
index 539be76ae..00b27fb36 100644
--- a/data/styles/default/light/symbols/cinema-m.svg
+++ b/data/styles/default/light/symbols/cinema-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>cinema-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="cinema-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#9C6136"/>
-   <path id="Shape" d="m16.333 6.6667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667h-4c-0.36667 0-0.66667 0.3-0.66667 0.66667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667-0.36667 0-0.66667 0.3-0.66667 0.66667v10.667c0 0.36667 0.3 0.66667 0.66667 0.66667 0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667h4c0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667s0.66667-0.3 0.66667-0.66667v-10.667c0-0.36667-0.3-0.66667-0.66667-0.66667s-0.66667 0.3-0.66667 0.66667zm-6.6667 8.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm6.6667 5.3333h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m16.333 6.6667v.66667h-1.3333v-.66667c0-.36667-.3-.66667-.66667-.66667h-4c-.36667 0-.66667.3-.66667.66667v.66667h-1.3333v-.66667c0-.36667-.3-.66667-.66667-.66667s-.66667.3-.66667.66667v10.667c0 .36667.3.66667.66667.66667s.66667-.3.66667-.66667v-.66667h1.3333v.66667c0 .36667.3.66667.66667.66667h4c.36667 0 .66667-.3.66667-.66667v-.66667h1.3333v.66667c0 .36667.3.66667.66667.66667s.66667-.3.66667-.66667v-10.667c0-.36667-.3-.66667-.66667-.66667s-.66667.3-.66667.66667zm-6.6667 8.6667h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333zm6.6667 5.3333h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333zm0-2.6667h-1.3333v-1.3333h1.3333z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/climbing-centre-m.svg b/data/styles/default/light/symbols/climbing-centre-m.svg
new file mode 100644
index 000000000..a954c2433
--- /dev/null
+++ b/data/styles/default/light/symbols/climbing-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m7.12322426 4.4275468c.1310725 0 .24663999.06564985.31633037.1657106h5.86540697c.3161032 0 .5703839.25407967.5703839.57061102l-.0074275 8.78535278c-.0004456.2840341-.1550937.3681389-.3456556.1877919-.1903173-.1803732-.4221147-.543645-.5179112-.8112951l-.656848-1.8391219c-.0794474-.014466-.1573988-.0427025-.2298662-.0883778l-2.86367197-1.81378127-2.53162164.82529367-.04269818.0095752c-.12149547.595244-.10387933 1.4949431.76306914 2.2382814.05416178.0462948.0603152.1274462.01401777.1814131-.0252769.0297447-.06139961.0448268-.09750047.0448268-.02974734 0-.0594938-.0101712-.08370901-.0310117-.92324149-.7911537-.96998019-1.7589755-.85208485-2.4217829-.16132403-.0254955-.30829964-.1112351-.40934102-.2437041l-.07416359-.1172529-.14531571-.31121856c-.36499322-.11855071-1.00760673-.39687005-1.299278-.94835323-.30767959-.58171723-.16409578-1.38265176-.06563831-1.76845029l.06563831-.22568672.0036211.00679829c.01252179-.17929844.12087506-.34394123.30144053-.41956307l1.00121914-.41807759c.26233724-.1093931.57866761.00744492.70698759.26087797l.27130434.53708434.32503359-.03718877-.66535896-1.79892637c-.04396347-.11854197-.02677025-.2508815.04525322-.3543414.07224716-.10365737.19056193-.1654834.3167498-.1654834zm2.19545563 1.4150955c-.04736086 1.32855086-.85440919 2.3333876-1.30434613 2.79289283l1.12844684-.36793798c.18268011-.05969479.3811064-.03443275.54383728.06817954l2.80032022 1.77341091.4289217-.96853837c.1153438-.25982939.1459361-.6619773.0694684-.89819616-.0766949-.23623633-.3596542-.49434168-.6317956-.57656171l-1.3079288-.39493018c-.2449273-.07399567-.4724536-.31885221-.5424584-.57057715l-.034709-.16757672c-.0705526-.24977992-.3010158-.48350903-.54958427-.54411092zm-1.89554253-.46187764.57676269 1.55906369c.04121007.11109706.02888052.23495183-.03314561.33607863-.06202351.10112593-.16697763.16781737-.28487297.18141308l-.53005545.06059919.54193236 1.07217305.10801774-.10447479c.41951113-.41999312 1.23646105-1.40275639 1.26090345-2.70545747zm-3.28577087-.40707623c-.11237282-.74142471.55998541-1.35537704 1.28503479-1.17309888.81873127.20499739 1.06410772 1.3105415.40829958 1.83143235-.62797709.49816288-1.57372634.13065307-1.69333437-.65833347z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/climbing-m.svg b/data/styles/default/light/symbols/climbing-m.svg
index 440955588..72da2afce 100644
--- a/data/styles/default/light/symbols/climbing-m.svg
+++ b/data/styles/default/light/symbols/climbing-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>climbing-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="climbing-m" fill-rule="nonzero">
-   <g id="climbing-silhouette" transform="translate(6 6)" fill="#fff">
-    <g transform="matrix(1.6132 0 0 1.6132 -3.0024 -3.6586)" fill="#747E86">
-     <path id="Path" d="m1.9535 2.1329c0.75051-0.59611 0.4697-1.8613-0.46726-2.0959-0.82975-0.2086-1.5992 0.49401-1.4706 1.3425 0.13688 0.90292 1.2192 1.3235 1.9378 0.75341z"/>
-     <path id="Shape" d="m2.7293 2.836c-0.14685-0.29003-0.50886-0.42374-0.80908-0.29855l-1.1458 0.47845c-0.20664 0.086542-0.33064 0.27496-0.34497 0.48015l-0.004144-0.00778s-0.48015 1.3743 0 2.2821c0.33379 0.63112 1.0692 0.94963 1.4869 1.0853l0.1663 0.35616c0.00534 0.011161 0.012661 0.020441 0.018229 0.031119l0.011186 0.023848 0.00219-9.661e-4c0.11329 0.19716 0.30633 0.32504 0.52172 0.35908-0.13492 0.75852-0.081432 1.8661 0.97513 2.7715 0.027712 0.02385 0.061754 0.03549 0.095797 0.03549 0.041314 0 0.082653-0.01726 0.11158-0.0513 0.052983-0.06176 0.045941-0.15463-0.016042-0.20761-0.99214-0.85068-1.0123-1.8803-0.87326-2.5615 0.016297-0.00412 0.032568-0.00582 0.048864-0.010958l2.8972-0.94447 3.2772 2.0757c0.082932 0.052271 0.17214 0.084585 0.26306 0.10114l0.7517 2.1047c0.10963 0.3063 0.3749 0.72203 0.5927 0.92845 0.21808 0.20639 0.39506 0.11014 0.39557-0.21491l0.0085-10.054c0-0.36224-0.291-0.65301-0.65275-0.65301h-6.7124c-0.079754-0.11451-0.21201-0.18964-0.36201-0.18964h-0.36808c-0.14441 0-0.27981 0.070754-0.36249 0.18938-0.082424 0.1184-0.1021 0.26985-0.051788 0.40551l0.76144 2.0587-0.37197 0.042559zm3.9027-0.29492c0.31607 0.077059 0.60656 0.39872 0.64886 0.7184 0.042305 0.31945 0.32916 0.65494 0.6406 0.74903l1.4968 0.45196c0.31144 0.094093 0.63526 0.38947 0.72303 0.65982 0.08751 0.27033 0.0525 0.73055-0.0795 1.0279l-0.49086 1.1084-3.2047-2.0295c-0.18623-0.11743-0.41331-0.14634-0.62237-0.078025l-1.2914 0.42107c0.51491-0.52586 1.4385-1.6758 1.4927-3.1962zm-2.56 1.6807c0.13492-0.015559 0.25503-0.091881 0.32601-0.20761 0.070983-0.11573 0.085093-0.25747 0.037932-0.38461l-0.66005-1.7842 1.8763 0.45707c-0.030636 1.6328-1.1492 2.8264-1.5666 3.2157l-0.62019-1.227z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.40138743 2.66891096c.181485 0 .34150154.09089979.4379959.22944544h8.12133277c.4376813 0 .7897622.35180262.7897622.79007679l-.0102841 12.16433461c-.0006171.393278-.2147452.5097309-.4786002.2600196-.2635162-.2497476-.5844664-.7527393-.7171077-1.1233317l-.9094818-2.5464765c-.1100041-.0200299-.2179369-.0591266-.3182763-.1223693l-3.96508431-2.5113894-3.50532228 1.1427143-.05912055.013258c-.1682245.8241839-.14383292 2.0699212 1.05655727 3.0991589.07499323.0641005.08351335.1764639.01940922.2511873-.03499878.041185-.08501484.0620679-.13500065.0620679-.04118862 0-.08237604-.0140832-.11590479-.0429394-1.27833436-1.0954434-1.34304949-2.4355045-1.17980978-3.3532378-.22337174-.0353014-.42687643-.1540178-.56677988-.3374364l-.10268804-.1623502-.20120637-.430918c-.50537523-.1641471-1.39514779-.54951235-1.79900031-1.31310444-.42601789-.80545462-.22720954-1.9144409-.09088382-2.44862347l.09088382-.31248932.00501382.00941303c.01733787-.24825939.16736547-.47622632.41737921-.58093349l1.38630342-.57887665c.36323618-.15146739.80123207.01030834.97890589.36121564l.37565217.74365523.4500465-.05149213-.92126625-2.49082113c-.06087249-.16413503-.0370665-.34737439.0626583-.49062655.10003453-.1435256.26385499-.22913086.43857665-.22913086zm3.03986165 1.959363c-.06557658 1.83953196-1.18302812 3.23084436-1.80601773 3.86708238l1.56246486-.5094526c.2529417-.08265431.52768579-.04767611.75300547.09440245l3.87736652 2.45549201.5938915-1.34105312c.1597068-.35976376.2020654-.91658394.0961871-1.24365621-.106193-.32709646-.4979828-.6844731-.874794-.79831622l-1.8109783-.5468264c-.3391302-.10245554-.6541665-.44148767-.7510962-.7900299l-.0480586-.23202931c-.0976882-.34584911-.4167911-.66947403-.7609629-.75338435zm-2.62459735-.6395229.7985945 2.15870358c.05706009.15382669.0399884.32531792-.04589393.46533964-.0858787.14002052-.23119979.23236251-.3944395.25118734l-.73392292.08390657.75036788 1.4845473.14956302-.14465741c.58086156-.58152892 1.712023-1.94227806 1.74586632-3.74601802zm-4.54952889-.56364401c-.15559314-1.02658805.77536441-1.87667589 1.77927894-1.62429075 1.1336279.28384254 1.47337992 1.81459592.56533787 2.53582941-.86950673.68976399-2.1790057.18090425-2.34461681-.91153866z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/craft-m.svg b/data/styles/default/light/symbols/craft-m.svg
index b64a4183d..63dec88b8 100644
--- a/data/styles/default/light/symbols/craft-m.svg
+++ b/data/styles/default/light/symbols/craft-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#BE75A3"/>
- <path d="m12.5 12.44c0-0.36313-0.29312-0.65625-0.65625-0.65625h-2.1875c-0.1225 0-0.21875-0.09625-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h3.5c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-3.5c-0.1225 0-0.21875-0.096248-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h3.9375c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-3.9332c-0.1225 0-0.21875-0.096247-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h2.6206c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-4.9918l1.0281-1.8025c0.14438-0.25375 0.105-0.56875-0.096248-0.77872-0.25375-0.2625-0.67375-0.27125-0.93188-0.013125l-3.0144 2.9662c-0.33688 0.32812-0.525 0.77438-0.525 1.2469v3.1937c0 0.9669 0.78315 1.75 1.75 1.75h6.3437c0.36313 0 0.65625-0.29312 0.65625-0.65625z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#AA96BC" r="8.25"/><path d="m12.5 12.44c0-.36313-.29312-.65625-.65625-.65625h-2.1875c-.1225 0-.21875-.09625-.21875-.21875s.096248-.21875.21875-.21875h3.5c.36313 0 .65625-.29312.65625-.65625s-.29312-.65625-.65625-.65625h-3.5c-.1225 0-.21875-.096248-.21875-.21875 0-.1225.096248-.21875.21875-.21875h3.9375c.36313 0 .65625-.29312.65625-.65625s-.29312-.65625-.65625-.65625h-3.9332c-.1225 0-.21875-.096247-.21875-.21875 0-.1225.096248-.21875.21875-.21875h2.6206c.36313 0 .65625-.29312.65625-.65625s-.29312-.65625-.65625-.65625h-4.9918l1.0281-1.8025c.14438-.25375.105-.56875-.096248-.77872-.25375-.2625-.67375-.27125-.93188-.013125l-3.0144 2.9662c-.33688.32812-.525.77438-.525 1.2469v3.1937c0 .9669.78315 1.75 1.75 1.75h6.3437c.36313 0 .65625-.29312.65625-.65625z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/cricket-centre-m.svg b/data/styles/default/light/symbols/cricket-centre-m.svg
new file mode 100644
index 000000000..d37b5510b
--- /dev/null
+++ b/data/styles/default/light/symbols/cricket-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m10.81025 11.5622656 1.9883828 1.9883828c.2196797.2196797.2196797.5801797 0 .7998594s-.5801797.2196797-.7998594 0l-1.9883828-1.9883828zm-5.97641406-6.7706406c.21967968-.21967969.57454687-.21967969.79422656 0l4.7822578 4.78225781c.2196797.21967969.2196797.57454689 0 .79422659l-1.59408593 1.5940859c-.21967968.2196797-.57454687.2196797-.79422656 0l-4.78225781-4.7822578c-.21967969-.21967969-.21967969-.57454687 0-.79422656zm7.51980466-1.3068125c1.0888208 0 1.9714844.88266362 1.9714844 1.97148438 0 1.08882075-.8826636 1.97148437-1.9714844 1.97148437-1.0888207 0-1.9714844-.88266362-1.9714844-1.97148437 0-1.08882076.8826637-1.97148438 1.9714844-1.97148438z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/cricket-m.svg b/data/styles/default/light/symbols/cricket-m.svg
index 5868894cd..c5f00072f 100644
--- a/data/styles/default/light/symbols/cricket-m.svg
+++ b/data/styles/default/light/symbols/cricket-m.svg
@@ -1,14 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>cricket-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="cricket-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5 5)" fill="#fff">
-    <g transform="matrix(1.2875 0 0 1.2875 -2.0248 -1.8243)" fill="#747E86">
-     <path transform="translate(0,1.4)" d="m9.135 6.167-5.943-5.943c-0.273-0.273-0.714-0.273-0.987 0l-1.981 1.981c-0.273 0.273-0.273 0.714 0 0.987l5.943 5.943c0.273 0.273 0.714 0.273 0.987 0l1.981-1.981c0.273-0.273 0.273-0.714 0-0.987z"/>
-     <path transform="translate(0,1.4)" d="m8.638 9.632 2.471 2.471c0.273 0.273 0.721 0.273 0.994 0s0.273-0.721 0-0.994l-2.471-2.471z"/>
-     <circle cx="11.55" cy="2.45" r="2.45"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m11.5323 12.0747188 2.3860594 2.3860593c.2636156.2636157.2636156.6962157 0 .9598313-.2636157.2636156-.6962157.2636156-.9598313 0l-2.3860594-2.3860594zm-7.17169688-8.1247688c.26361563-.26361562.68945625-.26361562.95307188 0l5.7387094 5.73870938c.2636156.26361562.2636156.68945622 0 .95307192l-1.91290315 1.9129031c-.26361563.2636156-.68945625.2636156-.95307188 0l-5.73870937-5.7387094c-.26361563-.26361562-.26361563-.68945625 0-.95307187zm9.02376558-1.568175c1.306585 0 2.3657813 1.05919634 2.3657813 2.36578125s-1.0591963 2.36578125-2.3657813 2.36578125c-1.3065849 0-2.3657812-1.05919634-2.3657812-2.36578125s1.0591963-2.36578125 2.3657812-2.36578125z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/curling-centre-m.svg b/data/styles/default/light/symbols/curling-centre-m.svg
new file mode 100644
index 000000000..3a872d0d0
--- /dev/null
+++ b/data/styles/default/light/symbols/curling-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m3.45464554 9.81835887c-.04866535.21277533-.07964991.43189873-.07964991.65917033 0 .2272796.03098456.4464031.07964991.6591704h11.09076966c.0486637-.2127753.0796491-.4318988.0796491-.6591704 0-.2272796-.0310657-.4464031-.0796491-.65917033zm2.57903385-2.28324249c-1.01650657.11466837-1.89528252.74552118-2.33563477 1.62408017h10.60381078c-.4403925-.87853488-1.3192086-1.5094118-2.3357151-1.62408017v-1.34219044h-4.94383797c-.54605286 0-.98878366.44270669-.98878366.98878365zm-2.33563477 4.26105092c.48734459.9724713 1.50531364 1.6479459 2.66517575 1.6479459h5.27337893c1.1599424 0 2.1778151-.6754826 2.6651757-1.6479459zm2.33559459-7.91040591c0 .54605287.44274687.98878366.98882383.98878366h2.96627062c.36409414 0 .65917034.29508422.65917034.65917036h1.3183246v-.3295892c0-.91011489-.7377909-1.64794597-1.6479459-1.64794597h-3.9550543c-.15929119 0-.29216452.11296192-.32289393.26315973z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/curling-m.svg b/data/styles/default/light/symbols/curling-m.svg
index 875162ffe..2e52b6107 100644
--- a/data/styles/default/light/symbols/curling-m.svg
+++ b/data/styles/default/light/symbols/curling-m.svg
@@ -1,15 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>curling-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="curling-m" fill-rule="nonzero">
-   <g id="curling" transform="translate(5 6)" fill="#fff">
-    <g transform="matrix(1.2857 0 0 1.2857 .57142 -1.9277)" fill="#747E86">
-     <path id="Path" d="m-1.9009 7.8067c-0.060562 0.26479-0.099121 0.53748-0.099121 0.82031 0 0.28284 0.038559 0.55553 0.099121 0.82031h13.802c0.06056-0.26479 0.09912-0.53748 0.09912-0.82031 0-0.28284-0.03866-0.55553-0.09912-0.82031z"/>
-     <path d="m1.3086 4.9653c-1.265 0.1427-2.3586 0.92777-2.9066 2.0211h13.196c-0.54805-1.0933-1.6417-1.8784-2.9067-2.0211v-1.6703h-6.1524c-0.67954 0-1.2305 0.55093-1.2305 1.2305z"/>
-     <path d="m-1.598 10.268c0.60648 1.2102 1.8733 2.0508 3.3167 2.0508h6.5625c1.4435 0 2.7102-0.84061 3.3167-2.0508z"/>
-     <path d="m1.3086 0.42383c0 0.67954 0.55093 1.2305 1.2305 1.2305h3.6914c0.4531 0 0.82031 0.36722 0.82031 0.82031h1.6406v-0.41016c0-1.1326-0.91815-2.0508-2.0508-2.0508h-4.9219c-0.22655 0-0.41016 0.18361-0.41016 0.41016z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m2.34557465 10.5820306c-.05839842.2553304-.0955799.5182786-.0955799.7910045 0 .2727355.03718148.5356837.0955799.7910044h13.30892355c.0583965-.2553304.0955789-.5182785.0955789-.7910044 0-.2727356-.0372788-.5356837-.0955789-.7910045zm3.09484061-2.73989094c-1.21980787.13760204-2.27433901.89462541-2.80276171 1.9488962h12.72457285c-.5284709-1.05424186-1.5830502-1.81129416-2.8028581-1.9488962v-1.61062853h-5.9326055c-.65526344 0-1.18654039.53124802-1.18654039 1.18654038zm-2.80276171 5.11326104c.5848135 1.1669656 1.80637636 1.9775352 3.19821089 1.9775352h6.32805466c1.391931 0 2.6133781-.8105792 3.1982109-1.9775352zm2.8027135-9.49248703c0 .65526344.53129624 1.18654039 1.1865886 1.18654039h3.55952475c.436913 0 .7910044.35410107.7910044.79100443h1.5819896v-.39550704c0-1.09213786-.8853491-1.97753517-1.9775352-1.97753517h-4.74606511c-.19114944 0-.35059744.13555432-.38747273.31579168z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/dance-m.svg b/data/styles/default/light/symbols/dance-m.svg
index 06d3ae8fb..d4d1764f0 100644
--- a/data/styles/default/light/symbols/dance-m.svg
+++ b/data/styles/default/light/symbols/dance-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-    <title>dance-m</title>
-    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-    <circle cx="12" cy="12" r="11" fill="#747E86"/>
-    <g id="dance-m" fill-rule="nonzero">
-      <path
-	  style="fill:#ffffff;stroke:none;stroke-width:1.29048" id="Shape"
-	  d="m 14.640892,5.1330653 c -1.408845,0 -1.408845,2.1132706 0,2.1132706 1.408848,0 1.408848,-2.1132706 0,-2.1132706 z M 9.3577166,7.2463359 C 8.7954093,7.2440113 8.6191711,8.0050431 9.1252568,8.2501394 l 2.1132702,1.0566353 c 0.202816,0.096343 0.444373,0.053965 0.602282,-0.1056635 l 0.824176,-0.8241755 0.390955,0.1267962 v 6.4454761 l -1.954776,1.954774 c -0.366565,0.488755 0.25089,1.106211 0.739645,0.739645 l 2.113271,-2.11327 c 0.09702,-0.09494 0.15378,-0.223589 0.158495,-0.359255 v -1.891379 l 2.039306,2.02874 -0.950971,2.852915 c -0.0981,0.277296 0.04917,0.581316 0.327556,0.676248 0.280372,0.09721 0.585793,-0.05551 0.676248,-0.338124 l 1.056635,-3.169906 c 0.07396,-0.243026 0,-0.390955 -0.126797,-0.528317 L 15.16921,12.835937 V 9.2116776 l 0.147929,0.052832 0.940406,1.9547754 c 0.128041,0.269218 0.453336,0.379245 0.718512,0.243026 L 19.11046,10.352844 C 19.369501,10.220988 19.473374,9.9046473 19.34292,9.644898 19.207107,9.3836206 18.883898,9.2838059 18.624408,9.4230046 L 16.976057,10.268313 16.173014,8.598829 C 16.112204,8.4696003 16.001665,8.3704964 15.86659,8.3241039 L 13.647655,7.5950256 12.696684,7.2780349 C 12.50948,7.2125611 12.301374,7.2574473 12.1578,7.3942648 L 11.365323,8.1867413 9.6007428,7.3097339 C 9.526008,7.2693727 9.4426438,7.2476261 9.3577166,7.2463359 Z M 9.8860343,9.7082961 5.6594931,11.113621 v 3.529162 c -0.9414269,0 -1.4127247,1.138142 -0.7471161,1.803751 0.6656088,0.665609 1.8037514,0.194311 1.8037514,-0.747115 V 12.476681 L 8.829399,11.768735 v 1.817413 c -0.941427,0 -1.4127248,1.138142 -0.747116,1.803751 0.6656086,0.665609 1.8037513,0.194311 1.8037513,-0.747116 z" />
-    </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#51ab8c" r="11"/><path d="m14.640892 5.1330653c-1.408845 0-1.408845 2.1132706 0 2.1132706 1.408848 0 1.408848-2.1132706 0-2.1132706zm-5.2831754 2.1132706c-.5623073-.0023246-.7385455.7587072-.2324598 1.0038035l2.1132702 1.0566353c.202816.096343.444373.053965.602282-.1056635l.824176-.8241755.390955.1267962v6.4454761l-1.954776 1.954774c-.366565.488755.25089 1.106211.739645.739645l2.113271-2.11327c.09702-.09494.15378-.223589.158495-.359255v-1.891379l2.039306 2.02874-.950971 2.852915c-.0981.277296.04917.581316.327556.676248.280372.09721.585793-.05551.676248-.338124l1.056635-3.169906c.07396-.243026 0-.390955-.126797-.528317l-1.965342-1.965342v-3.6242594l.147929.052832.940406 1.9547754c.128041.269218.453336.379245.718512.243026l2.134403-1.109467c.259041-.131856.362914-.4481967.23246-.707946-.135813-.2612774-.459022-.3610921-.718512-.2218934l-1.648351.8453084-.803043-1.669484c-.06081-.1292287-.171349-.2283326-.306424-.2747251l-2.218935-.7290783-.950971-.3169907c-.187204-.0654738-.39531-.0205876-.538884.1162299l-.792477.7924765-1.7645802-.8770074c-.0747348-.0403612-.158099-.0621078-.2430262-.063398zm.5283177 2.4619602-4.2265412 1.4053249v3.529162c-.9414269 0-1.4127247 1.138142-.7471161 1.803751.6656088.665609 1.8037514.194311 1.8037514-.747115v-3.222738l2.1132706-.707946v1.817413c-.941427 0-1.4127248 1.138142-.747116 1.803751.6656086.665609 1.8037513.194311 1.8037513-.747116z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/diving-centre-m.svg b/data/styles/default/light/symbols/diving-centre-m.svg
new file mode 100644
index 000000000..b5d671e8a
--- /dev/null
+++ b/data/styles/default/light/symbols/diving-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#0797b8" r="8.25"/><path d="m9.2125 7.541875.07756875 1.232-.812375.05131875-.0777625-1.232zm5.3691875 1.083c-.415475.04283125-.7058125-.51534375-.7058125-1.5154375-.3426375-.3092875-1.9599375 1.38125-1.9599375 1.38125l.0104625.0225c-.3659313.25619375-.7389375.50113125-1.1118125.74625.1865187-.52225.3659312-1.0480625.5220562-1.581375.0045-.01678125.0084875-.0329625.0116438-.04914375l1.375875-1.2405c-.917-.37284375-.5662625-.8899375-1.56675-1.3068125-.298625.0894125-.6130437 1.854125-.6775625 2.230125-.020525.03434375-.0371063.0726375-.0501312.11605625-.1703375.584425-.370075 1.1588125-.57515005 1.7311875-1.351-.39770625-2.7691875-.18829375-4.1205625.15375625-.7040625.17823125-.7061875.99637495-.29744375 1.37724995.05250125.0913875.1458625.1612563.28816875.185925.81475.140925 1.536375.4806063 2.2084375.9566875.49639375.3509313.9659375-.4646187.4746875-.8125625-.23250625-.1646125-.475075-.3134312-.7249375-.4480375.6975-.065925 1.3934375-.0193437 2.0870625.2417813.30218125.1132937.63674995-.03395.83331245-.2759313.6458126-.4519875 1.3200626-.86349995 1.9613126-1.32356245.0169749-.0122375.0323687-.0250625.0463812-.03789375.714125-.18099375 2.29425-.58481875 1.97075-.5514625zm-10.00625 1.1025c.3521125-.7211875.7450625-.719625 1.280375-.7184375.23250625.0009375.4934375.002.7681875-.06553125l1.705875-.1077625-.0777625-1.232375-2.208625.13934375c-.34046875.0215125-.59883125.3148125-.57731875.6550625.00553125.08645.02861937.167375.06533125.2398125-.4821875.02625-.95725.178425-1.3348125 1.011125-.34145625.009275-.6570625.2265875-.773125.569225-.08033125.2364562-.04855625.4831687.065725.6845l-.11428125.3373125.7954375.2698125.06158062-.182175c.03533-.0005925.0702625-.003375.105-.0082938.12276875.1085563.3092875.1117125.4350125.0005925.0904-.0795437.1251375-.1985562.10381875-.3088875.0588175-.073625.10678125-.1582937.13895-.2528375.13895-.40975-.05644937-.85187495-.43935625-1.03049995z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/diving-m.svg b/data/styles/default/light/symbols/diving-m.svg
index 98bf9eab2..774e3e692 100644
--- a/data/styles/default/light/symbols/diving-m.svg
+++ b/data/styles/default/light/symbols/diving-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>diving-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="diving-m" fill-rule="nonzero">
-   <path id="Shape" d="m12.34 10.467 0.12411 1.9712-1.2998 0.08211-0.12442-1.9712zm8.5907 1.7328c-0.66476 0.06853-1.1293-0.82455-1.1293-2.4247-0.54822-0.49486-3.1359 2.21-3.1359 2.21l0.01674 0.036c-0.58549 0.40991-1.1823 0.80181-1.7789 1.194 0.29843-0.8356 0.58549-1.6769 0.83529-2.5302 0.0072-0.02685 0.01358-0.05274 0.01863-0.07863l2.2014-1.9848c-1.4672-0.59655-0.90602-1.4239-2.5068-2.0909-0.4778 0.14306-0.98087 2.9666-1.0841 3.5682-0.03284 0.05495-0.05937 0.11622-0.08021 0.18569-0.27254 0.93508-0.59212 1.8541-0.92024 2.7699-2.1616-0.63633-4.4307-0.30127-6.5929 0.24601-1.1265 0.28517-1.1299 1.5942-0.47591 2.2036 0.084002 0.14622 0.23338 0.25801 0.46107 0.29748 1.3036 0.22548 2.4582 0.76897 3.5335 1.5307 0.79423 0.56149 1.5455-0.74339 0.7595-1.3001-0.37201-0.26338-0.76012-0.50149-1.1599-0.71686 1.116-0.10548 2.2295-0.03095 3.3393 0.38685 0.48349 0.18127 1.0188-0.05432 1.3333-0.44149 1.0333-0.72318 2.1121-1.3816 3.1381-2.1177 0.02716-0.01958 0.05179-0.0401 0.07421-0.06063 1.1426-0.28959 3.6708-0.93571 3.1532-0.88234zm-16.01 1.764c0.56338-1.1539 1.1921-1.1514 2.0486-1.1495 0.37201 0.0015 0.7895 0.0032 1.2291-0.10485l2.7294-0.17242-0.12442-1.9718-3.5338 0.22295c-0.54475 0.03442-0.95813 0.5037-0.92371 1.0481 0.00885 0.13832 0.045791 0.2678 0.10453 0.3837-0.7715 0.042-1.5316 0.28548-2.1357 1.6178-0.54633 0.01484-1.0513 0.36254-1.237 0.91076-0.12853 0.37833-0.077687 0.77307 0.10516 1.0952l-0.18285 0.5397 1.2727 0.4317 0.098529-0.29148c0.056528-9.48e-4 0.11242-0.0054 0.168-0.01327 0.19643 0.17369 0.49486 0.17874 0.69602 9.48e-4 0.14464-0.12727 0.20022-0.31769 0.16611-0.49422 0.094108-0.1178 0.17085-0.25327 0.22232-0.40454 0.22232-0.6556-0.090319-1.363-0.70297-1.6488z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.255 7.85025.0930825 1.4784-.97485.0615825-.093315-1.4784zm6.443025 1.2996c-.49857.0513975-.846975-.6184125-.846975-1.818525-.411165-.371145-2.351925 1.6575-2.351925 1.6575l.012555.027c-.4391175.3074325-.886725.6013575-1.334175.8955.2238225-.6267.4391175-1.257675.6264675-1.89765.0054-.0201375.010185-.039555.0139725-.0589725l1.65105-1.4886c-1.1004-.4474125-.679515-1.067925-1.8801-1.568175-.35835.107295-.7356525 2.22495-.813075 2.67615-.02463.0412125-.0445275.087165-.0601575.1392675-.204405.70131-.44409 1.390575-.69018 2.077425-1.6212-.4772475-3.323025-.2259525-4.944675.1845075-.844875.2138775-.847425 1.19565-.3569325 1.6527.0630015.109665.175035.1935075.3458025.22311.9777.16911 1.84365.5767275 2.650125 1.148025.5956725.4211175 1.159125-.5575425.569625-.975075-.2790075-.197535-.57009-.3761175-.869925-.537645.837-.07911 1.672125-.0232125 2.504475.2901375.3626175.1359525.7641-.04074.999975-.3311175.774975-.542385 1.584075-1.0362 2.353575-1.588275.02037-.014685.0388425-.030075.0556575-.0454725.85695-.2171925 2.7531-.7017825 2.3649-.661755zm-12.0075 1.323c.422535-.865425.894075-.86355 1.53645-.862125.2790075.001125.592125.0024.921825-.0786375l2.04705-.129315-.093315-1.47885-2.65035.1672125c-.4085625.025815-.7185975.377775-.6927825.786075.0066375.10374.03434325.20085.0783975.287775-.578625.0315-1.1487.21411-1.601775 1.21335-.4097475.01113-.788475.271905-.92775.68307-.0963975.2837475-.0582675.5798025.07887.8214l-.1371375.404775.954525.323775.07389675-.21861c.042396-.000711.084315-.00405.126-.0099525.1473225.1302675.371145.134055.522015.000711.10848-.0954525.150165-.2382675.1245825-.370665.070581-.08835.1281375-.1899525.16674-.303405.16674-.4917-.06773925-1.02225-.5272275-1.2366z" fill="#0797b8"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/drinking-water-m.svg b/data/styles/default/light/symbols/drinking-water-m.svg
index 2b81ca5da..eba4f2405 100644
--- a/data/styles/default/light/symbols/drinking-water-m.svg
+++ b/data/styles/default/light/symbols/drinking-water-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m8.9999 16.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#54a3b6"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m8.9999 16.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#0797B8"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/drinking-water-no-m.svg b/data/styles/default/light/symbols/drinking-water-no-m.svg
index 9435d542f..70bc8505c 100644
--- a/data/styles/default/light/symbols/drinking-water-no-m.svg
+++ b/data/styles/default/light/symbols/drinking-water-no-m.svg
@@ -1,5 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m9 1.125c-0.48327 0.64426-1.3499 1.7966-2.252 3.1465l7.6758 7.6758c0.017408-0.17226 0.027344-0.34669 0.027344-0.52344 0-3.0627-4.1387-8.5489-5.4512-10.299zm-4.1133 6.2383c-0.77413 1.4766-1.3379 2.9334-1.3379 4.0605 0 3.0288 2.626 5.4512 5.4512 5.4512 1.4181 0 2.7859-0.6104 3.7969-1.6016l-7.9102-7.9102z" fill="#53a397"/>
- <path d="m3.5 3.5 12 12" fill="none" stroke="#53a397" stroke-linecap="round" stroke-width="1.5"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 1.125c-.48327.64426-1.3499 1.7966-2.252 3.1465l7.6758 7.6758c.017408-.17226.027344-.34669.027344-.52344 0-3.0627-4.1387-8.5489-5.4512-10.299zm-4.1133 6.2383c-.77413 1.4766-1.3379 2.9334-1.3379 4.0605 0 3.0288 2.626 5.4512 5.4512 5.4512 1.4181 0 2.7859-.6104 3.7969-1.6016l-7.9102-7.9102z" fill="#1AACB0"/><path d="m3.5 3.5 12 12" fill="none" stroke="#1AACB0" stroke-linecap="round" stroke-width="1.5"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/drinking-water-no-s.svg b/data/styles/default/light/symbols/drinking-water-no-s.svg
index 0e401c535..01fc1f80e 100644
--- a/data/styles/default/light/symbols/drinking-water-no-s.svg
+++ b/data/styles/default/light/symbols/drinking-water-no-s.svg
@@ -1,5 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 1.5c-0.26873 0.32248-0.79561 0.96524-1.3594 1.7266l4.7969 4.7969c0.040305-0.20986 0.0625-0.43378 0.0625-0.67383 0-1.575-2.75-4.9496-3.5-5.8496zm-2.5059 3.4082c-0.56428 0.91908-0.99414 1.8201-0.99414 2.4414 0 2.25 1.8856 3.1504 3.5 3.1504 0.8072 0 1.6823-0.22422 2.3555-0.73047l-4.8613-4.8613z" fill="#53a397"/>
- <path d="m3 3 6.5 6.5" fill="#fff" stroke="#53a397" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6 1.5c-.26873.32248-.79561.96524-1.3594 1.7266l4.7969 4.7969c.040305-.20986.0625-.43378.0625-.67383 0-1.575-2.75-4.9496-3.5-5.8496zm-2.5059 3.4082c-.56428.91908-.99414 1.8201-.99414 2.4414 0 2.25 1.8856 3.1504 3.5 3.1504.8072 0 1.6823-.22422 2.3555-.73047l-4.8613-4.8613z" fill="#1AACB0"/><path d="m3 3 6.5 6.5" fill="#fff" stroke="#1AACB0" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/drinking-water-s.svg b/data/styles/default/light/symbols/drinking-water-s.svg
index df226f0e3..16e6cf79e 100644
--- a/data/styles/default/light/symbols/drinking-water-s.svg
+++ b/data/styles/default/light/symbols/drinking-water-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6 10.5c-1.6144 0-3.5-.9-3.5-3.15 0-1.575 2.75-4.95 3.5-5.85.75.9 3.5 4.275 3.5 5.85 0 2.25-1.8856 3.15-3.5 3.15z" fill="#54a3b6"/></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6 10.5c-1.6144 0-3.5-.9-3.5-3.15 0-1.575 2.75-4.95 3.5-5.85.75.9 3.5 4.275 3.5 5.85 0 2.25-1.8856 3.15-3.5 3.15z" fill="#0797B8"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/dry_cleaning-m.svg b/data/styles/default/light/symbols/dry_cleaning-m.svg
index 5f4a11ecc..379921418 100644
--- a/data/styles/default/light/symbols/dry_cleaning-m.svg
+++ b/data/styles/default/light/symbols/dry_cleaning-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#747E86"/>
- <path d="m7.5 4.9758c0-1.875 2.25-1.2638 2.25-0.37502 0 0.88875-0.75 2.0104-0.75 2.8992l-5.5 4h11l-5.5-4" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#BE75A3" r="8.25"/><path d="m7.5 4.9758c0-1.875 2.25-1.2638 2.25-.37502 0 .88875-.75 2.0104-.75 2.8992l-5.5 4h11l-5.5-4" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/electrician-m.svg b/data/styles/default/light/symbols/electrician-m.svg
index 134eb8a20..82d075626 100644
--- a/data/styles/default/light/symbols/electrician-m.svg
+++ b/data/styles/default/light/symbols/electrician-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m16.694 14.397v-1.1984h1.8975q0.25966 0 0.42943 0.16978 0.16978 0.16978 0.16978 0.42943 0 0.23968-0.16978 0.41945-0.16978 0.17976-0.42943 0.17976zm0 3.1958v-1.1984h1.8975q0.25966 0 0.42943 0.16978 0.16978 0.16978 0.16978 0.42943 0 0.23968-0.16978 0.41945-0.16978 0.17976-0.42943 0.17976zm-3.0959 0.79894q-0.57924 0-0.9887-0.46938-0.40946-0.46938-0.40946-1.1285h-1.8975v-2.7963h1.8975q0-0.65913 0.40946-1.1285 0.40946-0.46938 0.9887-0.46938h2.4967v5.9921zm-5.6925-2.3968q-1.3382 0-2.2171-0.86885-0.87884-0.86885-0.87884-2.2271t0.87884-2.2271q0.87884-0.86885 2.2171-0.86885h1.2983q0.65913 0 1.0786-0.41945 0.41945-0.41945 0.41945-1.0786 0-0.65913-0.41945-1.0786-0.41945-0.41945-1.0786-0.41945h-2.996q-0.23968 0-0.41945-0.17976-0.17976-0.17976-0.17976-0.41945 0-0.25966 0.17976-0.42943 0.17976-0.16978 0.41945-0.16978h2.996q1.1585 0 1.9275 0.76899t0.76898 1.9275q0 1.1585-0.76898 1.9275-0.76898 0.76898-1.9275 0.76898h-1.2983q-0.83889 0-1.3682 0.51932-0.5293 0.51931-0.5293 1.3782 0 0.85887 0.5293 1.3782 0.5293 0.51931 1.3682 0.51931h1.7976v1.1984z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m16.694 14.397v-1.1984h1.8975q.25966 0 .42943.16978.16978.16978.16978.42943 0 .23968-.16978.41945-.16978.17976-.42943.17976zm0 3.1958v-1.1984h1.8975q.25966 0 .42943.16978.16978.16978.16978.42943 0 .23968-.16978.41945-.16978.17976-.42943.17976zm-3.0959.79894q-.57924 0-.9887-.46938-.40946-.46938-.40946-1.1285h-1.8975v-2.7963h1.8975q0-.65913.40946-1.1285.40946-.46938.9887-.46938h2.4967v5.9921zm-5.6925-2.3968q-1.3382 0-2.2171-.86885-.87884-.86885-.87884-2.2271t.87884-2.2271q.87884-.86885 2.2171-.86885h1.2983q.65913 0 1.0786-.41945.41945-.41945.41945-1.0786 0-.65913-.41945-1.0786-.41945-.41945-1.0786-.41945h-2.996q-.23968 0-.41945-.17976-.17976-.17976-.17976-.41945 0-.25966.17976-.42943.17976-.16978.41945-.16978h2.996q1.1585 0 1.9275.76899t.76898 1.9275q0 1.1585-.76898 1.9275-.76898.76898-1.9275.76898h-1.2983q-.83889 0-1.3682.51932-.5293.51931-.5293 1.3782 0 .85887.5293 1.3782.5293.51931 1.3682.51931h1.7976v1.1984z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/equestrian-centre-m.svg b/data/styles/default/light/symbols/equestrian-centre-m.svg
new file mode 100644
index 000000000..29d0955f1
--- /dev/null
+++ b/data/styles/default/light/symbols/equestrian-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9.24809749 5.79006754c.06112551-.09655577.19496583-.1359272.29964779-.08825574l.85197452.3949215.0204978.00413673c.0430936.0132609.0814462.03440896.1164402.05926237l.0588503.02734512c.1034032.04787024.1624482.17633441.1317881.28656153l-.0165759.02589324c-.000433.03958792-.0043766.0793698-.0165977.11915249l-.31473 1.02146802.1079495.114388c.4055129-.21656699.7264801-.5298644 1.0836801-.91048438.3632119-.38685727.825464-.59136013 1.3366326-.59136013.0648518 0 .1272167.00329652.186475.00868876.1110722.0105527.2733063-.00600149.3539083-.03564354l.3259329-.1197561c.1644796-.06027884.3178527-.03211041.4050622.07252327.0654594.07874285.0886871.19351716.06483.32302759l-.0588479.32116043c-.0174.09655335.0043621.25464267.034607.34538528.0379925.11410632.0688848.23731954.0922571.36811587l.0293662.20169138c.0113961.09988528.0517896.26584567.0971811.3601214l.0957324.19581089c.1195308.24200711.1210036.46081149.004346.58534013-.1259773.13447531-.3851913.12682155-.6050339-.0105519l-.166732-.10317135c-.0759331-.04484931-.1549982-.0870419-.1993853-.09573967l-.0607633-.00859218-.1435464-.0083958c-.1781935-.00706626-.3990582-.01596748-.5617188-.14027882-.0180198.15787202-.032933.37834236-.0151225.59610852l.0070192.04697196.02696.11237287c.0223819.08701633.0457456.17696137.0441359.25505313-.0017082.07506486-.0207958.14662124-.0571542.21364037l-.0421113.0654686c-.013046.01742419-.0756283.10773542-.023404.17135263l1.7284958 2.10104349c.1050039.1278364.1018893.3255145-.0070823.4500431l-.7131846.8132631c-.170741.1945553-.5068146.346842-.7656182.346842h-.347687c-.2051306 0-.2838735-.0967466-.3124524-.1543631-.0287962-.0573831-.0582442-.1785879.0656727-.3420775l.5741613-.7581414c.0389369-.0515965.0348001-.1384197-.0085149-.1862819l-1.3372764-1.4699096c-.0418664-.0459789-.1369864-.0598684-.2043097-.0308766l-.1312419.051875c-.3177791.115252-.8593214.2444196-1.75177795.2968503-.24863877.0147345-.49810651.0219738-.74260854.0227947l-.76227816.8845694c-.22377007.2598176-.60129152.301853-.84247773.0934307-.24159747-.2082453-.25280046-.5855575-.02569847-.8431216l.19041864-.2156817-.2281241-.0317217c-.0834832-.0134565-.19082748.0298336-.23743578.0876441l-1.80157279 2.234079c-.16326426.2024506-.49479067.3611435-.75504289.3611435h-.32198939c-.20469601 0-.28428231-.0969638-.31349056-.1547735-.02920504-.0578097-.05989254-.1792398.06153757-.344178l1.72471319-2.341602c.05676906-.077093.11540287-.227931.12576-.3226171l.04849317-.4438059c.01202632-.11104798.02175489-.29132598.02175489-.40196355v-.34872526c-.17923979-.07150437-.53252029-.17301537-.71650042-.05573005-.08868954.05633688-.13178684.16244336-.13219851.32384851-.00209251 1.30613825-1.26042007 1.83577735-1.27305241 1.84092815-.01263233.0051508-.02589323.0076457-.03915413.0076457-.01616465 0-.03232851-.0037504-.04704129-.0113962-.02695478-.0136737-.04643422-.038309-.05367133-.0675398-.11402181-.4657601.04839768-.9743859.38603602-1.93158953l.13488128-.38214986c.11436386-.32387265.31535773-.55155411.59714673-.67651734.52715219-.23351796 1.17358564-.03397597 1.37373446.03874206.24409963-.20885689.69906014-.42475589 1.54218171-.42475589.12638776 0 .26086388.00663004.39864778.01657592zm.69367353-1.82571796c.20941218-.23102948.87645688-.83231294 1.39795928-.59528761.729136.33150227.4977202 1.0368158.5731231 1.22701713.0422849.10628354.0517816.20513464.0480795.28552333-.0053922.11436386-.1263877.16368438-.2308283.11623103l-.0979859-.04454959c-.0267359.15891827-.0895112.31390906-.1989335.44755623-.3343996.40944031-.9380251.47013122-1.3476586.13551433-.40958032-.33462817-.47029538-.9381973-.13569458-1.34780662l.00808193-.00808193c-.06567592-.05594252-.08017221-.14524049-.01614293-.2161163z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/equestrian-m.svg b/data/styles/default/light/symbols/equestrian-m.svg
index 35b11a4f1..a5fc53db7 100644
--- a/data/styles/default/light/symbols/equestrian-m.svg
+++ b/data/styles/default/light/symbols/equestrian-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>equestrian-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="equestrian-m" fill-rule="nonzero">
-   <g id="equestrian-race" transform="translate(5 6)" fill="#fff">
-    <g transform="matrix(1.2877 0 0 1.2877 -2 -2.2964)" fill="#747E86">
-     <path id="Path" d="m8.338 2.7604c0.50898 0.41577 1.259 0.34036 1.6745-0.16838 0.13596-0.16606 0.21396-0.35864 0.24718-0.5561l0.12175 0.055354c0.12977 0.058962 0.28011-0.00232 0.28681-0.14442 0.0046-0.099885-0.0072-0.22271-0.05974-0.35477-0.09369-0.23633 0.19385-1.1127-0.71212-1.5246-0.64798-0.29451-1.4768 0.4526-1.737 0.73966-0.079558 0.088065-0.061546 0.19902 0.020058 0.26853-0.00307 0.00361-0.00695 0.00617-0.010042 0.010042-0.41575 0.50895-0.34031 1.2589 0.16867 1.6747z"/>
-     <path d="m7.2974 3.0756-1.7448 2.7529c-0.1712-0.012358-0.33829-0.020596-0.49533-0.020596-1.0476 0-1.6129 0.26826-1.9162 0.52777-0.24869-0.090354-1.0519-0.33829-1.7069-0.048138-0.35013 0.15527-0.59987 0.43817-0.74197 0.84059l-0.080823 0.22938c-0.47786 1.3503-0.71755 2.0282-0.56643 2.6455 0.0089923 0.03632 0.033196 0.06693 0.066688 0.08392 0.018281 0.0095 0.038365 0.01416 0.05845 0.01416 0.016477 0 0.032954-0.0031 0.04865-0.0095 0.015696-0.0064 1.5792-0.66449 1.5818-2.2874 5.115e-4 -0.20055 0.054061-0.33239 0.16426-0.40239 0.2286-0.14573 0.66756-0.0196 0.89027 0.069246v0.4333c0 0.13747-0.012088 0.36147-0.027031 0.49945l-0.060254 0.55144c-0.012869 0.11765-0.085723 0.30507-0.15626 0.40086l-2.143 2.9095c-0.15088 0.20494-0.11275 0.35582-0.076462 0.42765 0.036292 0.07183 0.13518 0.19231 0.38952 0.19231h0.40008c0.32337 0 0.7353-0.19718 0.93816-0.44873l2.2385-2.7759c0.057912-0.071831 0.19129-0.12562 0.29502-0.1089 0.075169 0.011846 0.17198 0.025496 0.28345 0.039415l-0.2366 0.26799c-0.28218 0.32003-0.26826 0.78885 0.031931 1.0476 0.29968 0.25897 0.76876 0.20674 1.0468-0.11609l0.94715-1.0991c0.3038-0.00102 0.61377-0.010015 0.92271-0.028323 1.2795-0.075169 1.9785-0.27728 2.3397-0.4333 0.083651-0.036023 0.20184-0.018765 0.25386 0.038365l1.6616 1.8264c0.05382 0.05947 0.05896 0.16735 0.01058 0.23146l-0.71341 0.94201c-0.15397 0.20314-0.11738 0.35374-0.0816 0.42504 0.03551 0.07159 0.13335 0.1918 0.38823 0.1918h0.43201c0.32157 0 0.73915-0.18922 0.9513-0.43096l0.88615-1.0105c0.1354-0.15473 0.13927-0.40035 0.0088-0.55919l-2.1477-2.6106c-0.06489-0.079046 0.01287-0.19126 0.02908-0.21291 0.07929-0.10583 0.12051-0.22244 0.12334-0.3468 2e-3 -0.097031-0.02703-0.20879-0.05484-0.31691-0.01879-0.071831-0.03783-0.14625-0.04222-0.19799-0.02213-0.27058-0.0036-0.54452 0.01879-0.74068 0.20211 0.15446 0.47654 0.16552 0.69795 0.1743 0.09498 0.00388 0.18458 0.00746 0.25386 0.021108 0.09192 0.018012 0.30353 0.15163 0.41733 0.22346l0.03758 0.023692c0.27316 0.17069 0.59524 0.1802 0.75177 0.013111 0.14495-0.15473 0.14312-0.4266-0.0054-0.7273-0.03915-0.078777-0.08163-0.16552-0.11895-0.2433-0.0564-0.11714-0.10659-0.32335-0.12075-0.44746-0.02935-0.2572-0.08031-0.49533-0.15112-0.708-0.03758-0.11275-0.06462-0.30918-0.043-0.42915l0.07312-0.39905c0.029643-0.16092 7.82e-4 -0.30353-0.080553-0.40137-0.10836-0.13001-0.29893-0.16501-0.5033-0.090112l-0.40498 0.1488c-0.10015 0.036831-0.30173 0.0574-0.43974 0.044288-0.07363-0.0067-0.15112-0.010796-0.2317-0.010796-0.63514 0-1.2095 0.2541-1.6608 0.73478-0.44383 0.47293-0.84264 0.86221-1.3465 1.1313l-0.13413-0.14213 0.39106-1.2692c0.015185-0.049431 0.020085-0.098861 0.020623-0.14805l0.020596-0.032173c0.038096-0.13696-0.035269-0.29658-0.16375-0.35606l-0.073123-0.033977c-0.043481-0.030881-0.091135-0.057158-0.14468-0.073635-0.00848-0.00258-0.016988-0.00283-0.025469-0.00514l-1.0586-0.4907c-0.13007-0.059233-0.29637-0.010313-0.37232 0.10966z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.29771699 5.74808105c.07335061-.11586692.23395899-.16311264.35957734-.10590689l1.02236937.4739058.0245974.00496408c.0517124.01591307.0977354.04129074.1397283.07111484l.0706204.03281414c.1240837.0574443.1949378.2116013.1581456.34387385l-.0198911.03107187c-.0005196.04750551-.0052519.09524377-.0199172.14298299l-.3776759 1.22576163.1295394.1372656c.4866154-.25988039.8717761-.63583728 1.300416-1.09258125.4358543-.46422873.9905568-.70963216 1.6039591-.70963216.0778222 0 .1526601.00395582.2237701.01042651.1332866.01266324.3279675-.00720179.4246899-.04277224l.3911196-.14370732c.1973754-.07233462.3814231-.0385325.4860745.08702791.0785513.09449143.1064246.2322206.0777961.38763311l-.0706175.38539252c-.02088.11586402.0052345.30557121.0415283.41446234.0455911.13692758.0826618.28478344.1107086.44173905l.0352394.24202965c.0136753.11986233.0621476.3190148.1166173.43214568l.1148789.23497306c.1434369.29040854.1452043.55297379.0052152.70240816-.1511727.16137037-.4622296.15218585-.7260407-.01266228l-.2000784-.12380562c-.0911197-.05381918-.1859978-.10445028-.2392623-.1148876l-.072916-.01031062-.1722556-.01007496c-.2138322-.00847951-.4788699-.01916098-.6740627-.16833458-.0216237.18944642-.0395195.45401082-.0181469.71533022l.008423.05636635.032352.13484744c.0268582.10441957.0548947.21235367.0529631.30606377-.0020498.0900778-.024955.1759455-.0685851.2563684l-.0505335.0785624c-.0156553.020909-.0907539.1292825-.0280848.2056231l2.074195 2.5212522c.1260046.1534037.1222671.3906174-.0084988.5400518l-.8558216.9759156c-.2048891.2334664-.6081774.4162104-.9187417.4162104h-.4172245c-.2461567 0-.3406481-.1160958-.3749428-.1852357-.0345554-.0688597-.0698931-.2143054.0788072-.410493l.6889936-.9097697c.0467242-.0619158.0417601-.1661036-.0102179-.2235383l-1.6047318-1.7638914c-.0502396-.0551747-.1643835-.0718421-.2451716-.037052l-.1574902.0622501c-.381335.1383023-1.0311857.2933034-2.10213356.3562202-.29836653.0176814-.59772781.0263686-.89113025.0273537l-.91473379 1.0614833c-.26852408.3117811-.72154982.3622236-1.01097327.1121168-.28991697-.2498943-.30336055-.7026689-.03083816-1.0117459l.22850236-.258818-.27374892-.0380661c-.10017984-.0161477-.22899298.0358004-.28492294.1051729l-2.16188734 2.6808949c-.19591712.2429407-.59374881.4333722-.90605148.4333722h-.38638726c-.24563521 0-.34113877-.1163566-.37618868-.1857282-.03504604-.0693716-.07187104-.2150878.07384509-.4130137l2.06965583-2.8099223c.06812287-.0925116.13848344-.2735172.150912-.3871406l.05819181-.532567c.01443157-.1332576.02610586-.3495912.02610586-.4823563v-.41847031c-.21508775-.08580525-.63902434-.20761845-.85980051-.06687606-.10642744.06760425-.15814421.19493207-.1586382.38861817-.00251102 1.5673659-1.51250409 2.2029328-1.5276629 2.2091138-.0151588.0061809-.03107187.0091748-.04698495.0091748-.01939759 0-.03879422-.0045005-.05644955-.0136753-.03234573-.0164086-.05572106-.0459709-.0644056-.0810479-.13682617-.5589121.05807722-1.169263.46324322-2.3179074l.16185754-.45857981c.13723663-.38864718.37842928-.66186493.71657608-.81182081.63258263-.28022155 1.40830276-.04077116 1.64848135.04649048.29291956-.25062827.83887216-.50970707 1.85061805-.50970707.15166531 0 .31303666.00795605.47837734.0198911zm.83240821-2.19086155c.2512947-.27723537 1.0517483-.99877554 1.6775512-.71434514.8749632.39780272.5972642 1.24417896.6877477 1.47242057.0507418.12754024.062138.24616156.0576954.34262799-.0064707.13723663-.1516653.19642125-.2769939.13947723l-.1175831-.05345951c-.0320831.19070193-.1074135.37669088-.2387203.53706748-.4012795.49132837-1.1256301.56415746-1.6171902.16261719-.49149647-.40155379-.56435453-1.12583675-.1628336-1.61736794l.0096983-.00969831c-.0788111-.06713102-.0962066-.17428859-.0193715-.25933956z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/escape_game.svg b/data/styles/default/light/symbols/escape_game.svg
index 31a4bfa10..c2a33b646 100644
--- a/data/styles/default/light/symbols/escape_game.svg
+++ b/data/styles/default/light/symbols/escape_game.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/><circle cx="9" cy="9" r="8.25" fill="#7f5933"/><path fill="#fff" fill-rule="evenodd" d="M5.194 4.525h1.35v5.4h-1.35z" style="stroke-width:.9"/><path fill="#fff" fill-rule="evenodd" d="M5.194 5.2h2.7v1.35h-2.7z" style="stroke-width:.9"/><circle cx="5.869" cy="11.613" r="1.688" fill="none" stroke="#fff" stroke-width="1.5"/><path fill="#fff" fill-rule="evenodd" d="M12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1-1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" style="stroke-width:.9"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>escape_game</title>
+    <g id="escape_game" stroke="none" fill="none">
+        <circle id="Oval" fill="#FFFFFF" fill-rule="nonzero" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#EB785D" fill-rule="nonzero" cx="9" cy="9" r="8.25"></circle>
+        <path d="M6.544,4.525 L6.543,5.199 L7.894,5.2 L7.894,6.55 L6.543,6.55 L6.54384181,9.2696041 C7.56205461,9.56229277 8.307,10.5006507 8.307,11.613 C8.307,12.9594702 7.21547022,14.051 5.869,14.051 C4.52252978,14.051 3.431,12.9594702 3.431,11.613 C3.431,10.5010171 4.17545473,9.56291094 5.19315214,9.26989353 L5.194,4.525 L6.544,4.525 Z M5.869,10.675 C5.3509569,10.675 4.931,11.0949569 4.931,11.613 C4.931,12.1310431 5.3509569,12.551 5.869,12.551 C6.3870431,12.551 6.807,12.1310431 6.807,11.613 C6.807,11.0949569 6.3870431,10.675 5.869,10.675 Z M12.506,11.275 L10.931,11.275 L10.925,10.868 C10.925,10.3653333 11.0083333,9.952 11.175,9.628 C11.341,9.304 11.633,8.893 12.132,8.487 L12.5637778,8.12833333 C12.807037,7.92033333 12.9611111,7.77455556 13.026,7.691 C13.176,7.493 13.251,7.274 13.251,7.034 C13.251,6.70266667 13.117,6.41933333 12.849,6.184 C12.585,5.94466667 12.2283333,5.825 11.779,5.825 C11.3456667,5.825 10.9833333,5.94866667 10.692,6.196 C10.4,6.443 10.246,6.82 10.137,7.326 L8.569,7.132 C8.61366667,6.40666667 8.92133333,5.791 9.492,5.285 C10.068,4.778 10.775,4.525 11.706,4.525 C12.687,4.525 13.421,4.782 13.999,5.297 C14.579,5.807 14.869,6.40266667 14.869,7.084 C14.869,7.46 14.7616667,7.81633333 14.547,8.153 C14.2678649,8.60277864 13.927713,9.01103812 13.5366594,9.36629677 L13.296,9.573 C12.936,9.873 12.711,10.1143333 12.621,10.297 C12.537,10.4783333 12.4986667,10.8043333 12.506,11.275 Z M10.819,13.525 L10.819,11.725 L12.619,11.725 L12.619,13.525 L10.819,13.525 Z" id="Shape" fill="#FFFFFF" fill-rule="evenodd"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/factory-m.svg b/data/styles/default/light/symbols/factory-m.svg
index cd21fae0f..2552b0bf8 100644
--- a/data/styles/default/light/symbols/factory-m.svg
+++ b/data/styles/default/light/symbols/factory-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#747E86"/>
-  <path d="m5.3333 18.667v-8l5.3333 3.9996v-4l4.6666 4.0003 0.66666-7.3333h2l0.6668 11.333h-13.333" fill="#fff"/>
-  <path d="m17 5.9999c-0.12806-1.2135-1.9115-2.6077-4.3303-0.94099-0.91058 0.50118-2.7961 1.205-4.1425-0.55673" fill="none" stroke="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m5.3333 18.667v-8l5.3333 3.9996v-4l4.6666 4.0003.66666-7.3333h2l.6668 11.333h-13.333" fill="#fff"/><path d="m17 5.9999c-.12806-1.2135-1.9115-2.6077-4.3303-.94099-.91058.50118-2.7961 1.205-4.1425-.55673" fill="none" stroke="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fitness-m.svg b/data/styles/default/light/symbols/fitness-m.svg
new file mode 100644
index 000000000..96499019d
--- /dev/null
+++ b/data/styles/default/light/symbols/fitness-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m15.03675 11.0145.5071725-.5071725c.2747175-.2747175.2747175-.7185 0-.993225l-.014085-.014085c-.2747175-.2747175-.7185-.2747175-.993225 0l-2.01465 2.014575-6.03675-6.03675 2.014575-2.014575c.2747175-.2747175.2747175-.7185 0-.993225l-.014085-.014088c-.2747175-.2747175-.7185-.2747175-.993225 0l-.50718.5071725-.5071725-.5071725c-.2747175-.2747175-.7255425-.2747175-1.000275 0l-1.007325 1.007325-.5071725-.5071725c-.2747175-.2747175-.732585-.2747175-1.007325 0-.2747175.2747175-.2747175.732585 0 1.007325l.5071725.5071725-1.007325 1.007325c-.2747175.2747175-.2747175.7185 0 .993225l.5071725.5071725-.5071725.514215c-.2747175.2747175-.2747175.7185 0 .993225l.014088.014085c.2747175.2747175.7185.2747175.993225 0l2.014575-2.014575 6.03675 6.03675-2.014575 2.014575c-.2747175.2747175-.2747175.7185 0 .993225l.014085.014085c.2747175.2747175.7185.2747175.993225 0l.5071725-.5071725.5071725.5071725c.2747175.2747175.7185.2747175.993225 0l1.007325-1.007325.5071725.5071725c.2747175.2747175.732585.2747175 1.007325 0 .2747175-.2747175.2747175-.732585 0-1.007325l-.5071725-.5071725 1.014375-1.007325c.2747175-.2747175.2747175-.7185 0-.993225z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fitness_centre-m.svg b/data/styles/default/light/symbols/fitness_centre-m.svg
index 4d0adbf28..d4d734e4f 100644
--- a/data/styles/default/light/symbols/fitness_centre-m.svg
+++ b/data/styles/default/light/symbols/fitness_centre-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<title>fitness_centre-m</title>
-	<circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#747E86"/>
-	<path id="Path" d="m17.964 13.99 0.50109-0.50109c0.27142-0.27142 0.27142-0.70987 0-0.98133l-0.01392-0.01392c-0.27142-0.27142-0.70987-0.27142-0.98133 0l-1.9904 1.9904-5.9643-5.9643 1.9904-1.9904c0.27142-0.27142 0.27142-0.70987 0-0.98133l-0.01391-0.013919c-0.27142-0.27142-0.70987-0.27142-0.98133 0l-0.5011 0.50109-0.50109-0.50109c-0.27142-0.27142-0.71683-0.27142-0.98822 0l-0.99521 0.99521-0.50109-0.50109c-0.27142-0.27142-0.72379-0.27142-0.99521 0s-0.27142 0.72379 0 0.99521l0.50109 0.50109-0.99521 0.99521c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.50109 0.50109-0.50109 0.50804c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.013919 0.01391c0.27142 0.27142 0.70987 0.27142 0.98133 0l1.9904-1.9904 5.9643 5.9643-1.9904 1.9904c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.01391 0.01392c0.27142 0.27142 0.70987 0.27142 0.98133 0l0.50109-0.50109 0.50108 0.50109c0.27142 0.27142 0.70988 0.27142 0.98133 0l0.99521-0.99521 0.50109 0.50109c0.27142 0.27142 0.72379 0.27142 0.99521 0s0.27142-0.72379 0-0.99521l-0.50109-0.50109 1.0022-0.99521c0.27142-0.27142 0.27142-0.70987 0-0.98133z" fill="#fff" stroke-width="1.2664"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m13.473 10.4925.3758175-.3758175c.203565-.203565.203565-.5324025 0-.7359975l-.01044-.01044c-.203565-.203565-.5324025-.203565-.7359975 0l-1.4928 1.4928-4.473225-4.473225 1.4928-1.4928c.203565-.203565.203565-.5324025 0-.7359975l-.0104325-.01043925c-.203565-.203565-.5324025-.203565-.7359975 0l-.375825.3758175-.3758175-.3758175c-.203565-.203565-.5376225-.203565-.741165 0l-.7464075.7464075-.3758175-.3758175c-.203565-.203565-.5428425-.203565-.7464075 0s-.203565.5428425 0 .7464075l.3758175.3758175-.7464075.7464075c-.203565.203565-.203565.5324025 0 .7359975l.3758175.3758175-.3758175.38103c-.203565.203565-.203565.5324025 0 .7359975l.01043925.0104325c.203565.203565.5324025.203565.7359975 0l1.4928-1.4928 4.47322495 4.47322505-1.49279995 1.4928c-.203565.203565-.203565.5324025 0 .7359975l.0104325.01044c.203565.203565.5324025.203565.73599745 0l.3758175-.3758175.3758101.3758175c.203565.203565.5324099.203565.7359975 0l.7464075-.7464075.3758175.3758175c.203565.203565.5428425.203565.7464075 0s.203565-.5428425 0-.7464075l-.3758175-.3758175.75165-.7464075c.2035649-.203565.2035649-.5324025 0-.7359975z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fitness_station-m.svg b/data/styles/default/light/symbols/fitness_station-m.svg
deleted file mode 100644
index 8a1f788f1..000000000
--- a/data/styles/default/light/symbols/fitness_station-m.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>fitness_station-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="gym-m" fill-rule="nonzero">
-   <path id="Path" d="m20.049 14.686 0.67623-0.67623c0.36629-0.36629 0.36629-0.958 0-1.3243l-0.01878-0.01878c-0.36629-0.36629-0.958-0.36629-1.3243 0l-2.6862 2.6861-8.049-8.049 2.6861-2.6861c0.36629-0.36629 0.36629-0.958 0-1.3243l-0.01878-0.018784c-0.36629-0.36629-0.958-0.36629-1.3243 0l-0.67624 0.67623-0.67623-0.67623c-0.36629-0.36629-0.96739-0.36629-1.3337 0l-1.3431 1.3431-0.67623-0.67623c-0.36629-0.36629-0.97678-0.36629-1.3431 0-0.36629 0.36629-0.36629 0.97678 0 1.3431l0.67623 0.67623-1.3431 1.3431c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.67623 0.67623-0.67623 0.68562c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.018784 0.01878c0.36629 0.36629 0.958 0.36629 1.3243 0l2.6861-2.6861 8.049 8.049-2.6861 2.6861c-0.36629 0.36629-0.36629 0.958 0 1.3243l0.01878 0.01878c0.36629 0.36629 0.958 0.36629 1.3243 0l0.67623-0.67623 0.67623 0.67623c0.36629 0.36629 0.958 0.36629 1.3243 0l1.3431-1.3431 0.67623 0.67623c0.36629 0.36629 0.97678 0.36629 1.3431 0 0.36629-0.36629 0.36629-0.97678 0-1.3431l-0.67623-0.67623 1.3525-1.3431c0.36629-0.36629 0.36629-0.958 0-1.3243z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
diff --git a/data/styles/default/light/symbols/ford-m.svg b/data/styles/default/light/symbols/ford-m.svg
index 40777d4b5..8e6a280fa 100644
--- a/data/styles/default/light/symbols/ford-m.svg
+++ b/data/styles/default/light/symbols/ford-m.svg
@@ -1 +1 @@
-<svg height="9" viewBox="0 0 14 9" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m11.52 1.8815a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -1.5195-.88063 1.7502 1.7497 0 0 0 -1 .3378v3.1867l1.4805 2.5931a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 2.5195.54869v-3.1945z" fill="#fff" opacity=".6"/><path d="m12 4.7405-1.3496-2.3635a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -.65039-.37699v2.262l1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 .65039.36136z" fill="#54a3b6"/></svg>
\ No newline at end of file
+<svg height="9" viewBox="0 0 14 9" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m11.52 1.8815a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -1.5195-.88063 1.7502 1.7497 0 0 0 -1 .3378v3.1867l1.4805 2.5931a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 2.5195.54869v-3.1945z" fill="#fff" opacity=".6"/><path d="m12 4.7405-1.3496-2.3635a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -.65039-.37699v2.262l1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 .65039.36136z" fill="#0797B8"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fountain-m.svg b/data/styles/default/light/symbols/fountain-m.svg
index 4b53bf770..59cca8c8a 100644
--- a/data/styles/default/light/symbols/fountain-m.svg
+++ b/data/styles/default/light/symbols/fountain-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="matrix(1.5 0 0 1.5 2.8125 1.5)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#0797B8" transform="matrix(1.5 0 0 1.5 2.8125 1.5)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fountain-s.svg b/data/styles/default/light/symbols/fountain-s.svg
index 7417ea914..706354e85 100644
--- a/data/styles/default/light/symbols/fountain-s.svg
+++ b/data/styles/default/light/symbols/fountain-s.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="matrix(1.125 0 0 1.125 5.1094 4.125)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#0797B8" transform="matrix(1.125 0 0 1.125 5.1094 4.125)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fuel-m.svg b/data/styles/default/light/symbols/fuel-m.svg
index 0f675fa38..cf99ed708 100644
--- a/data/styles/default/light/symbols/fuel-m.svg
+++ b/data/styles/default/light/symbols/fuel-m.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6" style="fill-rule:nonzero"/><circle cx="12" cy="12" r="11" fill="#747E86" style="fill-rule:nonzero"/><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#fff;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m15.23 4.008a.667.667 0 0 0 -.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1 -.667-.666v-1.334c0-1.096-.903-2-2-2h-.667v-6.666a1.33 1.33 0 0 0 -1.333-1.334h-5.333a1.33 1.33 0 0 0 -1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334h5.333a1.33 1.33 0 0 0 1.333-1.334v-2.666h.667c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0 -1.138-2.747l-1.724-1.725a.667.667 0 0 0 -.576-.187zm-7.898 2.659h4c.37 0 .667.297.667.666v3.334h-5.332v-3.334c0-.369.297-.666.666-.666zm9.335 2.333a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" fill="#fff" stroke-dasharray=".133333 .133333" stroke-linecap="round" stroke-linejoin="round" stroke-width=".133333"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fuel-s.svg b/data/styles/default/light/symbols/fuel-s.svg
index 6fcdef515..ef1d1c06f 100644
--- a/data/styles/default/light/symbols/fuel-s.svg
+++ b/data/styles/default/light/symbols/fuel-s.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8" fill="#fff" opacity=".6" style="fill-rule:nonzero;stroke-width:.666667"/><circle cx="8" cy="8" r="7.333" fill="#747E86" style="fill-rule:nonzero;stroke-width:.666667"/><path d="M10.375 2.005a.444.444 0 0 0-.245.754l1.15 1.149c.212.212.362.474.439.759h-.386A1.34 1.34 0 0 0 10 6a1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1-.444-.444v-.89a1.34 1.34 0 0 0-1.333-1.332H9v-5.55a.887.887 0 0 0-.888-.89h-2.89a.887.887 0 0 0-.888.89L4.333 12c0 .492.397.889.89.889H8.11A.887.887 0 0 0 9 12l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333V5.11l-.002-.036a2.59 2.59 0 0 0-.757-1.795l-1.15-1.15a.444.444 0 0 0-.383-.125Zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89V4.45c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" style="fill:#fff;stroke-width:.0888887;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.0888887,.0888887;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#fff" opacity=".6" r="8" stroke-width=".666667"/><circle cx="8" cy="8" fill="#AA96BC" r="7.333" stroke-width=".666667"/><path d="m10.375 2.005a.444.444 0 0 0 -.245.754l1.15 1.149c.212.212.362.474.439.759h-.386a1.34 1.34 0 0 0 -1.333 1.333 1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1 -.444-.444v-.89a1.34 1.34 0 0 0 -1.333-1.332h-.556v-5.55a.887.887 0 0 0 -.888-.89h-2.89a.887.887 0 0 0 -.888.89l-.001 7.994c0 .492.397.889.89.889h2.887a.887.887 0 0 0 .89-.889l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333v-6.668l-.002-.036a2.59 2.59 0 0 0 -.757-1.795l-1.15-1.15a.444.444 0 0 0 -.383-.125zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89v-2.222c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" fill="#fff" stroke-dasharray=".088889 .088889" stroke-linecap="round" stroke-linejoin="round" stroke-width=".088889"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/funeral_directors-m.svg b/data/styles/default/light/symbols/funeral_directors-m.svg
index b7e99749a..d1c8ac63d 100644
--- a/data/styles/default/light/symbols/funeral_directors-m.svg
+++ b/data/styles/default/light/symbols/funeral_directors-m.svg
@@ -1,14 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>funeral_directors-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="funeral_directors-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BE75A3"/>
-   <g id="tomb" transform="translate(6 6)" fill="#fff">
-    <path id="Shape" d="m6.2293 0.0015h-0.46085c-2.06 0-3.73 1.67-3.73 3.73v4.1207h7.9208v-4.1207c0-2.06-1.6699-3.73-3.73-3.73zm1.2105 6.7177h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156zm0-1.4062h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156zm0-1.4062h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156z"/>
-    <path id="Path" d="m11.254 9.8099v-0.90302c0-0.19416-0.15741-0.35156-0.35156-0.35156h-9.8078c-0.19416 0-0.35156 0.15741-0.35156 0.35156v0.90302h10.511z"/>
-    <path id="Path" d="m11.998 11.996h-11.998v-1.1317c0-0.19416 0.15741-0.35156 0.35156-0.35156h11.295c0.19416 0 0.35156 0.15741 0.35156 0.35156v1.1317z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><g fill="#fff" transform="translate(6 6)"><path d="m6.2293.0015h-.46085c-2.06 0-3.73 1.67-3.73 3.73v4.1207h7.9208v-4.1207c0-2.06-1.6699-3.73-3.73-3.73zm1.2105 6.7177h-2.8818c-.19416 0-.35156-.15741-.35156-.35156s.15741-.35156.35156-.35156h2.8818c.19416 0 .35156.15741.35156.35156s-.15738.35156-.35156.35156zm0-1.4062h-2.8818c-.19416 0-.35156-.15741-.35156-.35156s.15741-.35156.35156-.35156h2.8818c.19416 0 .35156.15741.35156.35156s-.15738.35156-.35156.35156zm0-1.4062h-2.8818c-.19416 0-.35156-.15741-.35156-.35156s.15741-.35156.35156-.35156h2.8818c.19416 0 .35156.15741.35156.35156s-.15738.35156-.35156.35156z"/><path d="m11.254 9.8099v-.90302c0-.19416-.15741-.35156-.35156-.35156h-9.8078c-.19416 0-.35156.15741-.35156.35156v.90302h10.511z"/><path d="m11.998 11.996h-11.998v-1.1317c0-.19416.15741-.35156.35156-.35156h11.295c.19416 0 .35156.15741.35156.35156v1.1317z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/gambling-m.svg b/data/styles/default/light/symbols/gambling-m.svg
index 281cf78fa..c0bca9114 100644
--- a/data/styles/default/light/symbols/gambling-m.svg
+++ b/data/styles/default/light/symbols/gambling-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
- <path d="m9.5 6.4h7v9.1c0 0.385 0.315 0.7 0.7 0.7s0.7-0.315 0.7-0.7v-9.1c0-0.77-0.63-1.4-1.4-1.4h-7c-0.385 0-0.7 0.315-0.7 0.7s0.315 0.7 0.7 0.7zm-3.5 2.8v8.4c0 0.77 0.63 1.4 1.4 1.4h6.3c0.77 0 1.4-0.63 1.4-1.4v-8.4c0-0.77-0.63-1.4-1.4-1.4h-6.3c-0.77 0-1.4 0.63-1.4 1.4z" fill="#fff"/>
- <path d="m10.55 9.0831c-1.2696 2.116-3.3856 2.9624-3.3856 5.0784 0 0.8464 0.8464 1.6928 1.6928 1.6928 0.4232 0 0.8464 0 1.2696-0.4232 0 0 0.13542 0.8464-0.8464 2.116h2.5392c-0.8464-1.2696-0.8464-2.116-0.8464-2.116 0.4232 0.4232 0.8464 0.4232 1.2696 0.4232 0.8464 0 1.6928-0.8464 1.6928-1.6928 0-2.116-2.116-2.9624-3.3856-5.0784z" fill="#9C6136"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m9.5 6.4h7v9.1c0 .385.315.7.7.7s.7-.315.7-.7v-9.1c0-.77-.63-1.4-1.4-1.4h-7c-.385 0-.7.315-.7.7s.315.7.7.7zm-3.5 2.8v8.4c0 .77.63 1.4 1.4 1.4h6.3c.77 0 1.4-.63 1.4-1.4v-8.4c0-.77-.63-1.4-1.4-1.4h-6.3c-.77 0-1.4.63-1.4 1.4z" fill="#fff"/><path d="m10.55 9.0831c-1.2696 2.116-3.3856 2.9624-3.3856 5.0784 0 .8464.8464 1.6928 1.6928 1.6928.4232 0 .8464 0 1.2696-.4232 0 0 .13542.8464-.8464 2.116h2.5392c-.8464-1.2696-.8464-2.116-.8464-2.116.4232.4232.8464.4232 1.2696.4232.8464 0 1.6928-.8464 1.6928-1.6928 0-2.116-2.116-2.9624-3.3856-5.0784z" fill="#EB785D"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/geyser-m.svg b/data/styles/default/light/symbols/geyser-m.svg
index 534ac6bca..a3fddc449 100644
--- a/data/styles/default/light/symbols/geyser-m.svg
+++ b/data/styles/default/light/symbols/geyser-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="translate(5.1429 5.1429)"><path d="m12.509 0h-11.304c-.66463 0-1.2054.54072-1.2054 1.2054 0 .66463.54072 1.2054 1.2054 1.2054h.44215c.1867.9158.99841 1.6071 1.9686 1.6071h1.301c.12123.342.39273.61347.73473.73473v3.918c.35044-.016821.6818-.13653.96303-.34918l.24233-.18324.24233.18324c.28122.21265.61259.33236.96303.34918v-3.918c.342-.12123.61347-.39273.73473-.73473h1.301c.97015 0 1.7819-.69134 1.9686-1.6071h.44215c.66463 0 1.2054-.54072 1.2054-1.2054 0-.66463-.54072-1.2054-1.2054-1.2054z"/><path d="m13.312 9.4765c-.46012 0-.90118-.12072-1.291-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.6763h.40179c.38202 0 .74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146h.40179v-1.6763h-.40179z"/><path d="m13.312 11.956c-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.758h13.714v-1.758h-.40179z"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#0797B8" transform="translate(5.1429 5.1429)"><path d="m12.509 0h-11.304c-.66463 0-1.2054.54072-1.2054 1.2054 0 .66463.54072 1.2054 1.2054 1.2054h.44215c.1867.9158.99841 1.6071 1.9686 1.6071h1.301c.12123.342.39273.61347.73473.73473v3.918c.35044-.016821.6818-.13653.96303-.34918l.24233-.18324.24233.18324c.28122.21265.61259.33236.96303.34918v-3.918c.342-.12123.61347-.39273.73473-.73473h1.301c.97015 0 1.7819-.69134 1.9686-1.6071h.44215c.66463 0 1.2054-.54072 1.2054-1.2054 0-.66463-.54072-1.2054-1.2054-1.2054z"/><path d="m13.312 9.4765c-.46012 0-.90118-.12072-1.291-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.6763h.40179c.38202 0 .74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146h.40179v-1.6763h-.40179z"/><path d="m13.312 11.956c-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.758h13.714v-1.758h-.40179z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/geyser-s.svg b/data/styles/default/light/symbols/geyser-s.svg
index 88f548b0d..1cb0d6012 100644
--- a/data/styles/default/light/symbols/geyser-s.svg
+++ b/data/styles/default/light/symbols/geyser-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="translate(3.4286 3.4286)"><path d="m8.3393 0h-7.5357c-.44309 0-.80357.36048-.80357.80357s.36048.80357.80357.80357h.29477c.12446.61054.66561 1.0714 1.3124 1.0714h.86732c.080821.228.26182.40898.48982.48982v2.612c.23362-.011214.45454-.091018.64202-.23279l.16155-.12216.16155.12216c.18748.14177.40839.22157.64202.23279v-2.612c.228-.080821.40898-.26182.48982-.48982h.86732c.64677 0 1.1879-.46089 1.3124-1.0714h.29477c.44309 0 .80357-.36048.80357-.80357s-.36048-.80357-.80357-.80357z"/><path d="m8.875 6.3176c-.30675 0-.60079-.080482-.86068-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.1175h.26786c.25468 0 .49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69914-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69914.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343h.26786v-1.1175h-.26786z"/><path d="m8.875 7.9709c-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.172h9.1429v-1.172h-.26786z"/></g></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="#0797B8" transform="translate(3.4286 3.4286)"><path d="m8.3393 0h-7.5357c-.44309 0-.80357.36048-.80357.80357s.36048.80357.80357.80357h.29477c.12446.61054.66561 1.0714 1.3124 1.0714h.86732c.080821.228.26182.40898.48982.48982v2.612c.23362-.011214.45454-.091018.64202-.23279l.16155-.12216.16155.12216c.18748.14177.40839.22157.64202.23279v-2.612c.228-.080821.40898-.26182.48982-.48982h.86732c.64677 0 1.1879-.46089 1.3124-1.0714h.29477c.44309 0 .80357-.36048.80357-.80357s-.36048-.80357-.80357-.80357z"/><path d="m8.875 6.3176c-.30675 0-.60079-.080482-.86068-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.1175h.26786c.25468 0 .49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69914-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69914.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343h.26786v-1.1175h-.26786z"/><path d="m8.875 7.9709c-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.172h9.1429v-1.172h-.26786z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/golf-centre-m.svg b/data/styles/default/light/symbols/golf-centre-m.svg
new file mode 100644
index 000000000..cad29891f
--- /dev/null
+++ b/data/styles/default/light/symbols/golf-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m13.359585 14.0449775c.4804877 0 .87-.3895123.87-.87s-.3895123-.87-.87-.87-.87.3895123-.87.87.3895123.87.87.87zm-4.929681-1.7226v-5.248971l2.447571-1.246971c.4234029-.2146029.4234029-.8293971-.0058-1.038171l-2.76077103-1.351371c-.3886029-.1914-.8410029.087-.8410029.5161971v8.93229c0 .3190029-.261.5800029-.5800029.5800029s-.5800029-.261-.5800029-.5800029v-.4234029c-1.038171.2029971-1.74.5742-1.74 1.003371 0 .6379971 1.560171 1.159971 3.48 1.159971s3.48000003-.522 3.48000003-1.159971c0-.5521154-1.1582841-1.0130963-2.71171184-1.130187z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/golf-m.svg b/data/styles/default/light/symbols/golf-m.svg
index f25465b59..33085db31 100644
--- a/data/styles/default/light/symbols/golf-m.svg
+++ b/data/styles/default/light/symbols/golf-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>golf-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="golf-m" fill-rule="nonzero">
-   <g id="golf_course_black_24dp" transform="translate(6 5)" fill="#fff">
-    <g transform="matrix(1.392 0 0 1.392 -1.8882 -2.5605)" fill="#747E86">
-     <circle cx="10.333" cy="11.667" r="1"/>
-     <path id="Path" d="m4.6667 10.687v-6.0333l2.8133-1.4333c0.48667-0.24667 0.48667-0.95333-0.0066667-1.1933l-3.1733-1.5533c-0.44667-0.22-0.96667 0.1-0.96667 0.59333v10.267c0 0.36667-0.3 0.66667-0.66667 0.66667-0.36667 0-0.66667-0.3-0.66667-0.66667v-0.48667c-1.1933 0.23333-2 0.66-2 1.1533 0 0.73333 1.7933 1.3333 4 1.3333s4-0.6 4-1.3333c0-0.66-1.44-1.2067-3.3333-1.3133z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.871502 15.053973c.5765853 0 1.044-.4674147 1.044-1.044s-.4674147-1.044-1.044-1.044-1.044.4674147-1.044 1.044.4674147 1.044 1.044 1.044zm-5.9156172-2.06712v-6.2987652l2.9370852-1.4963652c.5080835-.25752348.5080835-.99527652-.00696-1.2458052l-3.31292523-1.6216452c-.46632348-.22968-1.00920348.1044-1.00920348.61943652v10.71874798c0 .3828035-.3132.6960035-.69600348.6960035s-.69600348-.3132-.69600348-.6960035v-.5080835c-1.2458052.2435966-2.088.68904-2.088 1.2040452 0 .7655966 1.8722052 1.3919652 4.176 1.3919652s4.17599997-.6264 4.17599997-1.3919652c0-.6625384-1.3899408-1.2157156-3.25405415-1.3562243z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/grinding_mill-m.svg b/data/styles/default/light/symbols/grinding_mill-m.svg
index e48f23ad2..8bf1f2ffd 100644
--- a/data/styles/default/light/symbols/grinding_mill-m.svg
+++ b/data/styles/default/light/symbols/grinding_mill-m.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
- <path d="m7.3333 9.9996 4.6666-5.333 4.6667 5.333v8.6669h-9.3333z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
- <path d="m2.7578 17.659a5.9999 5.9582 0 0 1 2.685-6.0597 5.9999 5.9582 0 0 1 6.6652 0.14442 5.9999 5.9582 0 0 1 2.4163 6.1703 5.9999 5.9582 0 0 1-4.8158 4.5781z" fill="#BE75A3"/>
- <g fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333">
-  <path d="m5.9998 14 5.3336 5.3336"/>
-  <path d="m11.333 14-5.3336 5.3334"/>
-  <path d="m5.2819 16.666h6.7693"/>
-  <path d="m8.6666 13.233v6.8183"/>
- </g>
- <ellipse cx="8.6666" cy="16.666" rx="2.0006" ry="2.0001" fill="#BE75A3" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m7.3333 9.9996 4.6666-5.333 4.6667 5.333v8.6669h-9.3333z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/><path d="m2.7578 17.659a5.9999 5.9582 0 0 1 2.685-6.0597 5.9999 5.9582 0 0 1 6.6652.14442 5.9999 5.9582 0 0 1 2.4163 6.1703 5.9999 5.9582 0 0 1 -4.8158 4.5781z" fill="#AA96BC"/><g stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"><g fill="none"><path d="m5.9998 14 5.3336 5.3336"/><path d="m11.333 14-5.3336 5.3334"/><path d="m5.2819 16.666h6.7693"/><path d="m8.6666 13.233v6.8183"/></g><ellipse cx="8.6666" cy="16.666" fill="#AA96BC" rx="2.0006" ry="2.0001"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/hackerspace-m.svg b/data/styles/default/light/symbols/hackerspace-m.svg
index 9419d7743..911d2bafa 100644
--- a/data/styles/default/light/symbols/hackerspace-m.svg
+++ b/data/styles/default/light/symbols/hackerspace-m.svg
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#747E86"/><g fill="none" stroke="#fff" stroke-width="1.2"><path d="m7.2852 5.5351h9.4289l1.7502 1.7502v9.4289l-1.7502 1.7502h-9.4289l-1.7502-1.7502v-9.4289z" stroke-linecap="round"/><path d="m10.011 15.179h5.9743" stroke-linejoin="bevel"/><path d="m8.0337 8.0337 2.4494 2.4494-2.4494 2.45" stroke-linecap="square"/></g></svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#9c6136" r="11"/><g fill="none" stroke="#fff" stroke-width="1.2"><path d="m7.2852 5.5351h9.4289l1.7502 1.7502v9.4289l-1.7502 1.7502h-9.4289l-1.7502-1.7502v-9.4289z" stroke-linecap="round"/><path d="m10.011 15.179h5.9743" stroke-linejoin="bevel"/><path d="m8.0337 8.0337 2.4494 2.4494-2.4494 2.45" stroke-linecap="square"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/handball-centre-m.svg b/data/styles/default/light/symbols/handball-centre-m.svg
new file mode 100644
index 000000000..914ca0378
--- /dev/null
+++ b/data/styles/default/light/symbols/handball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m7.1071875 15.758125-.739375-.443625 1.8928125-3.2236875-1.2125625-.7245625-1.1090625 1.7893125-.739375-.443625 3.386375-5.4861875c-.41405-.36475833-.72459167-.76155-.931625-1.190375-.207025-.42883333-.3105375-.87985417-.3105375-1.3530625 0-.37461667.03696875-.71965833.11090625-1.035125s.20456042-.66050833.39186875-1.035125l.7689375.41405c-.13801667.28589167-.2366.5545375-.29575.8059375-.05915.2513875-.088725.50524167-.088725.7615625 0 .47320833.11337083.90204167.3401125 1.2865s.60628333.7344375 1.138625 1.0499375l1.434375.842875c.5619167.325325.9784375.72705417 1.2495625 1.2051875.2711042.478125.4066563 1.0277292.4066563 1.6488125 0 .384475-.05915.7738708-.17745 1.1681875-.1183.3943333-.2760334.7689583-.4732 1.123875l-.7689375-.443625c.1675916-.3154667.2982145-.62355.3918687-.92425.0936542-.3006792.1404813-.6087625.1404813-.92425 0-.3746167-.0640792-.7172-.1922375-1.02775-.1281584-.3105375-.3203959-.5496-.5767125-.7171875zm4.2144375-8.990625c-.29575 0-.5496042-.10597708-.7615625-.31793125-.2119542-.21195417-.3179312-.46580833-.3179312-.7615625 0-.29575.105977-.54960417.3179312-.7615625.2119542-.21195417.4658083-.31793125.7615625-.31793125s.5496083.10597708.7615625.31793125.3179313.46580833.3179313.7615625c0 .29575-.1059771.54960417-.3179313.7615625-.2119542.21195417-.4658083.31793125-.7615625.31793125zm-1.39-2.7505c-.25631667 0-.468275-.08379583-.635875-.2513875-.16759167-.16759167-.2513875-.37955-.2513875-.635875s.08379583-.46828333.2513875-.635875.37955-.2513875.635875-.2513875c.2563167 0 .468275.08379583.635875.2513875s.2513875.37955.2513875.635875-.0838042.46828333-.2513875.635875c-.1675917.16759167-.37955.2513875-.635875.2513875z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/handball-m.svg b/data/styles/default/light/symbols/handball-m.svg
index aaa6a301d..01d7a9f0f 100644
--- a/data/styles/default/light/symbols/handball-m.svg
+++ b/data/styles/default/light/symbols/handball-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m8.9715 22.813-1.183-0.7098 3.0285-5.1579-1.9401-1.1593-1.7745 2.8629-1.183-0.7098 5.4182-8.7779q-0.99372-0.87542-1.4906-1.9046-0.49686-1.0292-0.49686-2.1649 0-0.89908 0.17745-1.6562t0.62699-1.6562l1.2303 0.66248q-0.33124 0.68614-0.4732 1.2895-0.14196 0.60333-0.14196 1.2185 0 1.1357 0.54418 2.0584t1.8218 1.6799l2.295 1.3486q1.3486 0.78078 1.9993 1.9283 0.65065 1.1475 0.65065 2.6381 0 0.92274-0.28392 1.8691-0.28392 0.9464-0.75712 1.7982l-1.2303-0.7098q0.40222-0.75712 0.62699-1.4788 0.22477-0.72163 0.22477-1.4788 0-0.89908-0.30758-1.6444-0.30758-0.74529-0.92274-1.1475zm6.7431-14.385q-0.7098 0-1.2185-0.50869-0.50869-0.50869-0.50869-1.2185 0-0.7098 0.50869-1.2185 0.50869-0.50869 1.2185-0.50869t1.2185 0.50869q0.50869 0.50869 0.50869 1.2185 0 0.7098-0.50869 1.2185-0.50869 0.50869-1.2185 0.50869zm-2.224-4.4008q-0.61516 0-1.0174-0.40222-0.40222-0.40222-0.40222-1.0174t0.40222-1.0174 1.0174-0.40222q0.61516 0 1.0174 0.40222t0.40222 1.0174-0.40222 1.0174q-0.40222 0.40222-1.0174 0.40222z" fill="#747E86" stroke-width=".4732"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.728625 17.10975-.88725-.53235 2.271375-3.868425-1.455075-.869475-1.330875 2.147175-.88725-.53235 4.06365-6.583425c-.49686-.43771-.86951-.91386-1.11795-1.42845-.24843-.5146-.372645-1.055825-.372645-1.623675 0-.44954.0443625-.86359.1330875-1.24215s.2454725-.79261.4702425-1.24215l.922725.49686c-.16562.34307-.28392.665445-.3549.967125-.07098.301665-.10647.60629-.10647.913875 0 .56785.136045 1.08245.408135 1.5438s.72754.881325 1.36635 1.259925l1.72125 1.01145c.6743.39039 1.174125.872465 1.499475 1.446225.325325.57375.4879875 1.233275.4879875 1.978575 0 .46137-.07098.928645-.21294 1.401825-.14196.4732-.33124.92275-.56784 1.34865l-.922725-.53235c.20111-.37856.3578575-.74826.4702425-1.1091.112385-.360815.1685775-.730515.1685775-1.1091 0-.44954-.076895-.86064-.230685-1.2333-.15379-.372645-.384475-.65952-.692055-.860625zm5.057325-10.78875c-.3549 0-.659525-.1271725-.913875-.3815175-.254345-.254345-.3815175-.55897-.3815175-.913875 0-.3549.1271725-.659525.3815175-.913875.254345-.254345.55897-.3815175.913875-.3815175s.65953.1271725.913875.3815175.3815175.55897.3815175.913875c0 .3549-.1271725.659525-.3815175.913875-.254345.254345-.55897.3815175-.913875.3815175zm-1.668-3.3006c-.30758 0-.56193-.100555-.76305-.301665-.20111-.20111-.301665-.45546-.301665-.76305s.100555-.56194.301665-.76305.45546-.301665.76305-.301665c.30758 0 .56193.100555.76305.301665s.301665.45546.301665.76305-.100565.56194-.301665.76305c-.20111.20111-.45546.301665-.76305.301665z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/handicraft-m.svg b/data/styles/default/light/symbols/handicraft-m.svg
index 840e0356b..aee0545a9 100644
--- a/data/styles/default/light/symbols/handicraft-m.svg
+++ b/data/styles/default/light/symbols/handicraft-m.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
- <g stroke-linecap="round" stroke-linejoin="round">
-  <path d="m16 18.667c2.9752-7.9831-4.4623-7.0753-1.3333-13.333h-5.3333c3.129 6.258-4.3085 5.3502-1.3333 13.333z" fill="#fff" stroke="#fff" stroke-width="2.667"/>
-  <path d="m6.6667 9.3333 2.6667 2.6667 2.6667-2.6667 2.6667 2.6667 2.6667-2.6667" fill="none" stroke="#BE75A3" stroke-width="1.333"/>
-  <path d="m5.3333 12 4 4 2.6667-2.6667 2.6667 2.6667 4-4" fill="none" stroke="#BE75A3" stroke-width="1.333"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><g stroke-linecap="round" stroke-linejoin="round"><path d="m16 18.667c2.9752-7.9831-4.4623-7.0753-1.3333-13.333h-5.3333c3.129 6.258-4.3085 5.3502-1.3333 13.333z" fill="#fff" stroke="#fff" stroke-width="2.667"/><g fill="none" stroke="#AA96BC" stroke-width="1.333"><path d="m6.6667 9.3333 2.6667 2.6667 2.6667-2.6667 2.6667 2.6667 2.6667-2.6667"/><path d="m5.3333 12 4 4 2.6667-2.6667 2.6667 2.6667 4-4"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/hockey-centre-m.svg b/data/styles/default/light/symbols/hockey-centre-m.svg
new file mode 100644
index 000000000..ed00f5fd8
--- /dev/null
+++ b/data/styles/default/light/symbols/hockey-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m3.62025 13.00375v-1.1431875c0-.1613917.04931458-.2914021.14794375-.3900313.09862917-.0986291.22863958-.1479437.39003125-.1479437h.2689875v1.6811875zm1.39875 0v-1.6811875h2.353625l.578325-1.26425.659 1.3045625-.61866875 1.358375c-.04483333.0986292-.10983958.1703583-.19501875.2151875-.08517917.0448333-.18156667.06725-.2891625.06725zm8.55375 0v-1.6811875h.2689875c.1613917 0 .2914021.0493146.3900313.1479437.0986291.0986292.1479437.2286396.1479437.3900313v1.1431875zm-.591775 0h-2.488125c-.1075958 0-.2039833-.0224167-.2891625-.06725s-.1501854-.1165625-.1950187-.2151875l-3.79275005-8.325h1.2508125l1.53325 3.3623125 1.53325005-3.3623125h1.2508125l-2.15187505 4.747625.99525005 2.1788125h2.353625z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/hockey-m.svg b/data/styles/default/light/symbols/hockey-m.svg
index 05af151d1..cdb337b27 100644
--- a/data/styles/default/light/symbols/hockey-m.svg
+++ b/data/styles/default/light/symbols/hockey-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m3.3924 18.886v-1.8291q0-0.38734 0.23671-0.62405t0.62405-0.23671h0.43038v2.6899zm2.238 0v-2.6899h3.7658l0.92532-2.0228 1.0544 2.0873-0.98987 2.1734q-0.1076 0.23671-0.31203 0.3443-0.20443 0.1076-0.46266 0.1076zm13.686 0v-2.6899h0.43038q0.38734 0 0.62405 0.23671t0.23671 0.62405v1.8291zm-0.94684 0h-3.981q-0.25823 0-0.46266-0.1076t-0.31203-0.3443l-6.0684-13.32h2.0013l2.4532 5.3797 2.4532-5.3797h2.0013l-3.443 7.5962 1.5924 3.4861h3.7658z" fill="#747E86" stroke-width=".43038"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m2.5443 14.1645v-1.371825c0-.19367.0591775-.3496825.1775325-.4680375s.2743675-.1775325.4680375-.1775325h.322785v2.017425zm1.6785 0v-2.017425h2.82435l.69399-1.5171.7908 1.565475-.7424025 1.63005c-.0538.118355-.1318075.20443-.2340225.258225-.102215.0538-.21788.0807-.346995.0807zm10.2645 0v-2.017425h.322785c.19367 0 .3496825.0591775.4680375.1775325s.1775325.2743675.1775325.4680375v1.371825zm-.71013 0h-2.98575c-.129115 0-.24478-.0269-.346995-.0807s-.1802225-.139875-.2340225-.258225l-4.5513-9.99h1.500975l1.8399 4.034775 1.8399-4.034775h1.500975l-2.58225 5.69715 1.1943 2.614575h2.82435z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/key_cutter-m.svg b/data/styles/default/light/symbols/key_cutter-m.svg
index 008977a95..bde62c6ed 100644
--- a/data/styles/default/light/symbols/key_cutter-m.svg
+++ b/data/styles/default/light/symbols/key_cutter-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
+ <circle cx="12" cy="12" r="11" fill="#AA96BC"/>
  <circle cx="7.3333" cy="12" r="3.3332" fill="none" stroke="#fff" stroke-width="2.667"/>
  <rect x="10.667" y="10.667" width="10.667" height="2.6667" fill="#fff"/>
  <rect x="17.333" y="10.667" width="2.6667" height="5.3333" fill="#fff"/>
diff --git a/data/styles/default/light/symbols/laundry-m.svg b/data/styles/default/light/symbols/laundry-m.svg
index bbd8c447c..eda873a61 100644
--- a/data/styles/default/light/symbols/laundry-m.svg
+++ b/data/styles/default/light/symbols/laundry-m.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#747E86"/>
- <rect x="5" y="4" width="8" height="10" rx="1" ry="1" fill="#fff"/>
- <circle cx="9" cy="10" r="3" fill="#747E86"/>
- <path d="m7.584 11.416c0.78 0.78 2.052 0.78 2.832 0s0.78-2.052 0-2.832z" fill="#fff"/>
- <circle cx="6.5" cy="5.5" r=".75" fill="#747E86"/>
- <circle cx="8.5" cy="5.5" r=".75" fill="#747E86"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#BE75A3" r="8.25"/><rect fill="#fff" height="10" rx="1" width="8" x="5" y="4"/><circle cx="9" cy="10" fill="#BE75A3" r="3"/><path d="m7.584 11.416c.78.78 2.052.78 2.832 0s.78-2.052 0-2.832z" fill="#fff"/><g fill="#BE75A3"><circle cx="6.5" cy="5.5" r=".75"/><circle cx="8.5" cy="5.5" r=".75"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/lawyer-m.svg b/data/styles/default/light/symbols/lawyer-m.svg
index 3f557c0ad..f5c1172e7 100644
--- a/data/styles/default/light/symbols/lawyer-m.svg
+++ b/data/styles/default/light/symbols/lawyer-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>lawyer-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="lawyer-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m5.6868 17.168h6.8678c0.37773 0 0.68678 0.30905 0.68678 0.68678 0 0.37773-0.30905 0.68678-0.68678 0.68678h-6.8678c-0.37773 0-0.68678-0.30905-0.68678-0.68678 0-0.37773 0.30905-0.68678 0.68678-0.68678zm2.2252-8.8801 1.9436-1.9436 8.7427 8.7427c0.53569 0.53569 0.53569 1.4079 0 1.9436s-1.4079 0.53569-1.9436 0l-8.7427-8.7427zm5.8308-3.8872 1.9436 1.9436c0.53569 0.53569 0.53569 1.4079 0 1.9436l-0.97523 0.97523-3.8803-3.8872 0.96836-0.96836c0.53569-0.54256 1.4079-0.54256 1.9436-0.0068678zm-6.7991 4.8555 3.8872 3.8872-0.96836 0.96836c-0.53569 0.53569-1.4079 0.53569-1.9436 0l-1.9436-1.9436c-0.53569-0.53569-0.53569-1.4079 0-1.9436l0.96836-0.96836z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m5.6868 17.168h6.8678c.37773 0 .68678.30905.68678.68678s-.30905.68678-.68678.68678h-6.8678c-.37773 0-.68678-.30905-.68678-.68678s.30905-.68678.68678-.68678zm2.2252-8.8801 1.9436-1.9436 8.7427 8.7427c.53569.53569.53569 1.4079 0 1.9436s-1.4079.53569-1.9436 0zm5.8308-3.8872 1.9436 1.9436c.53569.53569.53569 1.4079 0 1.9436l-.97523.97523-3.8803-3.8872.96836-.96836c.53569-.54256 1.4079-.54256 1.9436-.0068678zm-6.7991 4.8555 3.8872 3.8872-.96836.96836c-.53569.53569-1.4079.53569-1.9436 0l-1.9436-1.9436c-.53569-.53569-.53569-1.4079 0-1.9436z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/lighthouse-m.svg b/data/styles/default/light/symbols/lighthouse-m.svg
index 6b6dc328c..c25bfe02d 100644
--- a/data/styles/default/light/symbols/lighthouse-m.svg
+++ b/data/styles/default/light/symbols/lighthouse-m.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path id="Shape" d="m8.3705 14.053 0.53851-4.3378h3.4251l0.21438 1.7268-4.178 2.611zm5.508 4.2177h-0.48558c4.87e-5 -0.0027222 3.889e-4 -0.0053958 3.889e-4 -0.008118 0-0.024646-0.0024305-0.048757-0.0070972-0.071993l-0.60603-4.882-4.6562 2.9099c-0.0077778 0.0048611-0.015944 0.0085069-0.023917 0.012688l-0.2466 1.9865c-0.0021875 0.017743-0.002625 0.035438-0.0021875 0.053035h-0.48669c-0.2014 0-0.36458 0.16319-0.36458 0.36458 0 0.2014 0.16319 0.36458 0.36458 0.36458h6.5139c0.2014 0 0.36458-0.16319 0.36458-0.36458 0-0.2014-0.16319-0.36463-0.36453-0.36463zm-1.4583-9.9167h-0.25497l-0.075833-0.58333h-1.2086c-0.035778 0-0.069903-0.019396-0.10092-0.032521s-0.058965-0.03816-0.082396-0.061639c-0.035194-0.035194-0.068396-0.083465-0.07875-0.13412-0.0034513-0.016868-0.013368-0.035875-0.013368-0.053764v-0.001507-0.28355c0-0.017889 0.0099167-0.035389 0.013368-0.052257 0.017257-0.084389 0.079576-0.15385 0.15711-0.18662 0.031014-0.013125 0.069174-0.020368 0.10495-0.020368h1.1084l-0.058236-0.46657c0.13038-0.055562 0.22176-0.18482 0.22176-0.33551 0-0.19158-0.14783-0.3483-0.33556-0.36312-0.16061-0.46142-0.60088-0.77928-1.1087-0.77928h-0.17383c-0.50735 0-0.94719 0.31724-1.1082 0.77778h-0.020174c-0.2014 0-0.36458 0.16319-0.36458 0.36458 0 0.16805 0.1138 0.30912 0.26843 0.35136l-0.23217 1.8604h-0.30362c-0.2014 0-0.36458 0.16319-0.36458 0.36458 0 0.10578 0.045306 0.20076 0.1173 0.26736h4.1404c0.071944-0.066597 0.1173-0.16158 0.1173-0.26736 0-0.2014-0.16324-0.36458-0.36458-0.36458zm4.8198-2.0684c-0.08259-0.069368-0.18769-0.098486-0.29381-0.079625l-4.4702 0.79246c-0.17408 0.030868-0.29998 0.18215-0.29998 0.35899s0.12741 0.32812 0.30149 0.35899l4.4725 0.79246c0.021194 0.003743 0.042583 0.0055903 0.063729 0.0055903 0.084972 0 0.16008-0.029701 0.22619-0.085215 0.082639-0.069271 0.12231-0.17155 0.12231-0.27937v-1.5849c0-0.10782-0.039521-0.2101-0.12221-0.27937z" fill="#747E86"/>
-</svg>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>lighthouse-m</title>
+    <g id="lighthouse-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#747E86" cx="9" cy="9" r="8.25"></circle>
+        <path d="M7.00594076,10.3631798 L7.42906277,6.95491516 L10.1202074,6.95491516 L10.2886485,8.31168388 L7.00594076,10.3631798 L7.00594076,10.3631798 Z M11.3336542,13.6770803 L10.9521279,13.6770803 C10.9521661,13.6749414 10.9524334,13.6728407 10.9524334,13.6707019 C10.9524334,13.6513372 10.9505238,13.6323929 10.9468571,13.6141361 L10.4706916,9.77828659 L6.81225606,12.064632 C6.80614494,12.0684514 6.79972865,12.071316 6.79346416,12.0746011 L6.59970741,13.6354194 C6.59798866,13.6493603 6.59764491,13.6632635 6.59798866,13.6770897 L6.21559014,13.6770897 C6.0573476,13.6770897 5.929135,13.8053102 5.929135,13.9635449 C5.929135,14.1217874 6.05735546,14.25 6.21559014,14.25 L11.3336442,14.25 C11.4918867,14.25 11.6200993,14.1217795 11.6200993,13.9635449 C11.6200993,13.8053023 11.4918789,13.6770504 11.3336835,13.6770504 L11.3336542,13.6770803 Z M10.1878494,5.88540301 L9.98751623,5.88540301 L9.92793327,5.42707322 L8.97832089,5.42707322 C8.95020966,5.42707322 8.92339721,5.41183353 8.89902676,5.40152105 C8.87465631,5.39120857 8.85269721,5.37153826 8.83428718,5.35309051 C8.8066348,5.32543813 8.78054757,5.287511 8.7724123,5.24771072 C8.76970057,5.23445732 8.76190889,5.21952328 8.76190889,5.20546766 L8.76190889,5.20428359 L8.76190889,4.98149475 C8.76190889,4.96743914 8.76970057,4.95368916 8.7724123,4.94043576 C8.78597134,4.87413025 8.83493617,4.81955386 8.89585562,4.79380606 C8.92022372,4.78349358 8.95020651,4.77780266 8.97831617,4.77780266 L9.84920015,4.77780266 L9.80344338,4.41121268 C9.9058846,4.36755691 9.97768303,4.26599725 9.97768303,4.1475982 C9.97768303,3.99707136 9.86153112,3.87393447 9.71402927,3.8622902 C9.58783595,3.49974664 9.24191022,3.25 8.84290959,3.25 L8.70632915,3.25 C8.3076978,3.25 7.96210992,3.4992595 7.83560232,3.86111163 L7.81975135,3.86111163 C7.66150881,3.86111163 7.53329621,3.98933209 7.53329621,4.14756678 C7.53329621,4.2796058 7.62271031,4.39044629 7.74420507,4.4236348 L7.56178615,5.88537473 L7.32322805,5.88537473 C7.16498551,5.88537473 7.03677291,6.01359519 7.03677291,6.17182987 C7.03677291,6.25494256 7.07237041,6.32956956 7.12893701,6.38189802 L10.3821019,6.38189802 C10.4386293,6.32957191 10.474266,6.25494256 10.474266,6.17182987 C10.474266,6.01358733 10.3460063,5.88537473 10.1878109,5.88537473 L10.1878494,5.88540301 Z M13.9748275,4.26023484 C13.9099355,4.20573152 13.8273571,4.18285313 13.7439773,4.19767246 L10.2316843,4.82031836 C10.0949074,4.84457174 9.99598621,4.96343593 9.99598621,5.10238137 C9.99598621,5.2413268 10.0960939,5.36018942 10.2328707,5.38444437 L13.7469709,6.00709027 C13.7636232,6.01003119 13.7804289,6.01148264 13.7970435,6.01148264 C13.8638071,6.01148264 13.9228204,5.98814619 13.9747639,5.94452813 C14.0396944,5.89010103 14.0708644,5.80973912 14.0708644,5.72502357 L14.0708644,4.47974749 C14.0708644,4.39503195 14.0398123,4.31466925 13.9748425,4.26024293 L13.9748275,4.26023484 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/lighthouse-s.svg b/data/styles/default/light/symbols/lighthouse-s.svg
index 38531a47c..9b11edaf2 100644
--- a/data/styles/default/light/symbols/lighthouse-s.svg
+++ b/data/styles/default/light/symbols/lighthouse-s.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <path d="m5.5803 9.3687 0.35901-2.8919h2.2834l0.14292 1.1512-2.7854 1.7407zm3.672 2.8118h-0.32372c3.241e-5 -0.0018149 2.5926e-4 -0.0035973 2.5926e-4 -0.0054121 0-0.01643-0.0016204-0.032505-0.0047315-0.047995l-0.40402-3.2546-3.1041 1.9399c-0.0051852 0.0032408-0.01063 0.0056713-0.015944 0.0084584l-0.1644 1.3243c-0.0014583 0.011829-0.00175 0.023625-0.0014583 0.035356h-0.32446c-0.13426 0-0.24306 0.10879-0.24306 0.24306s0.10879 0.24306 0.24306 0.24306h4.3426c0.13426 0 0.24306-0.10879 0.24306-0.24306s-0.10879-0.24309-0.24302-0.24309zm-0.97222-6.6111h-0.16998l-0.050556-0.38889h-0.80571c-0.023852 0-0.046602-0.012931-0.067278-0.021681-0.020676-0.00875-0.03931-0.02544-0.054931-0.041093-0.023463-0.023463-0.045597-0.055644-0.0525-0.089412-0.0023009-0.011245-0.008912-0.023917-0.008912-0.035843v-0.0010046-0.18903c0-0.011926 0.0066111-0.023593 0.008912-0.034838 0.011505-0.056259 0.053051-0.10257 0.10474-0.12441 0.020676-0.00875 0.046116-0.013579 0.069968-0.013579h0.73895l-0.038824-0.31105c0.086917-0.037042 0.14784-0.12321 0.14784-0.22368 0-0.12772-0.098551-0.2322-0.22371-0.24208-0.10707-0.30761-0.40059-0.51952-0.73915-0.51952h-0.11589c-0.33824 0-0.63146 0.21149-0.73879 0.51852h-0.013449c-0.13426 0-0.24306 0.10879-0.24306 0.24306 0 0.11203 0.075866 0.20608 0.17895 0.23424l-0.15478 1.2403h-0.20242c-0.13426 0-0.24306 0.10879-0.24306 0.24306 0 0.070519 0.030204 0.13384 0.078199 0.17824h2.7603c0.047963-0.044398 0.078199-0.10772 0.078199-0.17824 0-0.13426-0.10882-0.24306-0.24306-0.24306zm3.2132-1.3789c-0.05506-0.046245-0.12512-0.065657-0.19587-0.053083l-2.9801 0.52831c-0.11605 0.020579-0.19999 0.12143-0.19999 0.23933s0.08494 0.21875 0.20099 0.23933l2.9816 0.52831c0.01413 0.0024954 0.028389 0.0037268 0.042486 0.0037268 0.056648 0 0.10672-0.019801 0.15079-0.05681 0.055093-0.046181 0.081537-0.11437 0.081537-0.18625v-1.0566c0-0.07188-0.026347-0.14006-0.081472-0.18625z" fill="#747E86"/>
-</svg>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>lighthouse-s</title>
+    <g id="lighthouse-s" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="6" cy="6" r="6"></circle>
+        <circle id="Oval" fill="#747E86" cx="6" cy="6" r="5.25"></circle>
+        <path d="M4.68524003,6.77656895 L4.95449949,4.60767328 L6.66704607,4.60767328 L6.77423585,5.47107156 L4.68524003,6.77656895 L4.68524003,6.77656895 Z M7.43923952,8.88541473 L7.19645001,8.88541473 C7.19647436,8.88405363 7.19664446,8.88271683 7.19664446,8.88135574 C7.19664446,8.86903276 7.19542921,8.85697729 7.19309586,8.84535931 L6.89008147,6.40436419 L4.56198613,7.85931128 C4.55809723,7.86174183 4.55401414,7.86356472 4.55002765,7.86565527 L4.4267279,8.85890328 C4.42563415,8.86777476 4.4254154,8.87662225 4.42563415,8.88542073 L4.18228964,8.88542073 C4.08158984,8.88542073 4,8.96701557 4,9.06771036 C4,9.16841016 4.08159484,9.25 4.18228964,9.25 L7.43923312,9.25 C7.53993292,9.25 7.62152276,9.16840516 7.62152276,9.06771036 C7.62152276,8.96701057 7.53992792,8.88539573 7.43925812,8.88539573 L7.43923952,8.88541473 Z M6.71009098,3.92707465 L6.58260623,3.92707465 L6.54468981,3.63541023 L5.94039102,3.63541023 C5.92250205,3.63541023 5.90543959,3.62571225 5.88993112,3.61914976 C5.87442265,3.61258727 5.86044868,3.6000698 5.8487332,3.58833032 C5.83113624,3.57073336 5.81453527,3.54659791 5.80935828,3.52127046 C5.80763263,3.51283647 5.80267429,3.50333299 5.80267429,3.49438851 L5.80267429,3.49363501 L5.80267429,3.3518603 C5.80267429,3.34291581 5.80763263,3.33416583 5.80935828,3.32573185 C5.81798676,3.28353743 5.8491462,3.248807 5.88791312,3.23242204 C5.90342009,3.22585955 5.92250005,3.22223806 5.94038802,3.22223806 L6.49458691,3.22223806 L6.46546897,2.98895352 C6.53065884,2.96117258 6.57634875,2.89654371 6.57634875,2.82119886 C6.57634875,2.72540905 6.5024339,2.64704921 6.40856908,2.63963922 C6.32826424,2.40892968 6.10812968,2.25 5.85422019,2.25 L5.76730537,2.25 C5.51363087,2.25 5.29371131,2.40861968 5.21320647,2.63888922 L5.20311949,2.63888922 C5.1024197,2.63888922 5.02082986,2.72048406 5.02082986,2.82117886 C5.02082986,2.90520369 5.07772974,2.97573855 5.15504459,2.99685851 L5.03895982,3.92705665 L4.88715013,3.92705665 C4.78645033,3.92705665 4.70486049,4.00865148 4.70486049,4.10934628 C4.70486049,4.16223618 4.72751344,4.20972608 4.76351037,4.24302601 L6.83370623,4.24302601 C6.86967816,4.20972758 6.89235612,4.16223618 6.89235612,4.10934628 C6.89235612,4.00864648 6.81073628,3.92705665 6.71006648,3.92705665 L6.71009098,3.92707465 Z M9.11998616,2.89287671 C9.07869124,2.85819278 9.02614135,2.84363381 8.97308145,2.85306429 L6.73798592,3.2492935 C6.6509461,3.26472747 6.58799622,3.34036832 6.58799622,3.42878814 C6.58799622,3.51720797 6.6517011,3.59284781 6.73874092,3.60828278 L8.97498645,4.00451199 C8.98558343,4.00638349 8.99627791,4.00730714 9.00685089,4.00730714 C9.0493368,4.00730714 9.08689073,3.99245667 9.11994566,3.96469972 C9.16126508,3.93006429 9.18110054,3.87892489 9.18110054,3.825015 L9.18110054,3.03256658 C9.18110054,2.97865669 9.16134008,2.92751679 9.11999566,2.89288186 L9.11998616,2.89287671 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/lottery-m.svg b/data/styles/default/light/symbols/lottery-m.svg
index cad0b2d6b..c3da986a5 100644
--- a/data/styles/default/light/symbols/lottery-m.svg
+++ b/data/styles/default/light/symbols/lottery-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
+ <circle cx="12" cy="12" r="11" fill="#EB785D"/>
  <path d="m12 3.9193a3.9424 3.9424 0 0 0-3.9423 3.9423 3.9424 3.9424 0 0 0 1.0463 2.6652c-0.34982-0.10167-0.71931-0.1574-1.1019-0.1574-2.1773 0-3.9423 1.7652-3.9423 3.9425 0 2.1773 1.765 3.9423 3.9423 3.9423 1.4688 0 2.7491-0.80382 3.4274-1.995-0.0032 0.06694-0.0081 0.13356-0.01438 0.19963-0.0067 0.07098-0.01495 0.14145-0.0249 0.21135-0.0099 0.0699-0.02167 0.13932-0.03479 0.20805-0.02623 0.13745-0.05862 0.27247-0.09701 0.40471-0.0384 0.13224-0.08277 0.26157-0.13265 0.38788-0.04987 0.12631-0.10528 0.24956-0.16598 0.36924-0.0607 0.11968-0.12664 0.23579-0.19749 0.34812-0.0635 0.10069-0.13227 0.19727-0.20342 0.29153-0.0082 0.0109-0.01527 0.02288-0.02357 0.03365-0.08033 0.10429-0.16523 0.20442-0.2544 0.29994-0.08918 0.09553-0.18263 0.18649-0.27998 0.27256-0.08994 0.07952-0.18393 0.15369-0.28031 0.22455l-3.29e-4 0.0019 5e-4 0.0013c-0.0038 0.0038-0.0086 0.0063-0.01235 0.01007-0.01477 0.01477-0.02801 0.03099-0.03973 0.04835-0.01172 0.01737-0.02173 0.03594-0.03003 0.05544-0.0082 0.01952-0.01477 0.03999-0.01913 0.06121-0.0044 0.02123-0.0066 0.04328-0.0066 0.06583 0 0.02256 0.0026 0.04461 0.0066 0.06583 0.0044 0.02123 0.0109 0.0417 0.01913 0.06121 0.0082 0.01952 0.01831 0.03808 0.03003 0.05544s0.02503 0.03358 0.03973 0.04835c0.01477 0.01477 0.03098 0.02801 0.04835 0.03973 0.01736 0.01172 0.03593 0.02193 0.05545 0.03022 0.01952 0.0082 0.03999 0.01464 0.06121 0.01895 0.02123 0.0044 0.04328 0.0066 0.06583 0.0066h4.1217c0.02256 0 0.04461-0.0026 0.06583-0.0066 0.02123-0.0044 0.0417-0.01071 0.06121-0.01895 0.01952-0.0082 0.03809-0.01844 0.05544-0.03022 0.01736-0.01172 0.03358-0.02496 0.04835-0.03973 0.01477-0.01476 0.0282-0.03098 0.03993-0.04835 0.01172-0.01737 0.02173-0.03593 0.03003-0.05544 0.0082-0.01952 0.01464-0.03999 0.01895-0.06121 0.0044-0.02123 0.0066-0.04328 0.0066-0.06583 0-0.02256-0.0026-0.04461-0.0066-0.06583-0.0044-0.02123-0.01071-0.0417-0.01895-0.06121-0.0082-0.01952-0.01831-0.03808-0.03003-0.05544s-0.02515-0.03358-0.03993-0.04835c-0.0038-0.0038-0.0083-0.0065-0.01223-0.01007l5.07e-4 -0.0013v-0.0019c-0.09648-0.07092-0.19076-0.14511-0.2808-0.22471-0.09735-0.08606-0.1908-0.17703-0.27998-0.27255-0.04771-0.05113-0.09088-0.10686-0.13612-0.16053-0.03928-0.04664-0.08094-0.09093-0.11829-0.13942-0.08034-0.10428-0.15601-0.21285-0.22686-0.32518-0.07085-0.11234-0.13679-0.22844-0.19749-0.34812-0.06071-0.11968-0.1161-0.24293-0.16597-0.36924-0.04987-0.12631-0.09426-0.25564-0.13265-0.38788-0.03841-0.13224-0.07092-0.26726-0.09718-0.40472-0.01311-0.06872-0.02465-0.13814-0.03466-0.20804-0.0099-0.0699-0.01838-0.14036-0.02509-0.21135-0.0063-0.06602-0.01084-0.13259-0.01419-0.19947 0.67831 1.1911 1.9587 1.9948 3.4274 1.9948 2.1773 0 3.9423-1.765 3.9423-3.9423s-1.765-3.9425-3.9423-3.9425c-0.38269 0-0.75224 0.0557-1.1021 0.1574a3.9424 3.9424 0 0 0 1.0465-2.6652 3.9424 3.9424 0 0 0-3.9425-3.9423z" fill="#fff"/>
 </svg>
diff --git a/data/styles/default/light/symbols/marina-m.svg b/data/styles/default/light/symbols/marina-m.svg
index b376ccd9e..ed4323c67 100644
--- a/data/styles/default/light/symbols/marina-m.svg
+++ b/data/styles/default/light/symbols/marina-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>marina-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="viewpoint-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#9C6136"/>
-   <path id="Shape" d="m5.5116 12.152 5.7601-8.2584v8.2584h-5.7601m6.8401 0c0.97201-2.7 0.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9h-6.0913m6.1921 2.5776c-0.2952 0.4608-0.64081 0.8568-1.044 1.1952-0.46801-0.2088-0.88561-0.5328-1.2168-0.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-0.36 0.36-0.75601 0.684-1.224 0.8928-0.82081-0.6768-1.44-1.6416-1.656-2.6928h14.357c-0.1152 0.54-0.3168 1.0368-0.60481 1.4976m-0.1008 4.2624c-0.76321 0-1.4832-0.18-2.16-0.54-1.3248 0.72-2.988 0.72-4.3129 0-1.3248 0.72-2.988 0.72-4.2985 0-0.88561 0.4968-1.9008 0.576-2.88 0.54v-1.44c1.0152 0.036 1.9944-0.072 2.88-0.72 1.2528 0.9 3.0312 0.9 4.2985 0 1.2744 0.9 3.0456 0.9 4.3129 0 0.87121 0.648 1.8576 0.756 2.8656 0.72v1.44z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0797b8" r="11"/><path d="m5.5116 12.152 5.7601-8.2584v8.2584zm6.8401 0c.97201-2.7.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9zm6.1921 2.5776c-.2952.4608-.64081.8568-1.044 1.1952-.46801-.2088-.88561-.5328-1.2168-.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-.36.36-.75601.684-1.224.8928-.82081-.6768-1.44-1.6416-1.656-2.6928h14.357c-.1152.54-.3168 1.0368-.60481 1.4976m-.1008 4.2624c-.76321 0-1.4832-.18-2.16-.54-1.3248.72-2.988.72-4.3129 0-1.3248.72-2.988.72-4.2985 0-.88561.4968-1.9008.576-2.88.54v-1.44c1.0152.036 1.9944-.072 2.88-.72 1.2528.9 3.0312.9 4.2985 0 1.2744.9 3.0456.9 4.3129 0 .87121.648 1.8576.756 2.8656.72v1.44z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/martial-arts-centre-m.svg b/data/styles/default/light/symbols/martial-arts-centre-m.svg
new file mode 100644
index 000000000..2d71ae743
--- /dev/null
+++ b/data/styles/default/light/symbols/martial-arts-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9.5655 9.65716667-.24605 4.94833333c-.00911111.1458111-.06606667.2688361-.17086667.369075-.1048.1002444-.24833055.1503667-.43059166.1503667-.14580556 0-.27110834-.0501223-.37590834-.1503667s-.16175555-.2232694-.17086666-.369075l-.24605-4.4015833-1.736-.99783337-.191375.71081667.83383333 1.4626667c.07290556.1275833.08885278.2642777.04784167.4100833-.04100556.1458056-.1253.2551611-.25288334.3280667-.12758333.0729055-.26427777.0911305-.41008333.054675-.14580556-.03645-.25516111-.1184667-.32806667-.24605l-.95683333-1.654c-.03645-.0637889-.05923333-.1321361-.06835-.2050417-.00911111-.07290556-.00455556-.14580833.01366667-.21870833l.58779166-2.13241667 3.144-1.80433333-1.12091666-1.12091667c-.10024445-.10024444-.15264445-.22554722-.1572-.37590833-.00455556-.15036667.04784444-.28022778.1572-.38958334.10024444-.10024444.22782777-.15036666.38275-.15036666.15492222 0 .28250555.05012222.38275.15036666l1.62666666 1.613c.12758337.12758334.17998337.280225.15719997.457925-.0227833.17770556-.11163608.31212223-.2665583.40325l-1.35325.77915834.65613333.57411666 4.10083337-3.349c.1002444-.09112777.2209916-.12985833.3622416-.11619166.14125.01366944.2665528.08429444.3759084.211875.0820166.10024444.1207472.21415555.1161916.34173333-.0045555.12758333-.0524.24149722-.1435333.34174167zm-4.10083333-2.73391667c-.30072778 0-.55816945-.10707778-.772325-.32123333-.21415556-.21415556-.32123334-.47159723-.32123334-.772325 0-.30072778.10707778-.55816945.32123334-.772325.21415555-.21415556.47159722-.32123334.772325-.32123334.30072777 0 .55816944.10707778.772325.32123334.21415555.21415555.32123333.47159722.32123333.772325 0 .30072777-.10707778.55816944-.32123333.772325-.21415556.21415555-.47159723.32123333-.772325.32123333z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/martial-arts-m.svg b/data/styles/default/light/symbols/martial-arts-m.svg
index 57f7801b4..c7e2ae028 100644
--- a/data/styles/default/light/symbols/martial-arts-m.svg
+++ b/data/styles/default/light/symbols/martial-arts-m.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m9.4386 9.1886-0.29526 5.938q-0.0164 0.26246-0.20504 0.44289-0.18864 0.18044-0.51671 0.18044-0.26245 0-0.45109-0.18044-0.18864-0.18044-0.20504-0.44289l-0.29526-5.2819-2.0832-1.1974-0.22965 0.85298 1.0006 1.7552q0.13123 0.22965 0.05741 0.4921-0.07381 0.26245-0.30346 0.39368-0.22965 0.13123-0.4921 0.06561-0.26245-0.06561-0.39368-0.29526l-1.1482-1.9848q-0.06561-0.11482-0.08202-0.24605-0.0164-0.13123 0.0164-0.26245l0.70535-2.5589 3.7728-2.1652-1.3451-1.3451q-0.18044-0.18044-0.18864-0.45109-0.0082-0.27066 0.18864-0.4675 0.18044-0.18044 0.4593-0.18044t0.4593 0.18044l1.952 1.9356q0.22965 0.22965 0.18864 0.54951-0.04101 0.31987-0.31987 0.4839l-1.6239 0.93499 0.78736 0.68894 4.921-4.0188q0.18044-0.16403 0.43469-0.13943 0.25425 0.024605 0.45109 0.25425 0.14763 0.18044 0.13943 0.41008-0.0082 0.22965-0.17224 0.41009zm-4.921-3.2807q-0.54131 0-0.92679-0.38548-0.38548-0.38548-0.38548-0.92679t0.38548-0.92679q0.38548-0.38548 0.92679-0.38548t0.92679 0.38548q0.38548 0.38548 0.38548 0.92679t-0.38548 0.92679q-0.38548 0.38548-0.92679 0.38548z" fill="#747E86"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.4386 9.1886-.29526 5.938c-.01093333.1749733-.07928.3226033-.20504.44289-.12576.1202933-.29799667.18044-.51671.18044-.17496667 0-.32533-.0601467-.45109-.18044s-.19410667-.2679233-.20504-.44289l-.29526-5.2819-2.0832-1.1974-.22965.85298 1.0006 1.7552c.08748667.1531.10662333.3171333.05741.4921-.04920667.1749667-.15036.3061933-.30346.39368s-.31713333.1093567-.4921.06561c-.17496667-.04374-.30619333-.14216-.39368-.29526l-1.1482-1.9848c-.04374-.07654667-.07108-.15856333-.08202-.24605-.01093333-.08748667-.00546667-.17497.0164-.26245l.70535-2.5589 3.7728-2.1652-1.3451-1.3451c-.12029333-.12029333-.18317333-.27065667-.18864-.45109-.00546667-.18044.05741333-.33627333.18864-.4675.12029333-.12029333.27339333-.18044.4593-.18044s.33900667.06014667.4593.18044l1.952 1.9356c.1531.1531.21598.33627.18864.54951-.02734.21324667-.13396333.37454667-.31987.4839l-1.6239.93499.78736.68894 4.921-4.0188c.1202933-.10935333.26519-.15583.43469-.13943.1695.01640333.3198633.10115333.45109.25425.09842.12029333.1448967.25698667.13943.41008-.0054667.1531-.06288.28979667-.17224.41009zm-4.921-3.2807c-.36087333 0-.66980333-.12849333-.92679-.38548s-.38548-.56591667-.38548-.92679.12849333-.66980333.38548-.92679.56591667-.38548.92679-.38548.66980333.12849333.92679.38548.38548.56591667.38548.92679-.12849333.66980333-.38548.92679-.56591667.38548-.92679.38548z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/metal_construction-m.svg b/data/styles/default/light/symbols/metal_construction-m.svg
index 9303654aa..04b4de385 100644
--- a/data/styles/default/light/symbols/metal_construction-m.svg
+++ b/data/styles/default/light/symbols/metal_construction-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>metal_construction-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="metal_construction-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BE75A3"/>
-<path
-         id="path1575"
-         style="fill:#ffffff;stroke-width:1.08707"
-         d="m 4.8393016,8.1229641 0.018198,2.1276649 2.6206275,-0.03546 0.018198,6.400728 H 4.8575004 l 0.036398,2.021282 7.2977196,-0.01772 -0.01819,-2.056744 -2.6752241,-0.03546 0.0182,-6.418459 2.5842311,0.01773 -0.01819,-1.9503594 z m 0.8086105,7.9060379 h 1.2096387 v -0.764781 z m 4.5554489,-5.253167 2.406409,0.05015 3.899154,-2.469866 0.0386,4.03704 1.132428,0.02508 -5.263215,3.610768 h -2.264852 z m 8.30018,1.868071 0.05148,1.25374 -5.623533,4.3254 -0.09008,-1.855535 z m -5.700745,-4.6639088 0.09008,1.9056827 5.662139,-3.422707 -0.02574,-1.3289634 z M 6.0768201,7.5201255 12.646588,7.5733171 17.560265,4.949196 12.664788,4.8960044 Z" />
-  </g>
- </g>
-</svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m4.8393016 8.1229641.018198 2.1276649 2.6206275-.03546.018198 6.400728h-2.6388247l.036398 2.021282 7.2977196-.01772-.01819-2.056744-2.6752241-.03546.0182-6.418459 2.5842311.01773-.01819-1.9503594zm.8086105 7.9060379h1.2096387v-.764781zm4.5554489-5.253167 2.406409.05015 3.899154-2.469866.0386 4.03704 1.132428.02508-5.263215 3.610768h-2.264852zm8.30018 1.868071.05148 1.25374-5.623533 4.3254-.09008-1.855535zm-5.700745-4.6639088.09008 1.9056827 5.662139-3.422707-.02574-1.3289634zm-6.7259759-.4598717 6.5697679.0531916 4.913677-2.6241211-4.895477-.0531916z" fill="#fff" stroke-width="1.08707"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/mine-m.svg b/data/styles/default/light/symbols/mine-m.svg
index 5030ba03f..2fbcfdf89 100644
--- a/data/styles/default/light/symbols/mine-m.svg
+++ b/data/styles/default/light/symbols/mine-m.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<title>mine-m</title>
-	<g fill="none" fill-rule="evenodd">
-		<g id="lighthouse-m" fill-rule="nonzero">
-			<circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-			<circle cx="12" cy="12" r="11" fill="#747E86"/>
-			<path d="m5.7595 17.085 1.3497 1.3666 4.9051-4.8838 4.8909 4.9205 1.4221-1.4347-4.9323-4.9148 2.5567-2.5098 2.5256 2.6017 0.36018-3.7884-0.85764-0.87215 0.2239-0.23261-1.3817-1.3775-0.26713 0.28171-1.6405-1.6448-2.129 2.1178 1.6472 1.6551-2.3981 2.4121-2.2711-2.2099 1.8381-1.8308-2.0878-2.0729-1.8191 1.8128-0.19464-0.2148-1.4079 1.4073 0.19381 0.20055-1.7855 1.7692 2.1041 2.0949 1.8021-1.806 2.2164 2.2599z" fill="#fff" fill-rule="evenodd"/>
-		</g>
-	</g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m5.7595 17.085 1.3497 1.3666 4.9051-4.8838 4.8909 4.9205 1.4221-1.4347-4.9323-4.9148 2.5567-2.5098 2.5256 2.6017.36018-3.7884-.85764-.87215.2239-.23261-1.3817-1.3775-.26713.28171-1.6405-1.6448-2.129 2.1178 1.6472 1.6551-2.3981 2.4121-2.2711-2.2099 1.8381-1.8308-2.0878-2.0729-1.8191 1.8128-.19464-.2148-1.4079 1.4073.19381.20055-1.7855 1.7692 2.1041 2.0949 1.8021-1.806 2.2164 2.2599z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/motorcycle_rental-m.svg b/data/styles/default/light/symbols/motorcycle_rental-m.svg
index 9d17e218c..8176827f8 100644
--- a/data/styles/default/light/symbols/motorcycle_rental-m.svg
+++ b/data/styles/default/light/symbols/motorcycle_rental-m.svg
@@ -1,11 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>motorcycle_rental-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="car_sharing-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path transform="translate(2,2)" d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#fff"/>
-   <path transform="translate(0,2)" d="m16.667 11.5c-0.105 0-0.21 0.0175-0.30917 0.029167l-1.2017-1.1958h0.9275c0.32083 0 0.58333-0.2625 0.58333-0.58333v-0.22167c0-0.43167-0.455-0.7175-0.84583-0.51917l-1.33 0.665-1.4992-1.4992c-0.105-0.11083-0.25667-0.175-0.40833-0.175h-1.75c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.2658c0.1575 0 0.30333 0.064167 0.41417 0.16917l0.9975 0.9975h-1.9542c-0.093333 0-0.18083 0.023333-0.2625 0.064167l-1.8317 0.91583c-0.22167 0.11083-0.49583 0.07-0.67083-0.11083l-0.7-0.7c-0.11083-0.105-0.2625-0.16917-0.41417-0.16917h-2.0942c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.75c-1.47 0-2.6192 1.3533-2.2692 2.8817 0.1925 0.84583 0.875 1.5283 1.7208 1.7208 1.5283 0.35 2.8817-0.79917 2.8817-2.2692l0.8225 0.8225c0.22167 0.22167 0.51917 0.34417 0.82833 0.34417h0.58917c0.42 0 0.805-0.22167 1.015-0.58917l1.6975-2.9692 0.58917 0.58917c-0.65917 0.53083-1.0267 1.4058-0.805 2.3625 0.19833 0.84 0.88083 1.5225 1.7208 1.715 1.5225 0.34417 2.8758-0.81083 2.8758-2.275 0-1.2892-1.0442-2.3333-2.3333-2.3333zm-9.3333 3.5c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667zm9.3333 0c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#BE75A3" r="11"/><g fill="#fff"><path d="m9.0974 3.7509c-.324-.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h.77142v-1.5429zm-2.1831 1.5429c-.42429 0-.77143-.34714-.77143-.77143s.34714-.77143.77143-.77143.77143.34714.77143.77143-.34714.77143-.77143.77143z" transform="translate(2 2)"/><path d="m16.667 11.5c-.105 0-.21.0175-.30917.029167l-1.2017-1.1958h.9275c.32083 0 .58333-.2625.58333-.58333v-.22167c0-.43167-.455-.7175-.84583-.51917l-1.33.665-1.4992-1.4992c-.105-.11083-.25667-.175-.40833-.175h-1.75c-.32083 0-.58333.2625-.58333.58333s.2625.58333.58333.58333h1.2658c.1575 0 .30333.064167.41417.16917l.9975.9975h-1.9542c-.093333 0-.18083.023333-.2625.064167l-1.8317.91583c-.22167.11083-.49583.07-.67083-.11083l-.7-.7c-.11083-.105-.2625-.16917-.41417-.16917h-2.0942c-.32083 0-.58333.2625-.58333.58333s.2625.58333.58333.58333h1.75c-1.47 0-2.6192 1.3533-2.2692 2.8817.1925.84583.875 1.5283 1.7208 1.7208 1.5283.35 2.8817-.79917 2.8817-2.2692l.8225.8225c.22167.22167.51917.34417.82833.34417h.58917c.42 0 .805-.22167 1.015-.58917l1.6975-2.9692.58917.58917c-.65917.53083-1.0267 1.4058-.805 2.3625.19833.84.88083 1.5225 1.7208 1.715 1.5225.34417 2.8758-.81083 2.8758-2.275 0-1.2892-1.0442-2.3333-2.3333-2.3333zm-9.3333 3.5c-.64167 0-1.1667-.525-1.1667-1.1667 0-.64167.525-1.1667 1.1667-1.1667.64167 0 1.1667.525 1.1667 1.1667 0 .64167-.525 1.1667-1.1667 1.1667zm9.3333 0c-.64167 0-1.1667-.525-1.1667-1.1667 0-.64167.525-1.1667 1.1667-1.1667.64167 0 1.1667.525 1.1667 1.1667 0 .64167-.525 1.1667-1.1667 1.1667z" transform="translate(0 2)"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/motorcycle_repair-m.svg b/data/styles/default/light/symbols/motorcycle_repair-m.svg
index 31d7d88d5..985156679 100644
--- a/data/styles/default/light/symbols/motorcycle_repair-m.svg
+++ b/data/styles/default/light/symbols/motorcycle_repair-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<path d="m12 24c6.6274 0 12-5.3726 12-12 0-6.6274-5.3726-12-12-12-6.6274 0-12 5.3726-12 12 0 6.6274 5.3726 12 12 12z" fill="#fff" opacity=".6"/>
-	<path d="m12 23c6.0751 0 11-4.9249 11-11s-4.9248-11-11-11c-6.0751 0-11 4.9248-11 11s4.9248 11 11 11z" fill="#747E86"/>
-	<path d="m5.0001 16.197c0 0.46421 0.38683 0.85108 0.85105 0.85108h5.1664v1.7278c0 0.47284 0.38686 0.85108 0.85108 0.85108h0.0086c0.47273 0 0.85108-0.38686 0.85108-0.85108v-1.7278h5.1664c0.47284 0 0.85108-0.38686 0.85108-0.85108 0-0.47285-0.38686-0.85108-0.85108-0.85108h-12.044c-0.46421-0.0085-0.85115 0.37823-0.85115 0.85108z" fill="#fff"/>
-	<path d="m17.445 9.0834c-0.1225 0-0.245 0.020417-0.36073 0.034066l-1.402-1.3951h1.0821c0.37426 0 0.68051-0.30625 0.68051-0.68055v-0.25861c0-0.50361-0.53083-0.83708-0.98676-0.60569l-1.5517 0.77583-1.749-1.749c-0.1225-0.1293-0.29948-0.20416-0.47634-0.20416h-2.0416c-0.37438 0-0.68063 0.30625-0.68063 0.68055s0.30625 0.68055 0.68063 0.68055h1.4768c0.18375 0 0.35385 0.074864 0.48311 0.19736l1.1637 1.1637h-2.2799c-0.10885 0-0.21093 0.027218-0.30625 0.074864l-2.1369 1.0684c-0.25861 0.12938-0.57846 0.081666-0.78263-0.12927l-0.81666-0.81666c-0.1293-0.1225-0.30625-0.19736-0.48319-0.19736h-2.4432c-0.3743 0-0.68055 0.30625-0.68055 0.68055 0 0.37431 0.30625 0.68056 0.68055 0.68056h2.0416c-1.715 0-3.0557 1.5788-2.6474 3.362 0.22458 0.98676 1.0208 1.783 2.0076 2.0076 1.783 0.40833 3.362-0.93239 3.362-2.6474l0.95954 0.95957c0.25865 0.25865 0.60573 0.40156 0.96646 0.40156h0.68728c0.49 0 0.93916-0.25865 1.1842-0.68739l1.9804-3.464 0.68739 0.68739c-0.76906 0.61926-1.1978 1.6401-0.93916 2.7562 0.23135 0.97999 1.0276 1.7762 2.0076 2.0008 1.7762 0.40145 3.3551-0.94604 3.3551-2.6541 0-1.5041-1.2179-2.7222-2.7218-2.7222zm-10.889 4.0833c-0.74861 0-1.3611-0.61249-1.3611-1.3611s0.61249-1.3611 1.3611-1.3611c0.74861 0 1.3611 0.61249 1.3611 1.3611s-0.61249 1.3611-1.3611 1.3611zm10.889 0c-0.74864 0-1.3611-0.61249-1.3611-1.3611s0.61249-1.3611 1.3611-1.3611c0.74853 0 1.3611 0.61249 1.3611 1.3611s-0.61249 1.3611-1.3611 1.3611z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12 24c6.6274 0 12-5.3726 12-12s-5.3726-12-12-12-12 5.3726-12 12 5.3726 12 12 12z" fill="#fff" opacity=".6"/><path d="m12 23c6.0751 0 11-4.9249 11-11s-4.9248-11-11-11c-6.0751 0-11 4.9248-11 11s4.9248 11 11 11z" fill="#AA96BC"/><g fill="#fff"><path d="m5.0001 16.197c0 .46421.38683.85108.85105.85108h5.1664v1.7278c0 .47284.38686.85108.85108.85108h.0086c.47273 0 .85108-.38686.85108-.85108v-1.7278h5.1664c.47284 0 .85108-.38686.85108-.85108 0-.47285-.38686-.85108-.85108-.85108h-12.044c-.46421-.0085-.85115.37823-.85115.85108z"/><path d="m17.445 9.0834c-.1225 0-.245.020417-.36073.034066l-1.402-1.3951h1.0821c.37426 0 .68051-.30625.68051-.68055v-.25861c0-.50361-.53083-.83708-.98676-.60569l-1.5517.77583-1.749-1.749c-.1225-.1293-.29948-.20416-.47634-.20416h-2.0416c-.37438 0-.68063.30625-.68063.68055s.30625.68055.68063.68055h1.4768c.18375 0 .35385.074864.48311.19736l1.1637 1.1637h-2.2799c-.10885 0-.21093.027218-.30625.074864l-2.1369 1.0684c-.25861.12938-.57846.081666-.78263-.12927l-.81666-.81666c-.1293-.1225-.30625-.19736-.48319-.19736h-2.4432c-.3743 0-.68055.30625-.68055.68055 0 .37431.30625.68056.68055.68056h2.0416c-1.715 0-3.0557 1.5788-2.6474 3.362.22458.98676 1.0208 1.783 2.0076 2.0076 1.783.40833 3.362-.93239 3.362-2.6474l.95954.95957c.25865.25865.60573.40156.96646.40156h.68728c.49 0 .93916-.25865 1.1842-.68739l1.9804-3.464.68739.68739c-.76906.61926-1.1978 1.6401-.93916 2.7562.23135.97999 1.0276 1.7762 2.0076 2.0008 1.7762.40145 3.3551-.94604 3.3551-2.6541 0-1.5041-1.2179-2.7222-2.7218-2.7222zm-10.889 4.0833c-.74861 0-1.3611-.61249-1.3611-1.3611s.61249-1.3611 1.3611-1.3611 1.3611.61249 1.3611 1.3611-.61249 1.3611-1.3611 1.3611zm10.889 0c-.74864 0-1.3611-.61249-1.3611-1.3611s.61249-1.3611 1.3611-1.3611c.74853 0 1.3611.61249 1.3611 1.3611s-.61249 1.3611-1.3611 1.3611z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/nightclub-m.svg b/data/styles/default/light/symbols/nightclub-m.svg
index 90f9b735c..241ed285b 100644
--- a/data/styles/default/light/symbols/nightclub-m.svg
+++ b/data/styles/default/light/symbols/nightclub-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#ec955e" r="8.25"/><path d="m11.8 8.518c.0617112 0 .1146065.01985612.1586859.05956835.0440793.03971222.2038672.97184647.2743942 1.27410065.070527.3022543.1636448.5499041.2793531.7429497.1157084.1930456.2688843.3469304.4595278.4616546l.132783.0699267.0986353.0465112.0789111.0314669c.0615155.0232237.1264461.0448281.1947915.0648132l.2238421.0569944 1.0072826.1846799.1923409.0428297c.0291714.0081023.0478877.0151042.0533334.0206917.0440794.0452279.0661191.0998322.0661191.163813s-.0220397.1185851-.0661191.163813c-.0440793.0452277-.9576249.1831174-1.2529569.2482013-.2953319.0650841-.5383196.1549882-.728963.2697124-.1906435.1147242-.3438194.268609-.4595278.4616546-.1157083.1930456-.2088261.4401439-.2793531.741295l-.216668 1.0726977-.0276905.1164364c-.0125115.0477421-.0228227.0782877-.0300357.0849666-.0440794.0408153-.0969747.061223-.1586859.061223s-.1146065-.0204077-.1586859-.061223c-.0154277-.0142854-.0430049-.1218793-.0747939-.2671616l-.1698467-.8431262c-.0286516-.1334771-.0603337-.2568885-.0950462-.3702338l-.0790958-.2276618-.0341331-.0821763c-.0815469-.1864269-.1845826-.3419664-.3091068-.4666187-.1245243-.1246524-.2793531-.2266907-.4644867-.3061151-.1388501-.0595684-.2993956-.112001-.48163622-.1572978l-.28539402-.0618097-.75750468-.1446149-.14015877-.0318776c-.05841402-.0146936-.09704961-.027225-.1056451-.0362705-.0429774-.0452279-.06446611-.0998322-.06446611-.163813s.02148871-.1185851.06446611-.163813c.01025599-.0107929.07021398-.0268628.15956703-.0459609l1.0933898-.2022404c.29423006-.0650841.53666676-.1549882.72731016-.2697124.1906433-.1147242.3443702-.268609.4611806-.4616546.0876079-.1447842.1621985-.3202832.2237719-.5264973l.0725048-.28501663.1940886-.97156492.0313246-.13525024c.0141601-.05571735.0257991-.09159359.0337105-.09872126.0440794-.03971223.0969747-.05956835.1586859-.05956835zm-5.00462261 4.1774895.47578827.0502628.32995434.0263277.57765236.0353901.42056496.0137938-.00064825 1.2530304-.16598532-.0165074-.1645867-.02175c-.27180754-.0405405-.53655878-.1026839-.79245105-.1846276l-.13594638-.0456834c-.13201893-.0464711-.26153181-.0982596-.38828151-.1551086-.05706076-.3091628-.10909042-.6279724-.15606072-.9551278zm3.49355501.0862286c.1073473.0519869.1949753.1131628.264923.1831825.0618318.0618953.1173885.137901.1663487.2292948l.0642181.1378745.0826828.2351502.0434237.1588536.1812332-.0754564c-.1267497.056849-.2562626.1086375-.3882815.1551086l-.1359464.0456834c-.2558923.0819437-.5206435.1440871-.79245105.1846276l-.1645867.02175-.16598532.0165074-.00064825-1.2530304.42056496-.0137938zm-5.00088081-.332281.31700206.0629752.32130216.0574943.07527007.5222404c-.16415505-.1216118-.32044126-.2530919-.46817922-.3934614zm1.25234286-2.3854766-.01697434-.34550972.56871797.06276939.29474017.02592572.53415795.03577645.2744038.01183766.40389732.01321523-.00257387 1.23477077c-.17012988.0386431-.19321523.0571874-.28575534.1545723-.12479698.1313318-.19100811.2995791-.19100811.4806817 0 .0517111.00539819.102374.01601703.1514287l.01894297.0712113-.04497194-.0011864c-.48606707-.0241334-.96155343-.0673328-1.42417187-.1280071-.06359528-.570574-.11240648-1.1616257-.14542174-1.767486zm-2.5707958-.69764234-.00799865-.15848097.46374374.12249833.41101876.09679424.24281734.05218007.22562016.04425017.36954891.06866044.02373455.51387826c.01222804.2214825.02660821.4410595.04343401.6582534l.036665.4701329.04404763.460615c-.43865499-.0810959-.86350016-.1782458-1.27238702-.2899773-.10948174-.2053937-.20519192-.4191686-.28579411-.6404323l-.06331389-.1835808-.06717924-.2269141-.06067814-.2491812-.04914876-.25960746-.03519936-.25913167zm6.93780455.41902344-.0435191.16937316c-.0459687.15259784-.1054641.29258034-.1715302.40176384-.0782682.1293494-.1784172.2296012-.3048028.3056568-.1442767.0868219-.3407964.1596984-.58947913.2147073l-.35419197.0644373-.00001732-1.07330477.40297732-.01321523.2753238-.01183766.5341579-.03577645zm3.1741968-.57750441-.0079986.15848097-.018931.21995701-.0351993.25913167-.0491488.25960746-.0606781.2491812-.0809808.269015-.0495124.1414799-.038871.0974696-.1829972-.0492608-.1125232-.0390742-.0709962-.028395-.0728261-.0352927-.1146348-.0608747c-.1030276-.0628713-.2022409-.1625438-.2793153-.2911331-.0711197-.1186548-.1343991-.2728503-.1877866-.46229722l-.0381539-.14869032c-.012555-.05380655-.0212612-.09377636-.0431441-.2042991l.3261176-.06353303.2428173-.05218007.5259029-.12581591zm-7.28117308-2.40395665.13461308.01487946.39744.03496.24288.01656.54924.02944.47493399.01497029.00032842 2.10921677-.53957507-.01892302c-.17831449-.00871986-.35519164-.01983347-.53051982-.0332675l-.52167519-.04676486c-.17226584-.01787207-.34289623-.03794812-.5117882-.06013977-.00435954-.22540378-.0065633-.4522648-.0065633-.68031422l.00277917-.46781769.0876671-.4291617c.02794853-.11865082.06308659-.22301518.10250723-.30715276l.04074051-.0771753c.02248072-.03750638.0479442-.07038807.07699208-.0993097zm4.72425258-.02941621.0159851.46112683c.0077652.28686039.0120325.57628165.0127014.86770067-.080686.02886662-.1545689.07361469-.2199504.13251862-.0881687.07943374-.1112525.11559931-.1425074.2210899l-.0483816.1862026-.0567095.27651916-.5723846.05209443c-.1753282.01343403-.3522053.02454764-.53051984.0332675l-.53957507.01892302.00032842-2.10921677.52260038-.01606292.50065361-.02834737.28704-.02024.35328-.03128zm-6.97901686-.11570986.10355214.03947298c.08015358.03438683.14163992.07490877.1877002.12101639.046864.04691216.08871186.11008448.12478199.19254552.03365107.07693077.06497708.17098108.09324131.28170049l.05346076.24683831.09570721.47458652.04627058.18632233c.03550682.1168579.05251858.1580878.14374396.24255801.07388246.06841152.16066865.11663579.25460449.14292813l.00149308.14387643c-.57487732-.1049053-1.12513955-.23550947-1.64582865-.38855571.01267636-.09367422.02791354-.18652609.04594577-.27859161l.06295029-.28368844.0606941-.21859728.09766013-.29160654.08264473-.2079964c.05800053-.13747718.12189933-.27185044.19137791-.40280913zm8.84346166-.1932224.0775512.13669953.1122356.21683356.1153184.25526206.0724763.18402824c.0548994.1461051.1028152.2952883.1438276.44732159l.0539911.21970783.02834.13806738c.0180322.09206552.0332694.18491739.0459458.27859161-.4960013.14578974-1.0188378.27121508-1.5642239.37346086l-.0477158-.19531555-.0320787-.10666729.0021392-.2290242-.0027468-.44656856-.0132578-.62223621-.0164124-.45637084c.2542508-.0406285.50447-.08576709.7502813-.1352276zm-7.5691243-2.91553207c.04407939 0 .08186174.01418293.11334702.04254882.03148528.02836588.14561944.69417608.1959959.91007194.05037645.21589585.11688911.39278862.19953798.53067831.06198666.10341727.13902721.19110034.23112167.26304921l.09711242.06670414c.13300702.08004015.30168403.14316663.50603101.18937944l.81638618.15228738.07769741.02049449c.00801839.00289399.01332321.00549992.01554249.00777702.03148528.03230559.04722792.07130866.04722792.11700925s-.01574264.08470366-.04722792.11700925l-.01259247.00667763-.06331562.01761927-.04691248.01036164c-.20603454.04343851-.61368275.10770621-.77214864.1426282l-.19848847.05239808c-.12401704.03887177-.23141684.08562293-.32219941.14025351-.13617386.08194587-.24558521.19186366-.32823409.32975335-.08264887.13788969-.14916153.31438849-.19953798.5294964l-.15917287.78582349-.02998674.11158676c-.00257778.00653053-.00486846.01083958-.00683629.01266169-.03148528.02915382-.06926763.04373073-.11334702.04373073s-.08186174-.01457691-.11334702-.04373073c-.01626472-.01506033-.05143407-.1753102-.08727858-.35301225l-.08746475-.44005044c-.04093088-.19068175-.09052019-.35260363-.14876797-.48576567-.03883185-.0887747-.08448551-.1677439-.13696098-.23690762l-.0067007-.00729329c-.02330635-.03160272-.04947581-.06141669-.07712887-.08909817-.08894593-.08903734-.19953799-.1619219-.33177619-.21865365-.13223819-.05673176-.292026-.10440218-.47936343-.1430113l-.57263861-.10909598c-.11406652-.02338893-.20101387-.04425706-.21252567-.05637165-.03069815-.03230559-.04604723-.07130866-.04604723-.11700925s.01534908-.08470366.04604723-.11700925c.03069814-.03230558.68480493-.13079822.8949692-.17728674s.38333334-.11070572.51950718-.19265159c.13617386-.08194587.24597878-.19186366.32941479-.32975335.083436-.13788969.15034223-.31478246.20071868-.53067831l.15917287-.7862667.02998674-.11128206c.00257778-.00648743.00486846-.01075031.00683629-.01252318.03148528-.02836589.06926763-.04254882.11334702-.04254882zm2.7795338.4324.00009383 2.0882231-.05870365-.00083563c.02575159-.06928968.03907602-.14337386.03907602-.21978747 0-.16521861-.06229099-.31954728-.17780332-.43806911l-.1502689-.10162334c-.03858982-.0240003-.05019941-.02594162-.07728846-.03047136l-.09483071-.02405418-.83230998-.15554992c-.14237115-.03253732-.26583671-.07874366-.3532017-.13131763-.07139836-.04296567-.12684721-.09867116-.17086209-.1721047-.01879766-.03136162-.03693848-.06724833-.05426963-.10763859l.01701588-.15466645c.58102387-.30245446 1.22782776-.49556123 1.91335271-.55210472zm.8441324 0c.6855249.05654349 1.3323288.24965026 1.9133527.55210472l.0140922.12223349.0326014.33528103c.0294402.30772863.0546499.62070304.0754731.93817871-.1745971.02091352-.3510641.03967558-.529278.05620888l-.4947812.03981501-.51346142.02865882-.42580856.01418019-.07228405.00156225zm2.821421 1.15795117c.2098075.17522662.4052152.36711759.5841888.57363866l-.1724141.03398644-.3591565.06281833-.037849-.50098153z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#EB785D" r="8.25"/><path d="m11.8 8.518c.0617112 0 .1146065.01985612.1586859.05956835.0440793.03971222.2038672.97184647.2743942 1.27410065.070527.3022543.1636448.5499041.2793531.7429497.1157084.1930456.2688843.3469304.4595278.4616546l.132783.0699267.0986353.0465112.0789111.0314669c.0615155.0232237.1264461.0448281.1947915.0648132l.2238421.0569944 1.0072826.1846799.1923409.0428297c.0291714.0081023.0478877.0151042.0533334.0206917.0440794.0452279.0661191.0998322.0661191.163813s-.0220397.1185851-.0661191.163813c-.0440793.0452277-.9576249.1831174-1.2529569.2482013-.2953319.0650841-.5383196.1549882-.728963.2697124-.1906435.1147242-.3438194.268609-.4595278.4616546-.1157083.1930456-.2088261.4401439-.2793531.741295l-.216668 1.0726977-.0276905.1164364c-.0125115.0477421-.0228227.0782877-.0300357.0849666-.0440794.0408153-.0969747.061223-.1586859.061223s-.1146065-.0204077-.1586859-.061223c-.0154277-.0142854-.0430049-.1218793-.0747939-.2671616l-.1698467-.8431262c-.0286516-.1334771-.0603337-.2568885-.0950462-.3702338l-.0790958-.2276618-.0341331-.0821763c-.0815469-.1864269-.1845826-.3419664-.3091068-.4666187-.1245243-.1246524-.2793531-.2266907-.4644867-.3061151-.1388501-.0595684-.2993956-.112001-.48163622-.1572978l-.28539402-.0618097-.75750468-.1446149-.14015877-.0318776c-.05841402-.0146936-.09704961-.027225-.1056451-.0362705-.0429774-.0452279-.06446611-.0998322-.06446611-.163813s.02148871-.1185851.06446611-.163813c.01025599-.0107929.07021398-.0268628.15956703-.0459609l1.0933898-.2022404c.29423006-.0650841.53666676-.1549882.72731016-.2697124.1906433-.1147242.3443702-.268609.4611806-.4616546.0876079-.1447842.1621985-.3202832.2237719-.5264973l.0725048-.28501663.1940886-.97156492.0313246-.13525024c.0141601-.05571735.0257991-.09159359.0337105-.09872126.0440794-.03971223.0969747-.05956835.1586859-.05956835zm-5.00462261 4.1774895.47578827.0502628.32995434.0263277.57765236.0353901.42056496.0137938-.00064825 1.2530304-.16598532-.0165074-.1645867-.02175c-.27180754-.0405405-.53655878-.1026839-.79245105-.1846276l-.13594638-.0456834c-.13201893-.0464711-.26153181-.0982596-.38828151-.1551086-.05706076-.3091628-.10909042-.6279724-.15606072-.9551278zm3.49355501.0862286c.1073473.0519869.1949753.1131628.264923.1831825.0618318.0618953.1173885.137901.1663487.2292948l.0642181.1378745.0826828.2351502.0434237.1588536.1812332-.0754564c-.1267497.056849-.2562626.1086375-.3882815.1551086l-.1359464.0456834c-.2558923.0819437-.5206435.1440871-.79245105.1846276l-.1645867.02175-.16598532.0165074-.00064825-1.2530304.42056496-.0137938zm-5.00088081-.332281.31700206.0629752.32130216.0574943.07527007.5222404c-.16415505-.1216118-.32044126-.2530919-.46817922-.3934614zm1.25234286-2.3854766-.01697434-.34550972.56871797.06276939.29474017.02592572.53415795.03577645.2744038.01183766.40389732.01321523-.00257387 1.23477077c-.17012988.0386431-.19321523.0571874-.28575534.1545723-.12479698.1313318-.19100811.2995791-.19100811.4806817 0 .0517111.00539819.102374.01601703.1514287l.01894297.0712113-.04497194-.0011864c-.48606707-.0241334-.96155343-.0673328-1.42417187-.1280071-.06359528-.570574-.11240648-1.1616257-.14542174-1.767486zm-2.5707958-.69764234-.00799865-.15848097.46374374.12249833.41101876.09679424.24281734.05218007.22562016.04425017.36954891.06866044.02373455.51387826c.01222804.2214825.02660821.4410595.04343401.6582534l.036665.4701329.04404763.460615c-.43865499-.0810959-.86350016-.1782458-1.27238702-.2899773-.10948174-.2053937-.20519192-.4191686-.28579411-.6404323l-.06331389-.1835808-.06717924-.2269141-.06067814-.2491812-.04914876-.25960746-.03519936-.25913167zm6.93780455.41902344-.0435191.16937316c-.0459687.15259784-.1054641.29258034-.1715302.40176384-.0782682.1293494-.1784172.2296012-.3048028.3056568-.1442767.0868219-.3407964.1596984-.58947913.2147073l-.35419197.0644373-.00001732-1.07330477.40297732-.01321523.2753238-.01183766.5341579-.03577645zm3.1741968-.57750441-.0079986.15848097-.018931.21995701-.0351993.25913167-.0491488.25960746-.0606781.2491812-.0809808.269015-.0495124.1414799-.038871.0974696-.1829972-.0492608-.1125232-.0390742-.0709962-.028395-.0728261-.0352927-.1146348-.0608747c-.1030276-.0628713-.2022409-.1625438-.2793153-.2911331-.0711197-.1186548-.1343991-.2728503-.1877866-.46229722l-.0381539-.14869032c-.012555-.05380655-.0212612-.09377636-.0431441-.2042991l.3261176-.06353303.2428173-.05218007.5259029-.12581591zm-7.28117308-2.40395665.13461308.01487946.39744.03496.24288.01656.54924.02944.47493399.01497029.00032842 2.10921677-.53957507-.01892302c-.17831449-.00871986-.35519164-.01983347-.53051982-.0332675l-.52167519-.04676486c-.17226584-.01787207-.34289623-.03794812-.5117882-.06013977-.00435954-.22540378-.0065633-.4522648-.0065633-.68031422l.00277917-.46781769.0876671-.4291617c.02794853-.11865082.06308659-.22301518.10250723-.30715276l.04074051-.0771753c.02248072-.03750638.0479442-.07038807.07699208-.0993097zm4.72425258-.02941621.0159851.46112683c.0077652.28686039.0120325.57628165.0127014.86770067-.080686.02886662-.1545689.07361469-.2199504.13251862-.0881687.07943374-.1112525.11559931-.1425074.2210899l-.0483816.1862026-.0567095.27651916-.5723846.05209443c-.1753282.01343403-.3522053.02454764-.53051984.0332675l-.53957507.01892302.00032842-2.10921677.52260038-.01606292.50065361-.02834737.28704-.02024.35328-.03128zm-6.97901686-.11570986.10355214.03947298c.08015358.03438683.14163992.07490877.1877002.12101639.046864.04691216.08871186.11008448.12478199.19254552.03365107.07693077.06497708.17098108.09324131.28170049l.05346076.24683831.09570721.47458652.04627058.18632233c.03550682.1168579.05251858.1580878.14374396.24255801.07388246.06841152.16066865.11663579.25460449.14292813l.00149308.14387643c-.57487732-.1049053-1.12513955-.23550947-1.64582865-.38855571.01267636-.09367422.02791354-.18652609.04594577-.27859161l.06295029-.28368844.0606941-.21859728.09766013-.29160654.08264473-.2079964c.05800053-.13747718.12189933-.27185044.19137791-.40280913zm8.84346166-.1932224.0775512.13669953.1122356.21683356.1153184.25526206.0724763.18402824c.0548994.1461051.1028152.2952883.1438276.44732159l.0539911.21970783.02834.13806738c.0180322.09206552.0332694.18491739.0459458.27859161-.4960013.14578974-1.0188378.27121508-1.5642239.37346086l-.0477158-.19531555-.0320787-.10666729.0021392-.2290242-.0027468-.44656856-.0132578-.62223621-.0164124-.45637084c.2542508-.0406285.50447-.08576709.7502813-.1352276zm-7.5691243-2.91553207c.04407939 0 .08186174.01418293.11334702.04254882.03148528.02836588.14561944.69417608.1959959.91007194.05037645.21589585.11688911.39278862.19953798.53067831.06198666.10341727.13902721.19110034.23112167.26304921l.09711242.06670414c.13300702.08004015.30168403.14316663.50603101.18937944l.81638618.15228738.07769741.02049449c.00801839.00289399.01332321.00549992.01554249.00777702.03148528.03230559.04722792.07130866.04722792.11700925s-.01574264.08470366-.04722792.11700925l-.01259247.00667763-.06331562.01761927-.04691248.01036164c-.20603454.04343851-.61368275.10770621-.77214864.1426282l-.19848847.05239808c-.12401704.03887177-.23141684.08562293-.32219941.14025351-.13617386.08194587-.24558521.19186366-.32823409.32975335-.08264887.13788969-.14916153.31438849-.19953798.5294964l-.15917287.78582349-.02998674.11158676c-.00257778.00653053-.00486846.01083958-.00683629.01266169-.03148528.02915382-.06926763.04373073-.11334702.04373073s-.08186174-.01457691-.11334702-.04373073c-.01626472-.01506033-.05143407-.1753102-.08727858-.35301225l-.08746475-.44005044c-.04093088-.19068175-.09052019-.35260363-.14876797-.48576567-.03883185-.0887747-.08448551-.1677439-.13696098-.23690762l-.0067007-.00729329c-.02330635-.03160272-.04947581-.06141669-.07712887-.08909817-.08894593-.08903734-.19953799-.1619219-.33177619-.21865365-.13223819-.05673176-.292026-.10440218-.47936343-.1430113l-.57263861-.10909598c-.11406652-.02338893-.20101387-.04425706-.21252567-.05637165-.03069815-.03230559-.04604723-.07130866-.04604723-.11700925s.01534908-.08470366.04604723-.11700925c.03069814-.03230558.68480493-.13079822.8949692-.17728674s.38333334-.11070572.51950718-.19265159c.13617386-.08194587.24597878-.19186366.32941479-.32975335.083436-.13788969.15034223-.31478246.20071868-.53067831l.15917287-.7862667.02998674-.11128206c.00257778-.00648743.00486846-.01075031.00683629-.01252318.03148528-.02836589.06926763-.04254882.11334702-.04254882zm2.7795338.4324.00009383 2.0882231-.05870365-.00083563c.02575159-.06928968.03907602-.14337386.03907602-.21978747 0-.16521861-.06229099-.31954728-.17780332-.43806911l-.1502689-.10162334c-.03858982-.0240003-.05019941-.02594162-.07728846-.03047136l-.09483071-.02405418-.83230998-.15554992c-.14237115-.03253732-.26583671-.07874366-.3532017-.13131763-.07139836-.04296567-.12684721-.09867116-.17086209-.1721047-.01879766-.03136162-.03693848-.06724833-.05426963-.10763859l.01701588-.15466645c.58102387-.30245446 1.22782776-.49556123 1.91335271-.55210472zm.8441324 0c.6855249.05654349 1.3323288.24965026 1.9133527.55210472l.0140922.12223349.0326014.33528103c.0294402.30772863.0546499.62070304.0754731.93817871-.1745971.02091352-.3510641.03967558-.529278.05620888l-.4947812.03981501-.51346142.02865882-.42580856.01418019-.07228405.00156225zm2.821421 1.15795117c.2098075.17522662.4052152.36711759.5841888.57363866l-.1724141.03398644-.3591565.06281833-.037849-.50098153z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/office-m.svg b/data/styles/default/light/symbols/office-m.svg
index 2cde634a6..918ca4fa0 100644
--- a/data/styles/default/light/symbols/office-m.svg
+++ b/data/styles/default/light/symbols/office-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>office-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="office-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m10.6 15.1v-0.7h-4.893l-7e-3 2.8c0 0.777 0.623 1.4 1.4 1.4h9.8c0.777 0 1.4-0.623 1.4-1.4v-2.8h-4.9v0.7h-2.8zm7-6.3h-2.807v-1.4l-1.4-1.4h-2.8l-1.4 1.4v1.4h-2.793c-0.77 0-1.4 0.63-1.4 1.4v2.1c0 0.777 0.623 1.4 1.4 1.4h4.2v-1.4h2.8v1.4h4.2c0.77 0 1.4-0.63 1.4-1.4v-2.1c0-0.77-0.63-1.4-1.4-1.4zm-4.2 0h-2.8v-1.4h2.8v1.4z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m10.6 15.1v-.7h-4.893l-.007 2.8c0 .777.623 1.4 1.4 1.4h9.8c.777 0 1.4-.623 1.4-1.4v-2.8h-4.9v.7zm7-6.3h-2.807v-1.4l-1.4-1.4h-2.8l-1.4 1.4v1.4h-2.793c-.77 0-1.4.63-1.4 1.4v2.1c0 .777.623 1.4 1.4 1.4h4.2v-1.4h2.8v1.4h4.2c.77 0 1.4-.63 1.4-1.4v-2.1c0-.77-.63-1.4-1.4-1.4zm-4.2 0h-2.8v-1.4h2.8z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/padel-centre-m.svg b/data/styles/default/light/symbols/padel-centre-m.svg
new file mode 100644
index 000000000..19576f5d3
--- /dev/null
+++ b/data/styles/default/light/symbols/padel-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m12.1089277 10.5336112c.521633 0 1.048361.1994517 1.4472483.598339.7977827.8029017.7977827 2.0967139 0 2.8944965-.3989194.3988873-.9256153.598331-1.4472483.598331-.5216329 0-1.0483609-.1994437-1.4472482-.598331-.79778266-.8029017-.79778266-2.0967138 0-2.8944965.3989194-.3988953.9256233-.598339 1.4472482-.598339zm0 1.0227736c-.2710386 0-.531855.1073964-.7210686.2966099-.3988873.3989195-.3988873 1.048361 0 1.4472483.1892136.1943326.45003.301729.7210686.301729.2710387 0 .5318471-.1073964.7210687-.2966099.3988873-.3989195.3988873-1.048361 0-1.4472483-.1892136-.1943326-.45003-.301729-.7210687-.301729zm-.8425715-8.59132855c.4046751.23565.65825.43743125 1.13125.9003125.5621063.5498875.864125.9383125 1.1015625 1.4163125.4595251.925125.3888375 1.757-.2195312 2.5834375-.1523813.20700625-.7885.825-1.0906875 1.059625-.5552188.4310625-1.02975.7163125-1.547.929875-.2022333.0835-.601484.20919255-.76053265.24197105l-.04752985.0076727c-.02126765.00175-.51725882.1379279-1.17267603.3215513l-2.00613647.565205-2.0993125 2.1588125-1.288375-1.2444375 2.15155-2.1941438.79060625-3.1985c.18311875-.948.746-1.936125 1.6633125-2.9198125.51601875-.55334375.804625-.7653125 1.268125-.931375.6829375-.2446875 1.34674995-.1499 2.12537495.30349375zm-1.2611125 4.8816-.49832495.50816875.50816875.49831875.498325-.50816875zm-1.01631245-.996625-.498325.50816875.50816875.49831875.498325-.50816875zm2.01287495-.01975-.4983249.50816875.5081749.498325.4983188-.508175zm-3.02918745-.976875-.498325.50816875.50816875.49831875.498325-.50816875zm2.012875-.01975-.498325.508175.50816875.49831875.498325-.508175zm2.01287495-.01975-.498325.50816875.5081688.49831875.498325-.50816875zm-3.02918745-.976875-.498325.50816875.508175.498325.49831875-.508175zm2.01287495-.01975-.4983187.50816875.5081687.49831875.4983188-.50816875zm-1.01631245-.996625-.498325.50816875.50816875.49831875.498325-.50816875z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/padel-m.svg b/data/styles/default/light/symbols/padel-m.svg
index 34ba089cf..6da9ff03f 100644
--- a/data/styles/default/light/symbols/padel-m.svg
+++ b/data/styles/default/light/symbols/padel-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd"><g id="tennis-m" fill-rule="nonzero"><g id="Group" transform="translate(5 5)" fill="#fff"><g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)"><path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909s-0.66182-0.13364-0.89727-0.37546c-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z" fill="#747E86"/></g></g></g></g><path d="m6.2703 13.138 0.60389-2.4108c0.33214-1.3259 0.62962-2.544 0.66108-2.7068 0.29299-1.5168 1.1936-3.0978 2.6613-4.6717 0.82563-0.88535 1.2874-1.2245 2.029-1.4902 1.0927-0.3915 2.1548-0.23984 3.4006 0.48559 0.64748 0.37704 1.0532 0.69989 1.81 1.4405 0.89937 0.87982 1.3826 1.5013 1.7625 2.2661 0.73524 1.4802 0.62214 2.8112-0.35125 4.1335-0.24381 0.33121-1.2616 1.32-1.7451 1.6954-0.88835 0.6897-1.6476 1.1461-2.4752 1.4878-0.36402 0.1503-1.127 0.38604-1.2929 0.39943-0.04132 0.0034-1.2026 0.32394-2.5806 0.71244l-2.5055 0.70637-3.3589 3.4541-2.0614-1.9911zm4.5003-4.9687 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81308 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81308 0.79732zm-1.6577-4.8154 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79731 0.81307 0.81307 0.79731zm1.6261 1.5946 0.39866-0.40654-0.81307-0.79731-0.79732 0.81307 0.81307 0.79731z" fill="#747E86" stroke-width=".037959"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12.7307133 10.8403335c.6259596 0 1.2580331.239342 1.7366979.7180067.9573392.9634821.9573392 2.5160567 0 3.4733959-.4787033.4786647-1.1107383.7179971-1.7366979.7179971s-1.2580331-.2393324-1.7366979-.7179971c-.9573392-.9634821-.9573392-2.5160567 0-3.4733959.4787033-.4786744 1.110748-.7180067 1.7366979-.7180067zm0 1.2273282c-.3252463 0-.6382261.1288757-.8652823.3559319-.4786648.4787034-.4786648 1.2580332 0 1.736698.2270562.2331991.540036.3620748.8652823.3620748s.6382165-.1288757.8652823-.3559319c.4786648-.4787034.4786648-1.2580332 0-1.7366979-.2270562-.2331992-.540036-.3620749-.8652823-.3620749zm-1.0110858-10.3095942c.48561.28278.7899.5249175 1.3575 1.080375.6745275.659865 1.03695 1.125975 1.321875 1.699575.55143 1.11015.466605 2.1084-.2634375 3.100125-.1828575.2484075-.9462.99-1.308825 1.27155-.6662625.517275-1.2357.859575-1.8564 1.11585-.24268.1002-.7217807.2510311-.9126392.2903653l-.0570358.0092072c-.02552118.0021-.62071059.1655134-1.40721124.3858616l-2.40736376.6782459-2.519175 2.590575-1.54605-1.493325 2.58186-2.6329725.9487275-3.8382c.2197425-1.1376.8952-2.32335 1.995975-3.503775.6192225-.6640125.96555-.918375 1.52175-1.11765.819525-.293625 1.6161-.17988 2.55045.3641925zm-1.513335 5.85792-.59799.6098025.6098025.5979825.59799-.6098025zm-1.219575-1.19595-.59799.6098025.6098025.5979825.59799-.6098025zm2.41545-.0237-.59799.6098025.60981.59799.5979825-.60981zm-3.635025-1.17225-.59799.6098025.6098025.5979825.59799-.6098025zm2.41545-.0237-.59799.60981.6098025.5979825.59799-.60981zm2.41545-.0237-.59799.6098025.6098025.5979825.59799-.6098025zm-3.635025-1.17225-.59799.6098025.60981.59799.5979825-.60981zm2.41545-.0237-.5979825.6098025.6098025.5979825.5979825-.6098025zm-1.219575-1.19595-.59799.6098025.6098025.5979825.59799-.6098025z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/painter-m.svg b/data/styles/default/light/symbols/painter-m.svg
index 7a3018037..025e62cff 100644
--- a/data/styles/default/light/symbols/painter-m.svg
+++ b/data/styles/default/light/symbols/painter-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m9.0946 5.5957c-0.80117 0-1.4527 0.65155-1.4527 1.4527v2.1791c0 0.80118 0.65155 1.4527 1.4527 1.4527h7.99c0.80117 0 1.4527-0.65155 1.4527-1.4527v-2.1791c0-0.80117-0.65155-1.4527-1.4527-1.4527zm-2.1791 2.1791c-0.80117 0-1.4527 0.65155-1.4527 1.4527v2.9054c0 0.80117 0.65155 1.4527 1.4527 1.4527h5.0845v1.4527a0.72636 0.72636 0 0 0-0.72636 0.72636v3.6318a0.72636 0.72636 0 0 0 0.72636 0.72636h1.4527a0.72636 0.72636 0 0 0 0.72636-0.72636v-3.6318a0.72636 0.72636 0 0 0-0.72636-0.72636v-1.4527c0-0.80117-0.65155-1.4527-1.4527-1.4527h-5.0845z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m9.0946 5.5957c-.80117 0-1.4527.65155-1.4527 1.4527v2.1791c0 .80118.65155 1.4527 1.4527 1.4527h7.99c.80117 0 1.4527-.65155 1.4527-1.4527v-2.1791c0-.80117-.65155-1.4527-1.4527-1.4527zm-2.1791 2.1791c-.80117 0-1.4527.65155-1.4527 1.4527v2.9054c0 .80117.65155 1.4527 1.4527 1.4527h5.0845v1.4527a.72636.72636 0 0 0 -.72636.72636v3.6318a.72636.72636 0 0 0 .72636.72636h1.4527a.72636.72636 0 0 0 .72636-.72636v-3.6318a.72636.72636 0 0 0 -.72636-.72636v-1.4527c0-.80117-.65155-1.4527-1.4527-1.4527h-5.0845z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/pelota-centre-m.svg b/data/styles/default/light/symbols/pelota-centre-m.svg
new file mode 100644
index 000000000..e9322a9a9
--- /dev/null
+++ b/data/styles/default/light/symbols/pelota-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m12.10875 10.6335c.521625 0 1.0483625.19945 1.44725.5983375.7978125.802875.7978125 2.0966875 0 2.8945-.3989375.3988875-.9256188.5983313-1.44725.5983313-.521625 0-1.0483625-.1994438-1.44725-.5983313-.7978125-.802875-.7978125-2.0966875 0-2.8945.3989375-.3988937.925625-.5983375 1.44725-.5983375zm0 1.02275c-.2710313 0-.53185.1074-.7210625.2966125-.3988875.3989375-.3988875 1.0483625 0 1.44725.1892062.1943375.450025.3017313.7210625.3017313.2710312 0 .5318437-.1074.7210625-.2966125.3988875-.3989375.3988875-1.0483625 0-1.44725-.1892063-.1943375-.450025-.3017313-.7210625-.3017313zm-.2535063-8.4869375c.5505375.06848125.982875.2741125 1.3443125.6394375.3389876.3425875.5382188.748125.6165375 1.2550625.0343813.222525-.0061249.8413125-.0704625 1.0760625-.0999562.36484375-.2602.70875-.4780999 1.026125-.2139102.31152734-.580419.66636035-.918501.89624396l-.1595798.09969081-1.5522653.78145744-2.40296645 1.20473279-.16541789.1043584c-.17336181.1213663-.3694.3054568-.90054643.8456634l-1.44370912 1.4766121-.1335868.1329907c-.38429022.3778415-.41836907.3598582-.60861476.3873754-.09461875.0136875-.1795375.0152813-.2255125.0041875-.1701875-.0409375-.2436375-.09385-.573925-.4134562l-.19923502-.1956808c-.28349303-.2848507-.48703203-.5286772-.46432748-.7043817.03037875-.2350625.1843375-.4040125.4649125-.43425.2152875-.0232.47521875.2341812.5115375.2132437l.03441897-.0295208c.0272336-.0252157.06893801-.0655452.12256916-.1184281l.41442469-.4167798 1.10610286-1.1423534c.54960129-.57663754.64085389-.70256736.78010932-.9596054l.17830882-.37164261c.07554033-.16110971.16699345-.35819262.25995368-.56060739l.24378255-.5458316c.3759961-.85513889.62866537-1.48150173 1.18121745-2.5409809.18959375-.35155.61019375-.8380625.9335625-1.07975.30475625-.2278375.67699995-.41494375 1.06449995-.53501875.2434438-.07544375.7936875-.1256625 1.0405-.09495625z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/pelota-m.svg b/data/styles/default/light/symbols/pelota-m.svg
index 881930626..856b9d6d1 100644
--- a/data/styles/default/light/symbols/pelota-m.svg
+++ b/data/styles/default/light/symbols/pelota-m.svg
@@ -1,4 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path d="m16.974 16.09c0.43366 0 0.85097 0.17183 1.1537 0.48277 0.63822 0.63822 0.63822 1.6773 0 2.3156-0.30275 0.30274-0.72005 0.47458-1.1537 0.47458-0.43366 0-0.85097-0.17183-1.1537-0.48277-0.63822-0.63822-0.63822-1.6773 0-2.3156 0.30274-0.30274 0.72005-0.47458 1.1537-0.47458m0-1.6364c-0.8346 0-1.6773 0.31911-2.3156 0.95734-1.2765 1.2765-1.2765 3.3466 0 4.6312 0.63822 0.63822 1.481 0.95733 2.3156 0.95733 0.83461 0 1.6773-0.31911 2.3156-0.95733 1.2765-1.2765 1.2765-3.3466 0-4.6312-0.63822-0.63822-1.481-0.95734-2.3156-0.95734z" fill="#747E86" stroke-width="1.2858"/>
-<path d="m5.2111 18.399c-0.27247-0.0656-0.38999-0.15026-0.91845-0.66163-0.60975-0.59008-1.1061-1.0965-1.0617-1.4401 0.048606-0.3761 0.29494-0.64642 0.74386-0.6948 0.34446-0.03712 0.76035 0.37469 0.81846 0.34119 0.058099-0.0335 0.85197-0.83254 1.7641-1.7756 1.7241-1.7826 1.8834-1.9656 2.1681-2.4911 0.058451-0.10789 0.374-0.7791 0.70122-1.4916 0.84913-1.8684 1.2191-2.9047 2.28-4.9389 0.30335-0.56248 0.97631-1.3409 1.4937-1.7276 0.48761-0.36454 1.0832-0.66391 1.7032-0.85603 0.38951-0.12071 1.2699-0.20106 1.6648-0.15193 0.88086 0.10957 1.5726 0.43858 2.1509 1.0231 0.54238 0.54814 0.86115 1.197 0.98646 2.0081 0.05501 0.35604-0.0098 1.3461-0.11274 1.7217-0.15993 0.58375-0.41632 1.134-0.76496 1.6418-0.39115 0.56965-1.1012 1.2298-1.6978 1.5786-0.10269 0.06003-1.5384 0.78178-3.1905 1.6039-1.6521 0.8221-3.0763 1.5371-3.165 1.5889-0.49322 0.28812-0.66974 0.45388-2.6746 2.5116-2.1813 2.2388-2.0638 2.1364-2.5284 2.2036-0.15139 0.0219-0.28726 0.02445-0.36082 0.0067z" fill="#747E86" stroke-width=".030096"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12.7305 10.8402c.62595 0 1.258035.23934 1.7367.718005.957375.96345.957375 2.516025 0 3.4734-.478725.478665-1.1107425.7179975-1.7367.7179975-.62595 0-1.258035-.2393325-1.7367-.7179975-.957375-.96345-.957375-2.516025 0-3.4734.478725-.4786725 1.11075-.718005 1.7367-.718005zm0 1.2273c-.3252375 0-.63822.12888-.865275.355935-.478665.478725-.478665 1.258035 0 1.7367.2270475.233205.54003.3620775.865275.3620775.3252375 0 .6382125-.12888.865275-.355935.478665-.478725.478665-1.258035 0-1.7367-.2270475-.233205-.54003-.3620775-.865275-.3620775zm-.3042075-10.184325c.660645.0821775 1.17945.328935 1.613175.767325.406785.411105.6458625.89775.739845 1.506075.0412575.26703-.00735 1.009575-.084555 1.291275-.1199475.4378125-.31224.8505-.57372 1.23135-.2566922.37383281-.6965027.79963242-1.1022011 1.07549275l-.1914958.11962898-1.8627183.93774893-2.8835598 1.44567934-.19850147.1252301c-.20803417.1456396-.44328.3665481-1.08065571 1.014796l-1.73245095 1.7719346-.16030416.1595889c-.46114826.4534097-.50204288.4318297-.73033771.4648504-.1135425.016425-.215445.0183375-.270615.005025-.204225-.049125-.292365-.11262-.68871-.4961475l-.23908202-.2348169c-.34019164-.3418208-.58443843-.6344126-.55719298-.8452581.0364545-.282075.221205-.484815.557895-.5211.258345-.02784.5702625.2810175.613845.2558925l.04130277-.035425c.03268031-.0302588.08272561-.0786542.14708299-.1421137l.49730963-.5001357 1.32732342-1.37082412c.65952155-.69196504.76902467-.84308083.93613119-1.15152648l.21397059-.44597113c.09064839-.19333166.20039214-.42983114.31194441-.67272887l.29253906-.65499792c.45119531-1.02616666.75439844-1.77780208 1.41746094-3.04917708.2275125-.42186.7322325-1.005675 1.120275-1.2957.3657075-.273405.8124-.4979325 1.2774-.6420225.2921325-.0905325.952425-.150795 1.2486-.1139475z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/petting_zoo-m.svg b/data/styles/default/light/symbols/petting_zoo-m.svg
index e8dcfe2c2..da095d5fb 100644
--- a/data/styles/default/light/symbols/petting_zoo-m.svg
+++ b/data/styles/default/light/symbols/petting_zoo-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#9C6136"/>
-	<path d="m7.0781 5.9961c-0.10394 0-0.22223 0.00669-0.32617 0.013672-0.86615 0.083803-1.3858 0.39146-1.6699 0.62891l-0.20703 0.17383-0.26367-0.13281c-0.18016-0.090787-0.42205-0.12476-0.69922-0.089844-0.27024 0.027934-0.51357 0.097304-0.66602 0.16016-0.083151 0.027934-0.13849 0.097837-0.15234 0.18164-0.013858 0.083803 0.021621 0.16874 0.083984 0.22461 0.048505 0.041902 0.096027 0.075286 0.14453 0.11719 0.15244 0.11872 0.69427 0.50261 1.207 0.65625l0.2832 0.083984 0.068359 0.20312c0.11087 0.33521 0.29938 0.83868 0.54883 1.3555 0.27717 0.57266 0.57509 1.0111 0.87305 1.3184 0.29796 0.30728 0.59569 0.46094 0.88672 0.46094 0.020788-7e-3 0.040643-0.0059 0.068359-0.0059 0.31875-0.027893 0.61081-0.23808 0.86719-0.61519 0.23559-0.3422 0.44307-0.81572 0.60938-1.4023 0.1663-0.57964 0.25618-1.1396 0.30469-1.5098l0.027344-0.22266 0.22266-0.10547c0.45733-0.21649 0.91466-0.68449 1.0879-0.87305 0.05543-0.055869 0.10384-0.11796 0.15234-0.17383 0.05543-0.062852 0.06873-0.15448 0.04102-0.23828-0.027721-0.083803-0.096541-0.13838-0.17969-0.15234-0.22866-0.034918-0.47767-0.050248-0.68555-0.029297-0.32567 0.034918-0.58282 0.13347-0.74219 0.28711l-0.22852 0.22266-0.26367-0.16602c-0.38804-0.24443-0.86596-0.37109-1.3926-0.37109zm5.834 2.0039c-0.38804 0-0.75371 0.12696-1.0586 0.35742l-0.1875 0.13867-0.21484-0.089844c-0.21481-0.090787-0.43628-0.13281-0.67188-0.13281-0.31182 0-0.60974 0.083813-0.87305 0.23047l-0.0625 0.035156c-0.062363 0.034918-0.10528 0.09032-0.11914 0.16016-0.055434 0.29331-0.12495 0.57837-0.20117 0.84375-0.19402 0.67741-0.43465 1.2294-0.71875 1.6484-0.4019 0.58662-0.89469 0.90898-1.4629 0.96484h-0.013672c-0.083151 7e-3 -0.15285 0.05516-0.1875 0.125-0.034646 0.06984-0.034646 0.15365 0 0.23047 0.13858 0.24443 0.34039 0.4616 0.58984 0.61523l0.20703 0.125-0.013672 0.24414v0.07813c0 0.53774 0.27049 1.0317 0.70703 1.332v2.5156c0 0.26538 0.2152 0.48047 0.47852 0.48047 0.26331 0 0.47656-0.21509 0.47656-0.48047v-1.9902c0.21481 0.31426 0.52054 0.54451 0.88086 0.65625v2.4512c0 0.26538 0.2152 0.48242 0.47852 0.48242 0.26331 0 0.47852-0.21704 0.47852-0.48242v-2.3965c0.11087-0.02793 0.22028-0.06161 0.32422-0.10352l0.20898-0.0918 0.1875 0.13281c0.29796 0.20951 0.64359 0.31445 1.0039 0.31445 0.30489 0 0.60192-0.076 0.86524-0.22266l0.20117-0.11328 0.20117 0.11328c0.24252 0.13967 0.52059 0.21567 0.80469 0.22266v1.0469c0 0.26538 0.2152 0.48242 0.47852 0.48242s0.47656-0.21704 0.47656-0.48242v-1.2988c0.13166-0.07682 0.25739-0.17342 0.36133-0.28516l0.11719-0.12695h0.17383c0.04158 0 0.08928 0.0011 0.13086-0.0059v2.8145c0 0.26538 0.2152 0.48242 0.47852 0.48242s0.47852-0.21704 0.47852-0.48242v-3.1914c0.38111-0.30728 0.62305-0.76949 0.62305-1.2793 0-0.28633-0.07607-0.57281-0.22852-0.82422l-0.125-0.20898 0.125-0.20898c0.14551-0.25141 0.22852-0.53789 0.22852-0.82422 0-0.3841-0.13141-0.74072-0.38086-1.041l-0.13867-0.16797 0.02148-0.06836c0.37418 0.29331 0.81658 0.58694 1.0938 0.44727 0.09701-0.04889 0.17982-0.14744 0.24219-0.28711 0.09008-0.23046 0.09027-0.43922-0.01367-0.63476-0.20787-0.38406-0.81001-0.61615-1.3574-0.75582-0.25638-0.60059-0.87223-1.0195-1.5859-1.0195-0.09008 0-0.18815 0.00752-0.28516 0.021484l-0.17969 0.027344-0.13867-0.11719c-0.31182-0.26538-0.71315-0.40625-1.1289-0.40625-0.24945 0-0.49204 0.049543-0.7207 0.1543l-0.16797 0.076172-0.16602-0.076172c-0.22866-0.09777-0.47125-0.1543-0.7207-0.1543z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m7.0781 5.9961c-.10394 0-.22223.00669-.32617.013672-.86615.083803-1.3858.39146-1.6699.62891l-.20703.17383-.26367-.13281c-.18016-.090787-.42205-.12476-.69922-.089844-.27024.027934-.51357.097304-.66602.16016-.083151.027934-.13849.097837-.15234.18164-.013858.083803.021621.16874.083984.22461.048505.041902.096027.075286.14453.11719.15244.11872.69427.50261 1.207.65625l.2832.083984.068359.20312c.11087.33521.29938.83868.54883 1.3555.27717.57266.57509 1.0111.87305 1.3184.29796.30728.59569.46094.88672.46094.020788-.007.040643-.0059.068359-.0059.31875-.027893.61081-.23808.86719-.61519.23559-.3422.44307-.81572.60938-1.4023.1663-.57964.25618-1.1396.30469-1.5098l.027344-.22266.22266-.10547c.45733-.21649.91466-.68449 1.0879-.87305.05543-.055869.10384-.11796.15234-.17383.05543-.062852.06873-.15448.04102-.23828-.027721-.083803-.096541-.13838-.17969-.15234-.22866-.034918-.47767-.050248-.68555-.029297-.32567.034918-.58282.13347-.74219.28711l-.22852.22266-.26367-.16602c-.38804-.24443-.86596-.37109-1.3926-.37109zm5.834 2.0039c-.38804 0-.75371.12696-1.0586.35742l-.1875.13867-.21484-.089844c-.21481-.090787-.43628-.13281-.67188-.13281-.31182 0-.60974.083813-.87305.23047l-.0625.035156c-.062363.034918-.10528.09032-.11914.16016-.055434.29331-.12495.57837-.20117.84375-.19402.67741-.43465 1.2294-.71875 1.6484-.4019.58662-.89469.90898-1.4629.96484h-.013672c-.083151.007-.15285.05516-.1875.125-.034646.06984-.034646.15365 0 .23047.13858.24443.34039.4616.58984.61523l.20703.125-.013672.24414v.07813c0 .53774.27049 1.0317.70703 1.332v2.5156c0 .26538.2152.48047.47852.48047.26331 0 .47656-.21509.47656-.48047v-1.9902c.21481.31426.52054.54451.88086.65625v2.4512c0 .26538.2152.48242.47852.48242.26331 0 .47852-.21704.47852-.48242v-2.3965c.11087-.02793.22028-.06161.32422-.10352l.20898-.0918.1875.13281c.29796.20951.64359.31445 1.0039.31445.30489 0 .60192-.076.86524-.22266l.20117-.11328.20117.11328c.24252.13967.52059.21567.80469.22266v1.0469c0 .26538.2152.48242.47852.48242s.47656-.21704.47656-.48242v-1.2988c.13166-.07682.25739-.17342.36133-.28516l.11719-.12695h.17383c.04158 0 .08928.0011.13086-.0059v2.8145c0 .26538.2152.48242.47852.48242s.47852-.21704.47852-.48242v-3.1914c.38111-.30728.62305-.76949.62305-1.2793 0-.28633-.07607-.57281-.22852-.82422l-.125-.20898.125-.20898c.14551-.25141.22852-.53789.22852-.82422 0-.3841-.13141-.74072-.38086-1.041l-.13867-.16797.02148-.06836c.37418.29331.81658.58694 1.0938.44727.09701-.04889.17982-.14744.24219-.28711.09008-.23046.09027-.43922-.01367-.63476-.20787-.38406-.81001-.61615-1.3574-.75582-.25638-.60059-.87223-1.0195-1.5859-1.0195-.09008 0-.18815.00752-.28516.021484l-.17969.027344-.13867-.11719c-.31182-.26538-.71315-.40625-1.1289-.40625-.24945 0-.49204.049543-.7207.1543l-.16797.076172-.16602-.076172c-.22866-.09777-.47125-.1543-.7207-.1543z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/pitch-m.svg b/data/styles/default/light/symbols/pitch-m.svg
index c169cc921..1c86d9fde 100644
--- a/data/styles/default/light/symbols/pitch-m.svg
+++ b/data/styles/default/light/symbols/pitch-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>pitch-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="pitch-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.595 3c-1.109 0-2.008 0.84822-2.008 1.8947 0 1.0465 0.89899 1.8947 2.008 1.8947 1.109 0 2.008-0.84822 2.008-1.8947 0-1.0465-0.89899-1.8947-2.008-1.8947zm-5.7729 3.7894 0.502 1.8948c0.25099 0.94735 0.85053 0.94735 1.6001 0.94735h1.6628c0.59612 0.94735 0.31592 2.4875 0.502 3.9352h-0.90987c-1.004 0-2.6041 0.94735-1.6001 2.8421l1.506 2.8422c1.004 1.8947 2.5099 0.47368 2.008-0.47368l-1.506-2.8422c-0.25099-0.47368 0.26536-0.47368 0.502-0.47368h2.4778s1.1885 2.3436 2.5884 4.0497c0.51677 0.62972 1.0892 1.4887 1.8057 1.4887 0.50198 0 1.3622-0.73205 0.44668-1.763-1.7145-1.9307-2.8006-3.9212-2.8006-4.8686 0-1.1019-0.20515-3.4225-0.50198-4.7368h1.506c0.48994 0.92658 1.3499 2.3684 1.3499 2.3684 0.55494 0.90706 1.4674 0.83852 1.4674 0 0-0.11492-0.01467-0.36235-0.14013-0.64122l-1.4222-3.1482c-0.09288-0.20548-0.25442-0.47368-1.004-0.47368h-7.7809l-0.75299-2.3685c-0.30119-0.94735-1.757-0.94735-1.757 0 0 0.47368 0.17786 1.0488 0.25099 1.421z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m11.595 3c-1.109 0-2.008.84822-2.008 1.8947 0 1.0465.89899 1.8947 2.008 1.8947 1.109 0 2.008-.84822 2.008-1.8947 0-1.0465-.89899-1.8947-2.008-1.8947zm-5.7729 3.7894.502 1.8948c.25099.94735.85053.94735 1.6001.94735h1.6628c.59612.94735.31592 2.4875.502 3.9352h-.90987c-1.004 0-2.6041.94735-1.6001 2.8421l1.506 2.8422c1.004 1.8947 2.5099.47368 2.008-.47368l-1.506-2.8422c-.25099-.47368.26536-.47368.502-.47368h2.4778s1.1885 2.3436 2.5884 4.0497c.51677.62972 1.0892 1.4887 1.8057 1.4887.50198 0 1.3622-.73205.44668-1.763-1.7145-1.9307-2.8006-3.9212-2.8006-4.8686 0-1.1019-.20515-3.4225-.50198-4.7368h1.506c.48994.92658 1.3499 2.3684 1.3499 2.3684.55494.90706 1.4674.83852 1.4674 0 0-.11492-.01467-.36235-.14013-.64122l-1.4222-3.1482c-.09288-.20548-.25442-.47368-1.004-.47368h-7.7809l-.75299-2.3685c-.30119-.94735-1.757-.94735-1.757 0 0 .47368.17786 1.0488.25099 1.421z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/plumber-m.svg b/data/styles/default/light/symbols/plumber-m.svg
index 2b839cb0b..7fe45831b 100644
--- a/data/styles/default/light/symbols/plumber-m.svg
+++ b/data/styles/default/light/symbols/plumber-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m9.0215 4.6055h0.17578c0.63524 0 1.1055 0.45379 1.1055 0.99414v6.3984c0 0.54035-0.47022 0.99414-1.1055 0.99414h-0.17578c-0.63524 0-1.1055-0.45379-1.1055-0.99414v-6.3984c0-0.54035 0.47022-0.99414 1.1055-0.99414zm3.0898 9.0918h6.1777c0.63524 0 1.1035 0.45379 1.1035 0.99414v0.39844c0 0.54035-0.46827 0.99414-1.1035 0.99414h-6.1777c-0.63524 0-1.1055-0.45379-1.1055-0.99414v-0.39844c0-0.54035 0.47022-0.99414 1.1055-0.99414zm-6.5117-8.0977v6.4004h1.5098v-6.4004zm5.5098 0v6.3984c0 4e-3 2.7e-5 0.0078 0 0.01172a1.0206 1.0206 0 0 1 0.87305 0.88672c0.04298-0.0028 0.08531-0.0059 0.12891-0.0059h6.1777c0.03767 0 0.07412 0.0038 0.11133 0.0059v-2.3066c0-2.7556-2.2327-4.9902-4.9883-4.9902zm0.89062 11.285v1.5156h6.4004v-1.5156c-0.03721 0.0021-0.07366 0.0059-0.11133 0.0059h-6.1777c-0.03767 0-0.07412-0.0038-0.11133-0.0059z" fill="#fff"/>
- </g>
-</svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m9.0215 4.6055h.17578c.63524 0 1.1055.45379 1.1055.99414v6.3984c0 .54035-.47022.99414-1.1055.99414h-.17578c-.63524 0-1.1055-.45379-1.1055-.99414v-6.3984c0-.54035.47022-.99414 1.1055-.99414zm3.0898 9.0918h6.1777c.63524 0 1.1035.45379 1.1035.99414v.39844c0 .54035-.46827.99414-1.1035.99414h-6.1777c-.63524 0-1.1055-.45379-1.1055-.99414v-.39844c0-.54035.47022-.99414 1.1055-.99414zm-6.5117-8.0977v6.4004h1.5098v-6.4004zm5.5098 0v6.3984c0 .004.000027.0078 0 .01172a1.0206 1.0206 0 0 1 .87305.88672c.04298-.0028.08531-.0059.12891-.0059h6.1777c.03767 0 .07412.0038.11133.0059v-2.3066c0-2.7556-2.2327-4.9902-4.9883-4.9902zm.89062 11.285v1.5156h6.4004v-1.5156c-.03721.0021-.07366.0059-.11133.0059h-6.1777c-.03767 0-.07412-.0038-.11133-.0059z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/public_bath-m.svg b/data/styles/default/light/symbols/public_bath-m.svg
index 2759ec788..683427160 100644
--- a/data/styles/default/light/symbols/public_bath-m.svg
+++ b/data/styles/default/light/symbols/public_bath-m.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
- <path d="m5.9316 17.09c-0.943 0-1.5048 0.5205-1.9746 0.85156-0.40228 0.28349-0.71292 0.43683-0.85742 0.47852a11 11 0 0 0 1.3828 1.5781c0.23481-0.14128 0.44324-0.29241 0.62695-0.42188 0.48213-0.33976 0.84217-0.48633 0.82227-0.48633-0.019918 0 0.3373 0.14324 0.79883 0.47656 0.46153 0.33332 1.0277 0.85742 1.9707 0.85742 0.943-1.3e-5 1.5045-0.51978 1.9727-0.84766 0.46817-0.32787 0.82081-0.48633 0.91211-0.48633 0.091299 1e-6 0.54727 0.18704 1.0938 0.52148 0.54648 0.33444 1.18 0.81299 2.1211 0.82812 0.94109 0.01509 1.5744-0.47679 2.0664-0.80078 0.49202-0.32399 0.84722-0.48242 0.94922-0.48242 0.10199 2e-6 0.55774 0.1859 1.1074 0.50977 0.18097 0.10663 0.37435 0.22728 0.58398 0.3418a11 11 0 0 0 1.3984-1.5977c-0.18907-0.060699-0.54714-0.21954-0.9668-0.4668-0.54644-0.32196-1.1865-0.7871-2.123-0.78711-0.9365 0-1.5621 0.49068-2.0508 0.8125-0.48873 0.32182-0.83618 0.47226-0.93359 0.4707-0.09733-0.0016-0.55973-0.19682-1.1094-0.5332-0.54964-0.33638-1.1895-0.81639-2.1367-0.81641-0.9472 0-1.5749 0.50889-2.0586 0.84766-0.48373 0.33877-0.84609 0.48633-0.82617 0.48633 0.019902 0-0.3373-0.1452-0.79883-0.47852-0.46152-0.33332-1.0277-0.85546-1.9707-0.85547z" fill="#fff"/>
- <path d="m12 3.2847c-1.2926 0-2.3379 1.0475-2.3379 2.3398 2.482e-4 1.2913 1.0456 2.3398 2.3379 2.3398 1.2911 0 2.3379-1.0485 2.3379-2.3398 0-1.2926-1.0468-2.3398-2.3379-2.3398zm-2.584 5.2793c-1.6559 0-3.0098 1.3424-3.0098 2.9961v4.5586c1.066 0.13059 1.6293 0.67608 2.0332 0.97852v-4.8242h0.52148s0.00267 3.0451 0.00391 4.8379c0.49189-0.34641 1.2552-1.0215 2.6211-1.0215 1.3751 1.7e-5 2.1089 0.62555 2.6602 0.96289 0.25145 0.15389 0.45709 0.24341 0.58594 0.30078 0.05212-0.02549 0.11758-0.06272 0.19922-0.10938v-4.9707h0.52734v4.627c0.4514-0.30797 1.0843-0.67658 2.0352-0.73047v-4.6094c0-1.6537-1.3553-2.9961-3.0098-2.9961z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0797b8" r="11"/><g fill="#fff"><path d="m5.9316 17.09c-.943 0-1.5048.5205-1.9746.85156-.40228.28349-.71292.43683-.85742.47852a11 11 0 0 0 1.3828 1.5781c.23481-.14128.44324-.29241.62695-.42188.48213-.33976.84217-.48633.82227-.48633-.019918 0 .3373.14324.79883.47656s1.0277.85742 1.9707.85742c.943-.000013 1.5045-.51978 1.9727-.84766.46817-.32787.82081-.48633.91211-.48633.091299.000001.54727.18704 1.0938.52148.54648.33444 1.18.81299 2.1211.82812.94109.01509 1.5744-.47679 2.0664-.80078.49202-.32399.84722-.48242.94922-.48242.10199.000002.55774.1859 1.1074.50977.18097.10663.37435.22728.58398.3418a11 11 0 0 0 1.3984-1.5977c-.18907-.060699-.54714-.21954-.9668-.4668-.54644-.32196-1.1865-.7871-2.123-.78711-.9365 0-1.5621.49068-2.0508.8125-.48873.32182-.83618.47226-.93359.4707-.09733-.0016-.55973-.19682-1.1094-.5332-.54964-.33638-1.1895-.81639-2.1367-.81641-.9472 0-1.5749.50889-2.0586.84766-.48373.33877-.84609.48633-.82617.48633.019902 0-.3373-.1452-.79883-.47852-.46152-.33332-1.0277-.85546-1.9707-.85547z"/><path d="m12 3.2847c-1.2926 0-2.3379 1.0475-2.3379 2.3398.0002482 1.2913 1.0456 2.3398 2.3379 2.3398 1.2911 0 2.3379-1.0485 2.3379-2.3398 0-1.2926-1.0468-2.3398-2.3379-2.3398zm-2.584 5.2793c-1.6559 0-3.0098 1.3424-3.0098 2.9961v4.5586c1.066.13059 1.6293.67608 2.0332.97852v-4.8242h.52148s.00267 3.0451.00391 4.8379c.49189-.34641 1.2552-1.0215 2.6211-1.0215 1.3751.000017 2.1089.62555 2.6602.96289.25145.15389.45709.24341.58594.30078.05212-.02549.11758-.06272.19922-.10938v-4.9707h.52734v4.627c.4514-.30797 1.0843-.67658 2.0352-.73047v-4.6094c0-1.6537-1.3553-2.9961-3.0098-2.9961z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/ranger-station-m.svg b/data/styles/default/light/symbols/ranger-station-m.svg
index 299b38716..19e99e5eb 100644
--- a/data/styles/default/light/symbols/ranger-station-m.svg
+++ b/data/styles/default/light/symbols/ranger-station-m.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m10.636 1.2727-2.1818 1.0909v4.1164l-5.4545 2.9745v6.5455h4.3636v-4.3636h3.2727v4.3636h4.3636v-6.5455l-5.4545-2.9745v-1.3892l1.0909-0.54545 2.1818 1.0909 2.1818-1.0909v-3.2727l-2.1818 1.0909z" fill="#747E86"/>
-</svg>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ranger-station-m</title>
+    <g id="ranger-station-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#747E86" cx="9" cy="9" r="8.25"></circle>
+        <polygon id="Path" fill="#FFFFFF" points="10.1090909 3.30003542 8.56363636 4.07276269 8.56363636 6.98857032 4.7 9.09552538 4.7 13.7319598 7.79090909 13.7319598 7.79090909 10.6410508 10.1090909 10.6410508 10.1090909 13.7319598 13.2 13.7319598 13.2 9.09552538 9.33636364 6.98857032 9.33636364 6.00454545 10.1090909 5.61818182 11.6545455 6.39090909 13.2 5.61818182 13.2 3.3 11.6545455 4.07272727"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/recycling-centre-m.svg b/data/styles/default/light/symbols/recycling-centre-m.svg
new file mode 100644
index 000000000..723196536
--- /dev/null
+++ b/data/styles/default/light/symbols/recycling-centre-m.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>recycling-centre-m</title>
+    <g id="recycling-centre-m" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="9" cy="9" r="9"></circle>
+        <circle id="Oval" fill="#747E86" cx="9" cy="9" r="8.25"></circle>
+        <path d="M6.1353,6.5751025 L6.8502975,5.3901025 L7.3653,4.5351025 C7.5603,4.210105 8.0303025,4.210105 8.225325,4.5351025 L8.9653275,5.7651025 L8.3503275,6.7950775 L7.850325,7.6050775 L6.1353,6.5751025 Z M14.11005,9.4851025 L13.310025,8.1551275 L11.58,9.1551025 L12.684975,11.0001025 L13.2499725,11.0001025 C13.629975,11.0001025 13.974975,10.7851 14.1449475,10.4451025 C14.2149472,10.3051 14.2499475,10.1551 14.2499475,10.000105 C14.2499475,9.820105 14.1999472,9.6451075 14.109945,9.4851025 L14.11005,9.4851025 Z M11.250075,13.5000775 L12.000075,13.5000775 C12.3800775,13.5000775 12.7250775,13.285075 12.89505,12.9450775 L13.6200525,11.5000525 L11.2500525,11.5000525 L11.2500525,10.5000775 L9.2500275,12.5001025 L11.2500525,14.5001275 L11.2500525,13.5001525 L11.250075,13.5000775 Z M8.250075,11.5000525 L6.10005,11.5000525 L5.68005,12.2050525 C5.53005,12.45505 5.5200525,12.765055 5.65005,13.0300525 C5.7900525,13.3150525 6.08505,13.500055 6.410025,13.500055 L8.25,13.500055 L8.25,11.50003 L8.250075,11.5000525 Z M6.31005,10.1750275 L7.175025,10.695025 L6.4900275,7.950025 L3.7500525,8.6350225 L4.6000275,9.1450225 L4.39503,9.4900225 C4.2200325,9.78502 4.2050325,10.14502 4.36002975,10.450025 L5.17505475,12.0799975 L6.31002975,10.1749975 L6.31005,10.1750275 Z M11.760075,5.5700275 L11.1100725,4.4850025 C10.92507,4.1850025 10.6000725,4 10.2500475,4 L8.4850725,4 L10.0450725,6.600025 L9.1850475,7.1150275 L11.9300475,7.800025 L12.615045,5.055025 L11.760045,5.5700275 L11.760075,5.5700275 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/sauna-m.svg b/data/styles/default/light/symbols/sauna-m.svg
new file mode 100644
index 000000000..9982d00f6
--- /dev/null
+++ b/data/styles/default/light/symbols/sauna-m.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>sauna-m</title>
+    <g id="sauna-m" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16.5980474,5.34246801 C16.7468507,5.43708529 16.7719933,5.65393124 16.6774834,5.80280272 L16.2747841,6.44622828 C15.4418772,7.79759698 14.8650886,8.8728762 14.518396,9.70308327 L14.4417487,9.89404056 C13.9674663,11.3122064 13.6214547,12.6672387 13.4037139,13.9591376 C12.9931409,15.8209689 12.0934828,16.5 10.3526752,16.5 L10.1879901,16.4948917 C9.04399189,16.4237233 8.09238221,15.616254 7.81508138,14.5330987 L7.78256249,14.3870442 L12.4802588,14.3870442 L12.9192453,12.5029487 C13.1641511,11.3203921 13.5393508,10.1424778 14.0572521,8.87121473 C14.3573782,8.1345122 15.0432541,6.98547029 16.109563,5.44151572 C16.2193202,5.28257002 16.4350611,5.23883232 16.5980474,5.34246801 Z M5.52052512,11.0946422 L5.89251109,15.3540235 L5.01400515,15.3540751 C4.53170194,15.3540751 4.12652667,14.9914259 4.07326519,14.5120726 L3.69311107,11.0946938 L5.52052512,11.0946422 Z M7.60194279,11.0946422 L7.60177542,13.912943 L7.1957144,13.9137796 L7.35650537,14.6359521 C7.4148855,14.8641548 7.49764583,15.0812718 7.60163715,15.2846499 L7.60194279,15.3540235 L6.5579211,15.3540235 L6.1849886,11.0946422 L7.60194279,11.0946422 Z M9.90674134,11.0946422 L9.65952986,13.912943 L8.30220701,13.912943 L8.30237438,11.0946422 L9.90674134,11.0946422 Z M12.2118737,11.0946938 L11.8980714,13.912943 L10.3249399,13.912943 L10.5712048,11.0946422 L12.2118737,11.0946938 Z M12.4497844,9.08805194 C12.5543351,9.08805194 12.6390902,9.17280705 12.6390902,9.27735777 L12.5214752,10.5724082 C12.512564,10.6698739 12.4308278,10.744478 12.3329557,10.744478 L3.57291984,10.744478 C3.47504765,10.744478 3.39331144,10.6698739 3.3844003,10.5724082 L3.26757155,9.29459385 C3.25805233,9.19047738 3.33473855,9.09835745 3.43885502,9.08883823 L12.4497844,9.08805194 Z M5.14759262,6.83620746 L5.31323523,8.72831929 L3.42997595,8.72837085 L3.33707583,7.88636833 C3.27934735,7.366812 3.65373279,6.89883019 4.17328912,6.84110171 L4.22547235,6.8367609 L5.14759262,6.83620746 Z M7.60194279,6.83620746 L7.60194279,8.72831929 L5.97769871,8.72831929 L5.81300264,6.83620746 L7.60194279,6.83620746 Z M10.2796738,6.83526093 L10.1140312,8.72831929 L8.30237438,8.72831929 L8.30237438,6.83526093 L10.2796738,6.83526093 Z M11.6280597,6.83531249 C12.1508133,6.83531249 12.5745889,7.25908804 12.5745889,7.78184167 L12.5731405,7.8341851 L12.4750088,8.72837085 L10.7784947,8.72831929 L10.9441373,6.83526093 L11.6280597,6.83531249 Z M6.69454404,1.80746008 C6.60290187,1.56267538 6.330174,1.43852882 6.0853893,1.53017098 C5.84060459,1.62181315 5.71645803,1.89454102 5.80810019,2.13932572 C5.92294379,2.44608361 5.96706035,2.7016911 5.94828971,2.90437832 C5.94335237,2.95769221 5.93639298,2.98485172 5.91058649,3.03015079 L5.84699221,3.13085102 C5.70484418,3.35222019 5.62953523,3.54741847 5.60223122,3.85013034 C5.56191484,4.29710675 5.63999563,4.70140842 5.84168281,5.04999312 C5.9725813,5.27623067 6.26209725,5.35351824 6.4883348,5.22261975 C6.68943483,5.10626554 6.77284601,4.86458394 6.69696491,4.65341954 L6.66096142,4.57596776 C6.56186855,4.40470125 6.52145614,4.19544613 6.54493341,3.93516019 C6.5548191,3.82556028 6.57021312,3.76886418 6.60935807,3.69858229 L6.67301707,3.59662085 C6.80227388,3.39646347 6.86800347,3.23766893 6.89078591,2.99166183 C6.92401615,2.63283825 6.85598891,2.23869429 6.69454404,1.80746008 Z M8.40199548,1.80746008 C8.31035332,1.56267538 8.03762545,1.43852882 7.79284074,1.53017098 C7.54805603,1.62181315 7.42390947,1.89454102 7.51555164,2.13932572 C7.63039524,2.44608361 7.67451179,2.7016911 7.65574116,2.90437832 C7.65080382,2.95769221 7.64384442,2.98485172 7.61803793,3.03015079 L7.55444366,3.13085102 C7.41229563,3.35222019 7.33698667,3.54741847 7.30968267,3.85013034 C7.26936629,4.29710675 7.34744708,4.70140842 7.54913425,5.04999312 C7.68003274,5.27623067 7.9695487,5.35351824 8.19578624,5.22261975 C8.39688628,5.10626554 8.48029745,4.86458394 8.40441636,4.65341954 L8.36841287,4.57596776 C8.26931999,4.40470125 8.22890758,4.19544613 8.25238485,3.93516019 C8.26227055,3.82556028 8.27766457,3.76886418 8.31680951,3.69858229 L8.38046851,3.59662085 C8.50972533,3.39646347 8.57545491,3.23766893 8.59823735,2.99166183 C8.6314676,2.63283825 8.56344036,2.23869429 8.40199548,1.80746008 Z M10.1094469,1.80746008 C10.0178048,1.56267538 9.74507689,1.43852882 9.50029219,1.53017098 C9.25550748,1.62181315 9.13136092,1.89454102 9.22300308,2.13932572 C9.33784668,2.44608361 9.38196324,2.7016911 9.3631926,2.90437832 C9.35825526,2.95769221 9.35129587,2.98485172 9.32548938,3.03015079 L9.2618951,3.13085102 C9.11974707,3.35222019 9.04443812,3.54741847 9.01713411,3.85013034 C8.97681773,4.29710675 9.05489852,4.70140842 9.2565857,5.04999312 C9.38748419,5.27623067 9.67700014,5.35351824 9.90323769,5.22261975 C10.1043377,5.10626554 10.1877489,4.86458394 10.1118678,4.65341954 L10.0758643,4.57596776 C9.97677144,4.40470125 9.93635903,4.19544613 9.9598363,3.93516019 C9.96972199,3.82556028 9.98511601,3.76886418 10.024261,3.69858229 L10.08792,3.59662085 C10.2171768,3.39646347 10.2829064,3.23766893 10.3056888,2.99166183 C10.338919,2.63283825 10.2708918,2.23869429 10.1094469,1.80746008 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/sawmill-m.svg b/data/styles/default/light/symbols/sawmill-m.svg
index 98de53138..3c50208cd 100644
--- a/data/styles/default/light/symbols/sawmill-m.svg
+++ b/data/styles/default/light/symbols/sawmill-m.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
-  <path d="m11.566 2.6328-2.5312 3.543-0.0058593 0.0078126a4 4 0 0 0-0.52148 0.73828l-2.1113-0.80273 1.4844 3.2637h8.7207l-0.7832-1.7207a4 4 0 0 0-0.39258-0.875l1.7441-1.4199-4.3008-0.41797a4 4 0 0 0-0.86914-0.095703 4 4 0 0 0-0.074219 0.0058594l-0.35938-2.2266zm-6.0664 7.918c-0.554 0-1 0.446-1 1v0.89844c0 0.554 0.446 1 1 1h0.56445v5.1445c0 0.554 0.41769 1 0.93555 1s0.93555-0.446 0.93555-1v-5.1445h8.1523v5.1445c0 0.554 0.4072 1 0.91211 1s0.91211-0.446 0.91211-1v-5.1445h0.58789c0.554 0 1-0.446 1-1v-0.89844c0-0.554-0.446-1-1-1h-13z" fill="#fff"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m11.566 2.6328-2.5312 3.543-.0058593.0078126a4 4 0 0 0 -.52148.73828l-2.1113-.80273 1.4844 3.2637h8.7207l-.7832-1.7207a4 4 0 0 0 -.39258-.875l1.7441-1.4199-4.3008-.41797a4 4 0 0 0 -.86914-.095703 4 4 0 0 0 -.074219.0058594l-.35938-2.2266zm-6.0664 7.918c-.554 0-1 .446-1 1v.89844c0 .554.446 1 1 1h.56445v5.1445c0 .554.41769 1 .93555 1s.93555-.446.93555-1v-5.1445h8.1523v5.1445c0 .554.4072 1 .91211 1s.91211-.446.91211-1v-5.1445h.58789c.554 0 1-.446 1-1v-.89844c0-.554-.446-1-1-1h-13z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/shop-industry-m.svg b/data/styles/default/light/symbols/shop-industry-m.svg
new file mode 100644
index 000000000..54c91aea8
--- /dev/null
+++ b/data/styles/default/light/symbols/shop-industry-m.svg
@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <title>shop-industry-m</title>
+ <g fill="none" fill-rule="evenodd">
+  <g id="shop-m" fill-rule="nonzero">
+   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#AA96BC"/>
+   <path id="Shape" d="m16.667 8.3333h-1.3333c0-1.84-1.4933-3.3333-3.3333-3.3333s-3.3333 1.4933-3.3333 3.3333h-1.3333c-0.73333 0-1.3267 0.6-1.3267 1.3333l-0.0066667 8c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-8c0-0.73333-0.6-1.3333-1.3333-1.3333zm-4.6667-2c1.1067 0 2 0.89333 2 2h-4c0-1.1067 0.89333-2 2-2zm0 6.6667c-1.84 0-3.3333-1.4933-3.3333-3.3333h1.3333c0 1.1067 0.89333 2 2 2s2-0.89333 2-2h1.3333c0 1.84-1.4933 3.3333-3.3333 3.3333z" fill="#fff"/>
+  </g>
+ </g>
+</svg>
diff --git a/data/styles/default/light/symbols/shower-m.svg b/data/styles/default/light/symbols/shower-m.svg
index 586522998..0bc0ab09b 100644
--- a/data/styles/default/light/symbols/shower-m.svg
+++ b/data/styles/default/light/symbols/shower-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>shower-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="shower-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.6 5v1.4656c-1.7775 0.29846-3.1899 1.6981-3.5 3.4344h8.4c-0.31006-1.7363-1.7225-3.1359-3.5-3.4344v-1.4656h-1.4zm-4.2 5.6v1.4h9.8v-1.4h-9.8zm2.1 2.8c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-7 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7c0.3866 0 0.7-0.3134 0.7-0.7s-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm-9.8 2.1c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7zm2.8 0c-0.3866 0-0.7 0.3134-0.7 0.7s0.3134 0.7 0.7 0.7 0.7-0.3134 0.7-0.7-0.3134-0.7-0.7-0.7z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m7.125 10.05c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm-5.25 1.575c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm-7.35 1.575c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525zm2.1 0c-.28995 0-.525.23505-.525.525s.23505.525.525.525.525-.23505.525-.525-.23505-.525-.525-.525z" fill="#0797b8"/><path d="m8.7 3.75v1.0992c-1.333125.223845-2.392425 1.273575-2.625 2.5758h6.3c-.232545-1.302225-1.291875-2.351925-2.625-2.5758v-1.0992zm-3.15 4.2v1.05h7.35v-1.05z" fill="#747e86"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/skateboard-centre-m.svg b/data/styles/default/light/symbols/skateboard-centre-m.svg
new file mode 100644
index 000000000..84918aebe
--- /dev/null
+++ b/data/styles/default/light/symbols/skateboard-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9.9925 4.35325c0-.53804375.5955875-.97825 1.3235-.97825s1.3235.44021875 1.3235.97825-.5955875.97825-1.3235.97825-1.3235-.44021875-1.3235-.97825zm-3.805125 9.538125c-.271325 0-.496325.1663063-.496325.36685 0 .2005438.225.36685.496325.36685s.496325-.1663062.496325-.36685c0-.2005437-.225-.36685-.496325-.36685zm5.625 0c-.271325 0-.496325.1663063-.496325.36685 0 .2005438.225.36685.496325.36685s.496325-.1663062.496325-.36685c0-.2005437-.225-.36685-.496325-.36685zm2.3095625-1.7119375c-.158825 0-.2977938.0538063-.3904438.1467375-.3639687.3570625-.9396875.5869563-1.58825.5869563h-.1654437v-2.93481255l-2.8588125-1.306 1.1911875-1.4135625c.761.9 2.117625 1.49675 3.6529375 1.49675v-.97825c-1.22425 0-2.2765-.547825-2.7330625-1.3304375l-.3441188-.59185c-.1257375-.210325-.4897062-.52336875-1.09193745-.52336875h-3.7720625l-1.6544375 1.9565 1.125.51848125 1.257375-1.49675h1.555125l-1.58825 1.87825c-.20515.2445625-.2580875.5429375-.13896875.816875l.88675 2.02987505-2.0646875 1.839125c-.4632375-.0782625-.8603125-.2788063-1.131625-.547825-.09265-.0929375-.2382375-.1467375-.39705625-.1467375-.291175 0-.496325.1760875-.496325.36685 0 .0733687.03308812.1516312.0992625.2201062.54265.5380438 1.4095625.8804375 2.382375.8804375h6.28687495c.9728125 0 1.8396875-.3423937 2.382375-.8804375.066175-.068475.0992625-.1467375.0992625-.2201062 0-.1907625-.2117625-.36685-.5029437-.36685zm-3.467625.7336875h-3.5735l1.919125-1.7119375-.66175-1.614125 2.3161875 1.0760625z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/skateboard-m.svg b/data/styles/default/light/symbols/skateboard-m.svg
index 9f150c7ec..a8aab0d1a 100644
--- a/data/styles/default/light/symbols/skateboard-m.svg
+++ b/data/styles/default/light/symbols/skateboard-m.svg
@@ -1,3 +1 @@
-<svg enable-background="new 0 0 24 24" fill="#000000" version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m13.588 4.5652c0-0.86087 0.95294-1.5652 2.1176-1.5652s2.1176 0.70435 2.1176 1.5652-0.95294 1.5652-2.1176 1.5652-2.1176-0.70435-2.1176-1.5652zm-6.0882 15.261c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm9 0c-0.43412 0-0.79412 0.26609-0.79412 0.58696 0 0.32087 0.36 0.58696 0.79412 0.58696s0.79412-0.26609 0.79412-0.58696c0-0.32087-0.36-0.58696-0.79412-0.58696zm3.6953-2.7391c-0.25412 0-0.47647 0.08609-0.62471 0.23478-0.58235 0.5713-1.5035 0.93913-2.5412 0.93913h-0.26471v-4.6957l-4.5741-2.0896 1.9059-2.2617c1.2176 1.44 3.3882 2.3948 5.8447 2.3948v-1.5652c-1.9588 0-3.6424-0.87652-4.3729-2.1287l-0.55059-0.94696c-0.20118-0.33652-0.78353-0.83739-1.7471-0.83739h-6.0353l-2.6471 3.1304 1.8 0.82957 2.0118-2.3948h2.4882l-2.5412 3.0052c-0.32824 0.3913-0.41294 0.8687-0.22235 1.307l1.4188 3.2478-3.3035 2.9426c-0.74118-0.12522-1.3765-0.44609-1.8106-0.87652-0.14824-0.1487-0.38118-0.23478-0.63529-0.23478-0.46588 0-0.79412 0.28174-0.79412 0.58696 0 0.11739 0.052941 0.24261 0.15882 0.35217 0.86824 0.86087 2.2553 1.4087 3.8118 1.4087h10.059c1.5565 0 2.9435-0.54783 3.8118-1.4087 0.10588-0.10956 0.15882-0.23478 0.15882-0.35217 0-0.30522-0.33882-0.58696-0.80471-0.58696zm-5.5482 1.1739h-5.7176l3.0706-2.7391-1.0588-2.5826 3.7059 1.7217z" fill="#747E86" stroke-width=".9103"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m10.191 3.4239c0-.6456525.714705-1.1739 1.5882-1.1739s1.5882.5282625 1.5882 1.1739-.714705 1.1739-1.5882 1.1739-1.5882-.5282625-1.5882-1.1739zm-4.56615 11.44575c-.32559 0-.59559.1995675-.59559.44022s.27.44022.59559.44022.59559-.1995675.59559-.44022-.27-.44022-.59559-.44022zm6.75 0c-.32559 0-.59559.1995675-.59559.44022s.27.44022.59559.44022.59559-.1995675.59559-.44022-.27-.44022-.59559-.44022zm2.771475-2.054325c-.19059 0-.3573525.0645675-.4685325.176085-.4367625.428475-1.127625.7043475-1.9059.7043475h-.1985325v-3.521775l-3.430575-1.5672 1.429425-1.696275c.9132 1.08 2.54115 1.7961 4.383525 1.7961v-1.1739c-1.4691 0-2.7318-.65739-3.279675-1.596525l-.4129425-.71022c-.150885-.25239-.5876475-.6280425-1.310325-.6280425h-4.526475l-1.985325 2.3478 1.35.6221775 1.50885-1.7961h1.86615l-1.9059 2.2539c-.24618.293475-.309705.651525-.1667625.98025l1.0641 2.43585-2.477625 2.20695c-.555885-.093915-1.032375-.3345675-1.35795-.65739-.11118-.111525-.285885-.176085-.4764675-.176085-.34941 0-.59559.211305-.59559.44022 0 .0880425.03970575.1819575.119115.2641275.65118.6456525 1.691475 1.056525 2.85885 1.056525h7.54425c1.167375 0 2.207625-.4108725 2.85885-1.056525.07941-.08217.119115-.176085.119115-.2641275 0-.228915-.254115-.44022-.6035325-.44022zm-4.16115.880425h-4.2882l2.30295-2.054325-.7941-1.93695 2.779425 1.291275z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/skiing-centre-m.svg b/data/styles/default/light/symbols/skiing-centre-m.svg
new file mode 100644
index 000000000..2fb4d967c
--- /dev/null
+++ b/data/styles/default/light/symbols/skiing-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m12.25625 4.359375c0 .61875-.50625 1.125-1.125 1.125s-1.125-.50625-1.125-1.125.50625-1.125 1.125-1.125 1.125.50625 1.125 1.125zm-1.53 9.225.4275.151875c.34875.118125.714375.185625 1.1025.185625.4725 0 .928125-.10125 1.33875-.28125l.63.635625c-.590625.309375-1.26.489375-1.96875.489375-.48375 0-.945-.07875-1.378125-.230625l-7.903125-2.88.28125-.793125 3.88125 1.411875.9675-2.4975-2.008125-2.098125c-.500625-.52875-.376875-1.389375.253125-1.755l1.9575-1.130625c.61875-.36 1.4175-.05625 1.636875.624375l.185625.6075c.2475.79875.8325 1.445625 1.591875 1.76625l.2925-.9.804375.25875-.63 1.940625c-1.378125-.225-2.52-1.164375-3.02625-2.43l-1.423125.815625 1.704375 1.94625-1.24875 3.24 1.738125.63 1.18125-3.6225c.25875.10125.52875.174375.81.230625z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/skiing-m.svg b/data/styles/default/light/symbols/skiing-m.svg
index 5bfa1f591..a33af2e4b 100644
--- a/data/styles/default/light/symbols/skiing-m.svg
+++ b/data/styles/default/light/symbols/skiing-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>skiing-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="skiing-m" fill-rule="nonzero">
-   <path id="Shape" d="m17.85 4.575c0 0.99-0.81 1.8-1.8 1.8s-1.8-0.81-1.8-1.8c0-0.99 0.81-1.8 1.8-1.8s1.8 0.81 1.8 1.8zm-2.448 14.76 0.684 0.243c0.558 0.189 1.143 0.297 1.764 0.297 0.756 0 1.485-0.162 2.142-0.45l1.008 1.017c-0.945 0.495-2.016 0.783-3.15 0.783-0.774 0-1.512-0.126-2.205-0.369l-12.645-4.608 0.45-1.269 6.21 2.259 1.548-3.996-3.213-3.357c-0.801-0.846-0.603-2.223 0.405-2.808l3.132-1.809c0.99-0.576 2.268-0.09 2.619 0.999l0.297 0.972c0.396 1.278 1.332 2.313 2.547 2.826l0.468-1.44 1.287 0.414-1.008 3.105c-2.205-0.36-4.032-1.863-4.842-3.888l-2.277 1.305 2.727 3.114-1.998 5.184 2.781 1.008 1.89-5.796c0.414 0.162 0.846 0.279 1.296 0.369z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.3875 3.43125c0 .7425-.6075 1.35-1.35 1.35s-1.35-.6075-1.35-1.35.6075-1.35 1.35-1.35 1.35.6075 1.35 1.35zm-1.836 11.07.513.18225c.4185.14175.85725.22275 1.323.22275.567 0 1.11375-.1215 1.6065-.3375l.756.76275c-.70875.37125-1.512.58725-2.3625.58725-.5805 0-1.134-.0945-1.65375-.27675l-9.48375-3.456.3375-.95175 4.6575 1.69425 1.161-2.997-2.40975-2.51775c-.60075-.6345-.45225-1.66725.30375-2.106l2.349-1.35675c.7425-.432 1.701-.0675 1.96425.74925l.22275.729c.297.9585.999 1.73475 1.91025 2.1195l.351-1.08.96525.3105-.756 2.32875c-1.65375-.27-3.024-1.39725-3.6315-2.916l-1.70775.97875 2.04525 2.3355-1.4985 3.888 2.08575.756 1.4175-4.347c.3105.1215.6345.20925.972.27675z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/slots-m.svg b/data/styles/default/light/symbols/slots-m.svg
index 65c8896f0..1e110c4d5 100644
--- a/data/styles/default/light/symbols/slots-m.svg
+++ b/data/styles/default/light/symbols/slots-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
- <path d="m2.977 8.1665q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198zm6.515 0q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198zm6.515 0q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m2.977 8.1665q.308 0 .429.198.099.143.121.495.429-.726 1.397-.726.616 0 1.188.286l.506.253q.176.088.297.088.143 0 .242-.143l.165-.242q.154-.22.473-.22.363 0 .605.308.253.308.253.781 0 .792-.605 1.54-.176.209-.561.638-.792.869-1.078 1.386-.275.506-.275 1.078 0 .187.055.572.055.374.055.561 0 .385-.253.616t-.682.231q-.594 0-.935-.451-.341-.462-.341-1.265 0-1.287.858-2.167.418-.429 1.012-.913.715-.583 1.056-.968-.462.209-.814.209-.473 0-1.155-.385l-.506-.286q-.187-.099-.341-.099-.33 0-.33.363 0 .011.022.099l.099.374q.055.209.055.385 0 .88-.858.88-.814 0-.814-.77 0-.231.033-.451.088-.583.088-.682 0-.143-.055-.429-.055-.297-.055-.44 0-.308.176-.506.187-.198.473-.198zm6.515 0q.308 0 .429.198.099.143.121.495.429-.726 1.397-.726.616 0 1.188.286l.506.253q.176.088.297.088.143 0 .242-.143l.165-.242q.154-.22.473-.22.363 0 .605.308.253.308.253.781 0 .792-.605 1.54-.176.209-.561.638-.792.869-1.078 1.386-.275.506-.275 1.078 0 .187.055.572.055.374.055.561 0 .385-.253.616t-.682.231q-.594 0-.935-.451-.341-.462-.341-1.265 0-1.287.858-2.167.418-.429 1.012-.913.715-.583 1.056-.968-.462.209-.814.209-.473 0-1.155-.385l-.506-.286q-.187-.099-.341-.099-.33 0-.33.363 0 .011.022.099l.099.374q.055.209.055.385 0 .88-.858.88-.814 0-.814-.77 0-.231.033-.451.088-.583.088-.682 0-.143-.055-.429-.055-.297-.055-.44 0-.308.176-.506.187-.198.473-.198zm6.515 0q.308 0 .429.198.099.143.121.495.429-.726 1.397-.726.616 0 1.188.286l.506.253q.176.088.297.088.143 0 .242-.143l.165-.242q.154-.22.473-.22.363 0 .605.308.253.308.253.781 0 .792-.605 1.54-.176.209-.561.638-.792.869-1.078 1.386-.275.506-.275 1.078 0 .187.055.572.055.374.055.561 0 .385-.253.616t-.682.231q-.594 0-.935-.451-.341-.462-.341-1.265 0-1.287.858-2.167.418-.429 1.012-.913.715-.583 1.056-.968-.462.209-.814.209-.473 0-1.155-.385l-.506-.286q-.187-.099-.341-.099-.33 0-.33.363 0 .011.022.099l.099.374q.055.209.055.385 0 .88-.858.88-.814 0-.814-.77 0-.231.033-.451.088-.583.088-.682 0-.143-.055-.429-.055-.297-.055-.44 0-.308.176-.506.187-.198.473-.198z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/soccer-centre-m.svg b/data/styles/default/light/symbols/soccer-centre-m.svg
new file mode 100644
index 000000000..084a7e149
--- /dev/null
+++ b/data/styles/default/light/symbols/soccer-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9 3.375c-3.105 0-5.625 2.52-5.625 5.625s2.52 5.625 5.625 5.625 5.625-2.52 5.625-5.625-2.52-5.625-5.625-5.625zm.5625 1.85625.759375-.534375c1.02375.315 1.895625.99 2.46375 1.87875l-.219375.75375-.759375.25875-2.244375-1.569375zm-1.884375-.534375.759375.534375v.7875l-2.244375 1.569375-.759375-.25875-.219375-.75375c.568125-.883125 1.44-1.558125 2.46375-1.87875zm-1.445625 7.1775-.64125.05625c-.680625-.7875-1.09125-1.81125-1.09125-2.930625 0-.0675.005625-.129375.01125-.196875l.5625-.410625.77625.27.82125 2.44125zm4.17375 1.395c-.444375.14625-.916875.230625-1.40625.230625s-.961875-.084375-1.40625-.230625l-.388125-.838125.36-.61875h2.874375l.36.624375zm-.129375-2.581875h-2.55375l-.759375-2.26125 2.03625-1.42875 2.041875 1.42875zm2.131875 1.243125-.64125-.05625-.444375-.770625.82125-2.44125.781875-.264375.5625.410625c.005625.061875.01125.12375.01125.19125 0 1.119375-.410625 2.143125-1.09125 2.930625z" fill="#fff" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/soccer-m.svg b/data/styles/default/light/symbols/soccer-m.svg
index 07c83065e..9c14bcbf4 100644
--- a/data/styles/default/light/symbols/soccer-m.svg
+++ b/data/styles/default/light/symbols/soccer-m.svg
@@ -1,6 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>soccer-m</title>
- <g fill="none" fill-rule="evenodd">
-  <path id="Shape" d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 2.97 1.215-0.855c1.638 0.504 3.033 1.584 3.942 3.006l-0.351 1.206-1.215 0.414-3.591-2.511zm-3.015-0.855 1.215 0.855v1.26l-3.591 2.511-1.215-0.414-0.351-1.206c0.909-1.413 2.304-2.493 3.942-3.006zm-2.313 11.484-1.026 0.09c-1.089-1.26-1.746-2.898-1.746-4.689 0-0.108 9e-3 -0.207 0.018-0.315l0.9-0.657 1.242 0.432 1.314 3.906zm6.678 2.232c-0.711 0.234-1.467 0.369-2.25 0.369s-1.539-0.135-2.25-0.369l-0.621-1.341 0.576-0.99h4.599l0.576 0.999zm-0.207-4.131h-4.086l-1.215-3.618 3.258-2.286 3.267 2.286zm3.411 1.989-1.026-0.09-0.711-1.233 1.314-3.906 1.251-0.423 0.9 0.657c9e-3 0.099 0.018 0.198 0.018 0.306 0 1.791-0.657 3.429-1.746 4.689z" fill="#747E86"/>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c-3.726 0-6.75 3.024-6.75 6.75s3.024 6.75 6.75 6.75 6.75-3.024 6.75-6.75-3.024-6.75-6.75-6.75zm.675 2.2275.91125-.64125c1.2285.378 2.27475 1.188 2.9565 2.2545l-.26325.9045-.91125.3105-2.69325-1.88325zm-2.26125-.64125.91125.64125v.945l-2.69325 1.88325-.91125-.3105-.26325-.9045c.68175-1.05975 1.728-1.86975 2.9565-2.2545zm-1.73475 8.613-.7695.0675c-.81675-.945-1.3095-2.1735-1.3095-3.51675 0-.081.00675-.15525.0135-.23625l.675-.49275.9315.324.9855 2.9295zm5.0085 1.674c-.53325.1755-1.10025.27675-1.6875.27675s-1.15425-.10125-1.6875-.27675l-.46575-1.00575.432-.7425h3.44925l.432.74925zm-.15525-3.09825h-3.0645l-.91125-2.7135 2.4435-1.7145 2.45025 1.7145zm2.55825 1.49175-.7695-.0675-.53325-.92475.9855-2.9295.93825-.31725.675.49275c.00675.07425.0135.1485.0135.2295 0 1.34325-.49275 2.57175-1.3095 3.51675z" fill="#747E86" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/sports_centre-m.svg b/data/styles/default/light/symbols/sports_centre-m.svg
index fa0847702..1bb3af65b 100644
--- a/data/styles/default/light/symbols/sports_centre-m.svg
+++ b/data/styles/default/light/symbols/sports_centre-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-  <title>sports_centre-m</title>
-  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#747E86"/>
-  <g fill="none" fill-rule="evenodd">
-    <g id="pitch-m" fill-rule="nonzero">
-      <path id="Shape" d="m 11.672709,4.7280561 c -0.896063,0 -1.622449,0.6853555 -1.622449,1.5309036 0,0.8455642 0.726377,1.5309036 1.622449,1.5309036 0.896064,0 1.622449,-0.6853555 1.622449,-1.5309036 0,-0.8455643 -0.726377,-1.5309036 -1.622449,-1.5309036 z M 7.0082488,7.7898633 7.4138611,9.3208476 C 7.6166592,10.086299 8.101083,10.086299 8.7067301,10.086299 H 10.05026 c 0.481661,0.765452 0.255261,2.009882 0.405612,3.179613 H 9.7207042 c -0.8112246,0 -2.1040935,0.765452 -1.2928689,2.296396 l 1.2168368,2.296476 c 0.8112249,1.530904 2.0279809,0.38273 1.6224489,-0.38273 l -1.216837,-2.296476 c -0.2027977,-0.38273 0.214409,-0.38273 0.405613,-0.38273 h 2.002044 c 0,0 0.960299,1.893611 2.091408,3.272127 0.417546,0.50881 0.880065,1.202859 1.458992,1.202859 0.405596,0 1.100648,-0.591491 0.360914,-1.424491 -1.385303,-1.559991 -2.262864,-3.168301 -2.262864,-3.933793 0,-0.890327 -0.16576,-2.765354 -0.405596,-3.827299 h 1.216837 c 0.395868,0.74867 1.090709,1.91365 1.090709,1.91365 0.448387,0.732897 1.185648,0.677518 1.185648,0 0,-0.09286 -0.01185,-0.292776 -0.113224,-0.518101 L 15.931638,8.9380773 C 15.856592,8.772051 15.726069,8.5553474 15.120414,8.5553474 H 8.8335041 L 8.2250938,6.6416169 c -0.2433593,-0.7654518 -1.419643,-0.7654518 -1.419643,0 0,0.3827299 0.1437095,0.8474226 0.202798,1.1481575 z" fill="#fff"/>
-    </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#51ab8c" r="11"/><path d="m11.672709 4.7280561c-.896063 0-1.622449.6853555-1.622449 1.5309036 0 .8455642.726377 1.5309036 1.622449 1.5309036.896064 0 1.622449-.6853555 1.622449-1.5309036 0-.8455643-.726377-1.5309036-1.622449-1.5309036zm-4.6644602 3.0618072.4056123 1.5309843c.2027981.7654514.6872219.7654514 1.292869.7654514h1.3435299c.481661.765452.255261 2.009882.405612 3.179613h-.7351678c-.8112246 0-2.1040935.765452-1.2928689 2.296396l1.2168368 2.296476c.8112249 1.530904 2.0279809.38273 1.6224489-.38273l-1.216837-2.296476c-.2027977-.38273.214409-.38273.405613-.38273h2.002044s.960299 1.893611 2.091408 3.272127c.417546.50881.880065 1.202859 1.458992 1.202859.405596 0 1.100648-.591491.360914-1.424491-1.385303-1.559991-2.262864-3.168301-2.262864-3.933793 0-.890327-.16576-2.765354-.405596-3.827299h1.216837c.395868.74867 1.090709 1.91365 1.090709 1.91365.448387.732897 1.185648.677518 1.185648 0 0-.09286-.01185-.292776-.113224-.518101l-1.149127-2.5437227c-.075046-.1660263-.205569-.3827299-.811224-.3827299h-6.2869099l-.6084103-1.9137305c-.2433593-.7654518-1.419643-.7654518-1.419643 0 0 .3827299.1437095.8474226.202798 1.1481575z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/stadium-m.svg b/data/styles/default/light/symbols/stadium-m.svg
index 6f0732423..3583fb4a7 100644
--- a/data/styles/default/light/symbols/stadium-m.svg
+++ b/data/styles/default/light/symbols/stadium-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
- <path d="m7.1 6h1.4l2.1 1.4-2.1 1.4v0.93412c1.0296-0.1489 2.225-0.23412 3.5-0.23412s2.4704 0.085218 3.5 0.23412v-3.7341h1.4l2.1 1.4-2.1 1.4v1.2002c1.296 0.31761 2.1 0.76021 2.1 1.2498 0 0.96649-3.134 1.75-7 1.75-3.866 0-7-0.78351-7-1.75 0-0.48954 0.80405-0.93214 2.1-1.2498v-4.0002zm4.9 4.55c-2.3196 0-3.5 0.1201-3.5 0.69999 0 0.57988 1.1804 0.7 3.5 0.7 2.3196 0 3.5-0.12012 3.5-0.7 0-0.57989-1.1804-0.69999-3.5-0.69999zm0 3.675c2.6658 0 5.0415-0.46564 6.5804-1.1919l-0.98035 5.5669h-3.5v-1.4c0-0.77322-0.62678-1.4-1.4-1.4h-1.4c-0.77321 0-1.4 0.62678-1.4 1.4v1.4h-3.5l-0.98035-5.5669c1.5388 0.72625 3.9146 1.1919 6.5804 1.1919z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#51ab8c" r="11"/><path d="m7.1 6h1.4l2.1 1.4-2.1 1.4v.93412c1.0296-.1489 2.225-.23412 3.5-.23412s2.4704.085218 3.5.23412v-3.7341h1.4l2.1 1.4-2.1 1.4v1.2002c1.296.31761 2.1.76021 2.1 1.2498 0 .96649-3.134 1.75-7 1.75s-7-.78351-7-1.75c0-.48954.80405-.93214 2.1-1.2498v-4.0002zm4.9 4.55c-2.3196 0-3.5.1201-3.5.69999 0 .57988 1.1804.7 3.5.7s3.5-.12012 3.5-.7c0-.57989-1.1804-.69999-3.5-.69999zm0 3.675c2.6658 0 5.0415-.46564 6.5804-1.1919l-.98035 5.5669h-3.5v-1.4c0-.77322-.62678-1.4-1.4-1.4h-1.4c-.77321 0-1.4.62678-1.4 1.4v1.4h-3.5l-.98035-5.5669c1.5388.72625 3.9146 1.1919 6.5804 1.1919z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/stadium-s.svg b/data/styles/default/light/symbols/stadium-s.svg
index ce8304e7a..ae70937f2 100644
--- a/data/styles/default/light/symbols/stadium-s.svg
+++ b/data/styles/default/light/symbols/stadium-s.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <circle cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
- <circle cx="8" cy="8" r="7.3333" fill="#9C6136"/>
- <path d="m4.7333 4h0.93333l1.4 0.93333-1.4 0.93333v0.62275c0.68641-0.099269 1.4833-0.15608 2.3333-0.15608s1.6469 0.056812 2.3333 0.15608v-2.4894h0.93333l1.4 0.93333-1.4 0.93333v0.80017c0.86399 0.21174 1.4 0.5068 1.4 0.83317 0 0.64433-2.0894 1.1667-4.6667 1.1667-2.5773 0-4.6667-0.52234-4.6667-1.1667 0-0.32636 0.53603-0.62143 1.4-0.83317v-2.6668zm3.2667 3.0333c-1.5464 0-2.3333 0.080066-2.3333 0.46666 0 0.38659 0.78694 0.46667 2.3333 0.46667 1.5464 0 2.3333-0.08008 2.3333-0.46667 0-0.3866-0.78694-0.46666-2.3333-0.46666zm0 2.45c1.7772 0 3.361-0.31043 4.3869-0.79459l-0.65357 3.7113h-2.3333v-0.93333c0-0.51548-0.41785-0.93333-0.93333-0.93333h-0.93333c-0.51547 0-0.93333 0.41785-0.93333 0.93333v0.93333h-2.3333l-0.65357-3.7113c1.0259 0.48417 2.6097 0.79459 4.3869 0.79459z" fill="#fff"/>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#fff" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#51ab8c" r="7.3333"/><path d="m4.7333 4h.93333l1.4.93333-1.4.93333v.62275c.68641-.099269 1.4833-.15608 2.3333-.15608s1.6469.056812 2.3333.15608v-2.4894h.93333l1.4.93333-1.4.93333v.80017c.86399.21174 1.4.5068 1.4.83317 0 .64433-2.0894 1.1667-4.6667 1.1667s-4.6667-.52234-4.6667-1.1667c0-.32636.53603-.62143 1.4-.83317v-2.6668zm3.2667 3.0333c-1.5464 0-2.3333.080066-2.3333.46666 0 .38659.78694.46667 2.3333.46667 1.5464 0 2.3333-.08008 2.3333-.46667 0-.3866-.78694-.46666-2.3333-.46666zm0 2.45c1.7772 0 3.361-.31043 4.3869-.79459l-.65357 3.7113h-2.3333v-.93333c0-.51548-.41785-.93333-.93333-.93333h-.93333c-.51547 0-.93333.41785-.93333.93333v.93333h-2.3333l-.65357-3.7113c1.0259.48417 2.6097.79459 4.3869.79459z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/stripclub-m.svg b/data/styles/default/light/symbols/stripclub-m.svg
index cd8ee49c0..854ffa4ca 100644
--- a/data/styles/default/light/symbols/stripclub-m.svg
+++ b/data/styles/default/light/symbols/stripclub-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#EC955E"/>
- <path d="m2.0024 15.579 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m2.0024 15.579 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/studio-m.svg b/data/styles/default/light/symbols/studio-m.svg
index ab3af567e..432d1bd25 100644
--- a/data/styles/default/light/symbols/studio-m.svg
+++ b/data/styles/default/light/symbols/studio-m.svg
@@ -1,8 +1 @@
-<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="12" cy="12" fill="#fff" id="Oval" opacity=".6" r="12" />
-  <circle cx="12" cy="12" fill="#BE75A3" r="11" />
-  <path d="m9 17 8-5-8-5z" fill="#fff" />
-  <title>studio-m</title>
-</svg>
-
-
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m9 17 8-5-8-5z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/swimming-centre-m.svg b/data/styles/default/light/symbols/swimming-centre-m.svg
new file mode 100644
index 000000000..3fcd7bb95
--- /dev/null
+++ b/data/styles/default/light/symbols/swimming-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#0797b8" r="8.25"/><path d="m10.946875 4.3125c-.09885 0-.27115.048-.3515625.094l-2.488 1.4063125c-.33276875.182-.46285.752125-.2433875 1.0936875l.7571875 1.1875-3.218125 2.1563125 1.73075.8125 1.866-.875 1.866.875.7301875-.875-2.2445625-3.4688125 1.893-1.125c.3762375-.2174.3635125-.5902.3245188-.8125-.03695-.2107-.2784188-.4687-.6219938-.4687zm1.5144375 2.375c-.7169375 0-1.2980625.671625-1.2980625 1.5s.5811688 1.5 1.2980625 1.5c.7169375 0 1.2980625-.671625 1.2980625-1.5s-.5811687-1.5-1.2980625-1.5zm-3.4615625 4.5-1.73075 1-2.1634375-.9375-1.73075.9375v1.5l1.73075-1 2.1634375 1 1.73075-1.0625 1.73075 1.0625 1.73075-1.0625 2.1634375 1.0625v-1.5l-2.1634375-1-1.73075 1z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/swimming-m.svg b/data/styles/default/light/symbols/swimming-m.svg
index 5ef2bdee3..cd9f34255 100644
--- a/data/styles/default/light/symbols/swimming-m.svg
+++ b/data/styles/default/light/symbols/swimming-m.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>swimming-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="swimming-m" fill-rule="nonzero">
-   <path id="Shape" d="m15.115 4.5c-0.15816 0-0.43384 0.0768-0.5625 0.1504l-3.9808 2.2501c-0.53243 0.2912-0.74056 1.2034-0.38942 1.7499l1.2115 1.9-5.149 3.4501 2.7692 1.3 2.9856-1.4 2.9856 1.4 1.1683-1.4-3.5913-5.5501 3.0288-1.8c0.60198-0.34784 0.58162-0.94432 0.51923-1.3-0.05912-0.33712-0.44547-0.74992-0.99519-0.74992zm2.4231 3.8c-1.1471 0-2.0769 1.0746-2.0769 2.4 0 1.3254 0.92987 2.4 2.0769 2.4 1.1471 0 2.0769-1.0746 2.0769-2.4 0-1.3254-0.92987-2.4-2.0769-2.4zm-5.5385 7.2-2.7692 1.6-3.4615-1.5-2.7692 1.5v2.4l2.7692-1.6 3.4615 1.6 2.7692-1.7 2.7692 1.7 2.7692-1.7 3.4615 1.7v-2.4l-3.4615-1.6-2.7692 1.6z" fill="#747E86"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m11.33625 3.375c-.11862 0-.32538.0576-.421875.1128l-2.9856 1.687575c-.3993225.2184-.55542.90255-.292065 1.312425l.908625 1.425-3.86175 2.587575 2.0769.975 2.2392-1.05 2.2392 1.05.876225-1.05-2.693475-4.162575 2.2716-1.35c.451485-.26088.436215-.70824.3894225-.975-.04434-.25284-.3341025-.56244-.7463925-.56244zm1.817325 2.85c-.860325 0-1.557675.80595-1.557675 1.8s.6974025 1.8 1.557675 1.8c.860325 0 1.557675-.80595 1.557675-1.8s-.6974025-1.8-1.557675-1.8zm-4.153875 5.4-2.0769 1.2-2.596125-1.125-2.0769 1.125v1.8l2.0769-1.2 2.596125 1.2 2.0769-1.275 2.0769 1.275 2.0769-1.275 2.596125 1.275v-1.8l-2.596125-1.2-2.0769 1.2z" fill="#0797b8"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/table-tennis-centre-m.svg b/data/styles/default/light/symbols/table-tennis-centre-m.svg
new file mode 100644
index 000000000..e46ea878f
--- /dev/null
+++ b/data/styles/default/light/symbols/table-tennis-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m12.349375 9.659375c.5856563 0 1.1231875.193225 1.56425.5117812.2935563-.6226562.4406563-1.29731245.4406563-1.97174995 0-2.1528125-1.6606875-4.5540625-4.52993755-4.5540625-1.2541875 0-2.5191875.495075-3.462875 1.4396875l-1.1436875 1.14425c-.03242937.0515625-.05398062.06828125-.0841125.1183875l4.8270625 4.81712495c.43855625-.877 1.33825005-1.50549995 2.38862505-1.50549995zm-2.630125 2.1924375-4.992375-4.982125c-.271175.4739875-.40591875.9584375-.40591875 1.42825 0 .6375.24501875 1.2515625.7175 1.7243125l.7658125.7663125-1.9329375 1.698c-.15016875.1306063-.22618125.313625-.22618125.4971688 0 .1676062.0634375.3355499.19174375.4643875l.7124375.714125c.128575.128625.296275.1922062.46345625.1922062.1830625 0 .3655375-.0761875.4958875-.2267625l1.6954375-1.93875.7521875.7525625c.49421875.49445 1.1384375.735625 1.78625.735625.094825 0 .1926-.005625.287075-.0158687-.22095625-.3885875-.3582125-.8329375-.3582125-1.3115-.0002925-.1638126.0016875-.3225063.04783125-.4979063zm2.61125-1.5055c-1.10875 0-2.0084375.8790625-2.0084375 1.98575 0 1.087875.8995 2.0043125 2.0084375 2.0043125 1.090125 0 2.0084375-.8790625 2.0084375-2.0043125.0002106-1.087875-.8995-1.98575-2.0084375-1.98575z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/table-tennis-m.svg b/data/styles/default/light/symbols/table-tennis-m.svg
index d12ac14a1..20aad7570 100644
--- a/data/styles/default/light/symbols/table-tennis-m.svg
+++ b/data/styles/default/light/symbols/table-tennis-m.svg
@@ -1 +1 @@
-<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="#747E86"><g fill="#747E86"><path d="m17.359 13.055c0.93705 0 1.7971 0.30916 2.5028 0.81885 0.46969-0.99625 0.70505-2.0757 0.70505-3.1548 0-3.4445-2.6571-7.2865-7.2479-7.2865-2.0067 0-4.0307 0.79212-5.5406 2.3035l-1.8299 1.8308c-0.051887 0.0825-0.086369 0.10925-0.13458 0.18942l7.7233 7.7074c0.70169-1.4032 2.1412-2.4088 3.8218-2.4088zm-4.2082 3.5079-7.9878-7.9714c-0.43388 0.75838-0.64947 1.5335-0.64947 2.2852 0 1.02 0.39203 2.0025 1.148 2.7589l1.2253 1.2261-3.0927 2.7168c-0.24027 0.20897-0.36189 0.5018-0.36189 0.79547 0 0.26817 0.1015 0.53688 0.30679 0.74302l1.1399 1.1426c0.20572 0.2058 0.47404 0.30753 0.74153 0.30753 0.2929 0 0.58486-0.1219 0.79342-0.36282l2.7127-3.102 1.2035 1.2041c0.79075 0.79112 1.8215 1.177 2.858 1.177 0.15172 0 0.30816-9e-3 0.45932-0.02539-0.35353-0.62174-0.57314-1.3327-0.57314-2.0984-4.68e-4 -0.2621 0.0027-0.51601 0.07653-0.79665zm4.178-2.4088c-1.774 0-3.2135 1.4065-3.2135 3.1772 0 1.7406 1.4392 3.2069 3.2135 3.2069 1.7442 0 3.2135-1.4065 3.2135-3.2069 3.37e-4 -1.7406-1.4392-3.1772-3.2135-3.1772z" fill="#747E86" stroke-opacity="0"/></g></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.01925 9.79125c.7027875 0 1.347825.23187 1.8771.6141375.3522675-.7471875.5287875-1.556775.5287875-2.3661 0-2.583375-1.992825-5.464875-5.435925-5.464875-1.505025 0-3.023025.59409-4.15545 1.727625l-1.372425 1.3731c-.03891525.061875-.06477675.0819375-.100935.142065l5.792475 5.78055c.5262675-1.0524 1.6059-1.8066 2.86635-1.8066zm-3.15615 2.630925-5.99085-5.97855c-.32541.568785-.4871025 1.150125-.4871025 1.7139 0 .765.2940225 1.501875.861 2.069175l.918975.919575-2.319525 2.0376c-.1802025.1567275-.2714175.37635-.2714175.5966025 0 .2011275.076125.40266.2300925.557265l.854925.85695c.15429.15435.35553.2306475.5561475.2306475.219675 0 .438645-.091425.595065-.272115l2.034525-2.3265.902625.903075c.5930625.59334 1.366125.88275 2.1435.88275.11379 0 .23112-.00675.34449-.0190425-.2651475-.466305-.429855-.999525-.429855-1.5738-.000351-.196575.002025-.3870075.0573975-.5974875zm3.1335-1.8066c-1.3305 0-2.410125 1.054875-2.410125 2.3829 0 1.30545 1.0794 2.405175 2.410125 2.405175 1.30815 0 2.410125-1.054875 2.410125-2.405175.0002527-1.30545-1.0794-2.3829-2.410125-2.3829z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/tennis-centre-m.svg b/data/styles/default/light/symbols/tennis-centre-m.svg
new file mode 100644
index 000000000..e9d62c2a3
--- /dev/null
+++ b/data/styles/default/light/symbols/tennis-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m12.1089278 10.0336112c.5216329 0 1.0483609.1994517 1.4472482.598339.7977827.8029017.7977827 2.0967139 0 2.8944965-.3989194.3988873-.9256153.598331-1.4472482.598331-.521633 0-1.048361-.1994437-1.4472483-.598331-.79778266-.8029017-.79778266-2.0967138 0-2.8944965.3989194-.3988953.9256233-.598339 1.4472483-.598339zm0 1.0227735c-.2710387 0-.5318551.1073965-.7210687.29661-.3988873.3989195-.3988873 1.048361 0 1.4472483.1892136.1943326.45003.301729.7210687.301729.2710386 0 .531847-.1073964.7210686-.2966099.3988873-.3989195.3988873-1.048361 0-1.4472483-.1892136-.1943326-.45003-.3017291-.7210686-.3017291zm-4.10676489-6.8784433c1.49843918-1.498399 3.68719219-1.73876324 4.88387019-.54208525 1.1965575 1.19659763.9511304 3.38543104-.5421656 4.88378985-.8181706.81826705-1.9841501 1.28875172-2.79219504 1.29897945l-.7441048-.00297886c-.69260928.00825034-1.47396717.09874953-2.0685827.69336511l-2.16834098 2.1683409-.72618769-.7261877 2.16834097-2.16834094c.82334596-.82331381.68015847-2.00464256.6903862-2.8126875.0102864-.81310778.48072848-1.97394409 1.29897945-2.79219506zm4.15775489.17896728c-.7875525-.78244948-2.35759471-.53694204-3.43662199.54208525-1.0790514 1.07910765-1.32452669 2.6541805-.54208525 3.43662195.78756054.78244948 2.35760274.53694204 3.43662994-.54208525 1.0790434-1.07910765 1.3245187-2.6541805.5420773-3.43662195z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/tennis-m.svg b/data/styles/default/light/symbols/tennis-m.svg
index c674bf453..cf834bc2e 100644
--- a/data/styles/default/light/symbols/tennis-m.svg
+++ b/data/styles/default/light/symbols/tennis-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>tennis-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="tennis-m" fill-rule="nonzero">
-   <g id="Group" transform="translate(5 5)" fill="#fff">
-    <g transform="matrix(1.2858 0 0 1.2858 -1.9355 -2.0018)" fill="#747E86">
-     <path id="Shape" d="m11.785 0.94818c-1.4891-1.4891-4.2127-1.19-6.0773 0.67455-1.0182 1.0182-1.6036 2.4627-1.6164 3.4745-0.012727 1.0055 0.16545 2.4755-0.85909 3.5l-2.6982 2.6982 0.90364 0.90364 2.6982-2.6982c1.0245-1.0245 2.4945-0.84636 3.5-0.85909 1.0055-0.012727 2.4564-0.59818 3.4745-1.6164 1.8582-1.8645 2.1636-4.5882 0.67455-6.0773zm-5.8545 5.8482c-0.97364-0.97364-0.66818-2.9336 0.67455-4.2764 1.3427-1.3427 3.2964-1.6482 4.2764-0.67455 0.97364 0.97364 0.66818 2.9336-0.67454 4.2764-1.3427 1.3427-3.2964 1.6482-4.2764 0.67455z"/>
-     <path d="m10.818 10.182c0.33727 0 0.66182 0.13364 0.89727 0.37546 0.49636 0.49636 0.49636 1.3045 0 1.8009-0.23546 0.23545-0.56 0.36909-0.89727 0.36909-0.33727 0-0.66182-0.13364-0.89727-0.37546-0.49636-0.49636-0.49636-1.3045 0-1.8009 0.23545-0.23545 0.56-0.36909 0.89727-0.36909m0-1.2727c-0.64909 0-1.3045 0.24818-1.8009 0.74455-0.99273 0.99273-0.99273 2.6027 0 3.6018 0.49636 0.49636 1.1518 0.74454 1.8009 0.74454s1.3045-0.24818 1.8009-0.74454c0.99273-0.99273 0.99273-2.6027 0-3.6018-0.49636-0.49636-1.1518-0.74455-1.8009-0.74455z"/>
-    </g>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12.7307133 10.8403335c.6259596 0 1.2580331.239342 1.7366979.7180067.9573392.9634821.9573392 2.5160567 0 3.4733959-.4787033.4786647-1.1107383.7179971-1.7366979.7179971s-1.2580331-.2393324-1.7366979-.7179971c-.9573392-.9634821-.9573392-2.5160567 0-3.4733959.4787033-.4786744 1.110748-.7180067 1.7366979-.7180067zm0 1.2273282c-.3252463 0-.6382261.1288757-.8652823.3559319-.4786648.4787034-.4786648 1.2580332 0 1.736698.2270562.2331991.540036.3620748.8652823.3620748s.6382165-.1288757.8652823-.3559319c.4786648-.4787034.4786648-1.2580332 0-1.7366979-.2270562-.2331992-.540036-.3620749-.8652823-.3620749zm-4.9281178-8.25413202c1.79812701-1.7980788 4.4246307-2.08651588 5.8606443-.6505023 1.4358689 1.43591715 1.1413564 4.06251725-.6505988 5.86054782-.9818047.9819205-2.3809801 1.5465021-3.35063405 1.5587753l-.89292576-.0035746c-.83113114.0099004-1.7687606.1184994-2.48229924.8320381l-2.60200917 2.6020092-.87142524-.8714253 2.60200917-2.6020091c.98801515-.98797662.81619016-2.40557112.82846345-3.37522505.01234368-.97572933.57687416-2.3687329 1.55877534-3.35063407zm4.9893058.21476074c-.945063-.93893938-2.82911359-.64433045-4.12394633.65050229-1.29486168 1.29492918-1.58943203 3.18501661-.65050229 4.12394634.94507264.93893938 2.82912322.64433046 4.12395602-.65050229 1.294852-1.29492918 1.5894223-3.18501661.6504926-4.12394634z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/theatre-m.svg b/data/styles/default/light/symbols/theatre-m.svg
index 9be52ed40..04455ff10 100644
--- a/data/styles/default/light/symbols/theatre-m.svg
+++ b/data/styles/default/light/symbols/theatre-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>theatre-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="theatre-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#9C6136"/>
-   <g id="Group" transform="translate(5 5)" fill="#fff">
-    <path id="Shape" d="m0 9.45c0 2.128 1.722 3.85 3.85 3.85s3.85-1.722 3.85-3.85v-4.55h-7.7v4.55zm3.85 1.4c-0.966 0-1.75-0.469-1.75-1.05h3.5c0 0.581-0.784 1.05-1.75 1.05zm1.75-3.85c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm-3.5 0c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7z"/>
-    <path id="Shape" d="m6.3 0v4.2h2.1v1.75c0-0.581 0.784-1.05 1.75-1.05s1.75 0.469 1.75 1.05h-3.5v1.75 0.273c0.525 0.266 1.12 0.427 1.75 0.427 2.128 0 3.85-1.722 3.85-3.85v-4.55h-7.7zm2.1 3.556c-0.385 0-0.7-0.315-0.7-0.7s0.315-0.7 0.7-0.7 0.7 0.315 0.7 0.7c0 0.392-0.315 0.7-0.7 0.7zm3.5 0c-0.385 0-0.7-0.315-0.7-0.7s0.315-0.7 0.7-0.7 0.7 0.315 0.7 0.7c0 0.392-0.315 0.7-0.7 0.7z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><g fill="#fff" transform="translate(5 5)"><path d="m0 9.45c0 2.128 1.722 3.85 3.85 3.85s3.85-1.722 3.85-3.85v-4.55h-7.7zm3.85 1.4c-.966 0-1.75-.469-1.75-1.05h3.5c0 .581-.784 1.05-1.75 1.05zm1.75-3.85c.385 0 .7.315.7.7s-.315.7-.7.7-.7-.315-.7-.7.315-.7.7-.7zm-3.5 0c.385 0 .7.315.7.7s-.315.7-.7.7-.7-.315-.7-.7.315-.7.7-.7z"/><path d="m6.3 0v4.2h2.1v1.75c0-.581.784-1.05 1.75-1.05s1.75.469 1.75 1.05h-3.5v1.75.273c.525.266 1.12.427 1.75.427 2.128 0 3.85-1.722 3.85-3.85v-4.55h-7.7zm2.1 3.556c-.385 0-.7-.315-.7-.7s.315-.7.7-.7.7.315.7.7c0 .392-.315.7-.7.7zm3.5 0c-.385 0-.7-.315-.7-.7s.315-.7.7-.7.7.315.7.7c0 .392-.315.7-.7.7z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/theatre-s.svg b/data/styles/default/light/symbols/theatre-s.svg
index a9b8655cc..ae4ffd1e7 100644
--- a/data/styles/default/light/symbols/theatre-s.svg
+++ b/data/styles/default/light/symbols/theatre-s.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>theatre-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="theatre-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#9C6136"/>
-   <g id="Group" transform="translate(3.3333 3.3333)" fill="#fff">
-    <path id="Shape" d="m0 6.3c0 1.4187 1.148 2.5667 2.5667 2.5667 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333v3.0333zm2.5667 0.93333c-0.644 0-1.1667-0.31267-1.1667-0.7h2.3333c0 0.38733-0.52267 0.7-1.1667 0.7zm1.1667-2.5667c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.25667-0.21 0.46667-0.46667 0.46667-0.25667 0-0.46667-0.21-0.46667-0.46667 0-0.25667 0.21-0.46667 0.46667-0.46667zm-2.3333 0c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.25667-0.21 0.46667-0.46667 0.46667s-0.46667-0.21-0.46667-0.46667c0-0.25667 0.21-0.46667 0.46667-0.46667z"/>
-    <path id="Shape" d="m4.2 0v2.8h1.4v1.1667c0-0.38733 0.52267-0.7 1.1667-0.7s1.1667 0.31267 1.1667 0.7h-2.3333v1.1667 0.182c0.35 0.17733 0.74667 0.28467 1.1667 0.28467 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333zm1.4 2.3707c-0.25667 0-0.46667-0.21-0.46667-0.46667s0.21-0.46667 0.46667-0.46667 0.46667 0.21 0.46667 0.46667c0 0.26133-0.21 0.46667-0.46667 0.46667zm2.3333 0c-0.25667 0-0.46667-0.21-0.46667-0.46667s0.21-0.46667 0.46667-0.46667c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.26133-0.21 0.46667-0.46667 0.46667z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="8" cy="8" fill="#fff" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#EB785D" r="7.3333"/><g fill="#fff" transform="translate(3.3333 3.3333)"><path d="m0 6.3c0 1.4187 1.148 2.5667 2.5667 2.5667s2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333v3.0333zm2.5667.93333c-.644 0-1.1667-.31267-1.1667-.7h2.3333c0 .38733-.52267.7-1.1667.7zm1.1667-2.5667c.25667 0 .46667.21.46667.46667s-.21.46667-.46667.46667-.46667-.21-.46667-.46667.21-.46667.46667-.46667zm-2.3333 0c.25667 0 .46667.21.46667.46667s-.21.46667-.46667.46667-.46667-.21-.46667-.46667.21-.46667.46667-.46667z"/><path d="m4.2 0v2.8h1.4v1.1667c0-.38733.52267-.7 1.1667-.7s1.1667.31267 1.1667.7h-2.3333v1.1667.182c.35.17733.74667.28467 1.1667.28467 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333zm1.4 2.3707c-.25667 0-.46667-.21-.46667-.46667s.21-.46667.46667-.46667.46667.21.46667.46667c0 .26133-.21.46667-.46667.46667zm2.3333 0c-.25667 0-.46667-.21-.46667-.46667s.21-.46667.46667-.46667.46667.21.46667.46667c0 .26133-.21.46667-.46667.46667z"/></g></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/theme_park-m.svg b/data/styles/default/light/symbols/theme_park-m.svg
index 8589ba3fd..3ee351c56 100644
--- a/data/styles/default/light/symbols/theme_park-m.svg
+++ b/data/styles/default/light/symbols/theme_park-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#9C6136"/>
- <path d="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m12 5v1.1429h2.4l-.6-.57143.6-.57143h-2.4zm0 1.7143 4.2 4v1.1428s.1464.57143.9.57143.9-.57143.9-.57143v-1.1428zm0 0 .6 4v1.1428s.2976.57143 1.2.57143 1.2-.57143 1.2-.57143v-1.1428zm0 0-3 4v1.1428s.2976.57143 1.2.57143 1.2-.57143 1.2-.57143v-1.1428zm0 0-6 4v1.1428s.1464.57143.9.57143.9-.57143.9-.57143v-1.1428zm-3.6 5.7143s-.5952.57143-1.5.57143c-.129 0-.24645-.01457-.35625-.03571l-.54375 4.0357h4.2l.6-2.2857h2.4l.6 2.2857h4.2l-.54375-4.0357c-.1098.02114-.22725.03571-.35625.03571-1.0422 0-1.5-.57143-1.5-.57143s-.6888.57143-1.8.57143c-.9582 0-1.8-.57143-1.8-.57143s-.8466.57143-1.8.57143c-1.0956 0-1.8-.57143-1.8-.57143z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/theme_park-s.svg b/data/styles/default/light/symbols/theme_park-s.svg
index 52c28d86a..5a493c601 100644
--- a/data/styles/default/light/symbols/theme_park-s.svg
+++ b/data/styles/default/light/symbols/theme_park-s.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <circle cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
- <circle cx="8" cy="8" r="7" fill="#9C6136"/>
- <path d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#fff"/>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#fff" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#EB785D" r="7"/><path d="m8 3v.7619h1.6l-.4-.38095.4-.38095zm0 1.1429 2.8 2.6667v.7619s.0976.38095.6.38095.6-.38095.6-.38095v-.7619zm0 0 .4 2.6667v.7619s.1984.38095.8.38095.8-.38095.8-.38095v-.7619zm0 0-2 2.6667v.7619s.1984.38095.8.38095.8-.38095.8-.38095v-.7619zm0 0-4 2.6667v.7619s.0976.38095.6.38095.6-.38095.6-.38095v-.7619zm-2.4 3.8095s-.3968.38095-1 .38095c-.086 0-.1643-.0097143-.2375-.02381l-.3625 2.6905h2.8l.4-1.5238h1.6l.4 1.5238h2.8l-.3625-2.6905c-.0732.014095-.1515.02381-.2375.02381-.6948 0-1-.38095-1-.38095s-.4592.38095-1.2.38095c-.6388 0-1.2-.38095-1.2-.38095s-.5644.38095-1.2.38095c-.7304 0-1.2-.38095-1.2-.38095z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/tire-repair-m.svg b/data/styles/default/light/symbols/tire-repair-m.svg
index bbfe9d1e1..7679d6813 100644
--- a/data/styles/default/light/symbols/tire-repair-m.svg
+++ b/data/styles/default/light/symbols/tire-repair-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>tire-repair-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="tire-repair-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m12 5c-3.8661 0-7 2.9847-7 6.6667 0 2.9347 1.5094 3.4588 1.5094 4.3542 0 0.406-1.6863 0.97917 3.0625 0.97917h4.8562c4.7488 0 3.0625-0.57317 3.0625-0.97917-7e-4 -0.89533 1.5094-1.4195 1.5094-4.3542 0-3.682-3.1339-6.6667-7-6.6667zm0 2c2.7062 0 4.9 2.0893 4.9 4.6667 0 2.5773-2.1938 4.6667-4.9 4.6667s-4.9-2.0893-4.9-4.6667c0-2.5773 2.1938-4.6667 4.9-4.6667zm0 0.66667c-0.1596 0-0.32655 0.0041667-0.48125 0.020833l-0.21875 2.1042c-0.2366 0.081333-0.46795 0.20283-0.65625 0.35417l-2.0125-0.85417c-0.1869 0.24067-0.35385 0.4935-0.48125 0.77083l1.7938 1.25c-0.0217 0.116-0.04375 0.23283-0.04375 0.35417 0 0.12133 0.02205 0.23883 0.04375 0.35417l-1.7938 1.25c0.1274 0.27733 0.29435 0.53083 0.48125 0.77083l2.0125-0.85417c0.1883 0.15133 0.41965 0.27283 0.65625 0.35417l0.21875 2.1042c0.154 0.017333 0.32165 0.020833 0.48125 0.020833s0.32655-0.0041667 0.48125-0.020833l0.21875-2.1042c0.2366-0.081333 0.46795-0.20283 0.65625-0.35417l2.0125 0.85417c0.1869-0.24067 0.35385-0.4935 0.48125-0.77083l-1.7938-1.25c0.021-0.116 0.04375-0.23283 0.04375-0.35417 0-0.12133-0.02205-0.23883-0.04375-0.35417l1.7938-1.25c-0.1274-0.27733-0.29435-0.53083-0.48125-0.77083l-2.0125 0.85417c-0.1883-0.15133-0.41965-0.27283-0.65625-0.35417l-0.21875-2.1042c-0.154-0.017333-0.32165-0.020833-0.48125-0.020833zm0 3c0.5796 0 1.05 0.448 1.05 1s-0.4704 1-1.05 1-1.05-0.448-1.05-1 0.4704-1 1.05-1z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><path d="m12 5c-3.8661 0-7 2.9847-7 6.6667 0 2.9347 1.5094 3.4588 1.5094 4.3542 0 .406-1.6863.97917 3.0625.97917h4.8562c4.7488 0 3.0625-.57317 3.0625-.97917-.0007-.89533 1.5094-1.4195 1.5094-4.3542 0-3.682-3.1339-6.6667-7-6.6667zm0 2c2.7062 0 4.9 2.0893 4.9 4.6667 0 2.5773-2.1938 4.6667-4.9 4.6667s-4.9-2.0893-4.9-4.6667c0-2.5773 2.1938-4.6667 4.9-4.6667zm0 .66667c-.1596 0-.32655.0041667-.48125.020833l-.21875 2.1042c-.2366.081333-.46795.20283-.65625.35417l-2.0125-.85417c-.1869.24067-.35385.4935-.48125.77083l1.7938 1.25c-.0217.116-.04375.23283-.04375.35417 0 .12133.02205.23883.04375.35417l-1.7938 1.25c.1274.27733.29435.53083.48125.77083l2.0125-.85417c.1883.15133.41965.27283.65625.35417l.21875 2.1042c.154.017333.32165.020833.48125.020833s.32655-.0041667.48125-.020833l.21875-2.1042c.2366-.081333.46795-.20283.65625-.35417l2.0125.85417c.1869-.24067.35385-.4935.48125-.77083l-1.7938-1.25c.021-.116.04375-.23283.04375-.35417 0-.12133-.02205-.23883-.04375-.35417l1.7938-1.25c-.1274-.27733-.29435-.53083-.48125-.77083l-2.0125.85417c-.1883-.15133-.41965-.27283-.65625-.35417l-.21875-2.1042c-.154-.017333-.32165-.020833-.48125-.020833zm0 3c.5796 0 1.05.448 1.05 1s-.4704 1-1.05 1-1.05-.448-1.05-1 .4704-1 1.05-1z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/toilets-m.svg b/data/styles/default/light/symbols/toilets-m.svg
index c80960aed..c55a3741e 100644
--- a/data/styles/default/light/symbols/toilets-m.svg
+++ b/data/styles/default/light/symbols/toilets-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>toilets-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="toilets-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#9C6136"/>
-   <path id="Shape" d="m8.1818 7.6923c0.75682 0 1.3636-0.59904 1.3636-1.3462 0-0.74712-0.60682-1.3462-1.3636-1.3462s-1.3636 0.59904-1.3636 1.3462c0 0.74712 0.60682 1.3462 1.3636 1.3462zm7.6364 7.5385v3.7692h-2.1818v-3.7692h-2.1818l1.9091-5.9231s0.27273-1.0769 1.3636-1.0769 1.3636 1.0769 1.3636 1.0769l1.9091 5.9231h-2.1818zm-6.5455-1.6154v5.3846h-2.1818v-5.3846h-1.0909v-3.8847c0-0.82838 0.66274-1.4999 1.5017-1.4999h1.3602c0.82937 0 1.5017 0.67108 1.5017 1.4999v3.8847h-1.0909zm6.9584-7.2692c0 0.74712-0.62972 1.3462-1.4151 1.3462s-1.4151-0.59904-1.4151-1.3462c0-0.74712 0.62972-1.3462 1.4151-1.3462s1.4151 0.59904 1.4151 1.3462z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#747e86" r="11"/><path d="m8.1818 7.6923c.75682 0 1.3636-.59904 1.3636-1.3462 0-.74712-.60682-1.3462-1.3636-1.3462s-1.3636.59904-1.3636 1.3462c0 .74712.60682 1.3462 1.3636 1.3462zm7.6364 7.5385v3.7692h-2.1818v-3.7692h-2.1818l1.9091-5.9231s.27273-1.0769 1.3636-1.0769 1.3636 1.0769 1.3636 1.0769l1.9091 5.9231zm-6.5455-1.6154v5.3846h-2.1818v-5.3846h-1.0909v-3.8847c0-.82838.66274-1.4999 1.5017-1.4999h1.3602c.82937 0 1.5017.67108 1.5017 1.4999v3.8847zm6.9584-7.2692c0 .74712-.62972 1.3462-1.4151 1.3462s-1.4151-.59904-1.4151-1.3462c0-.74712.62972-1.3462 1.4151-1.3462s1.4151.59904 1.4151 1.3462z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/toll_booth-m.svg b/data/styles/default/light/symbols/toll_booth-m.svg
index b3bc82afe..487da8d96 100644
--- a/data/styles/default/light/symbols/toll_booth-m.svg
+++ b/data/styles/default/light/symbols/toll_booth-m.svg
@@ -1,10 +1,7 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>toll_booth-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="toll_booth-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#747E86"/>
-   <path id="Shape" d="m10.2 4-3.5 2.1v10.5h-0.7v1.4h8.4v-1.4h-0.7v-3.2156l0.98438-0.63438-0.15312-1.5312-0.83125 0.50312v-5.6219l-3.5-2.1zm-2.1 3.5h4.2v4.9h-4.2v-4.9zm11.134 0.7-0.56875 0.35 0.15312 1.5312 1.1812-0.7-0.76562-1.1812zm-1.2031 0.7-1.1812 0.76562 0.13125 1.5531 1.2031-0.7875-0.15312-1.5312zm-1.75 1.1156-1.1812 0.76562 0.13125 1.5531 1.2031-0.76562-0.15312-1.5531z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-m</title>
+    <g id="toll_booth-m" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M6.60018429,3 L3.60018429,4.8 L3.60018429,13.8 L3.00018429,13.8 L3.00018429,15 L10.2001843,15 L10.2001843,13.8 L9.60018429,13.8 L9.60018429,11.0437714 L10.4439386,10.5000171 L10.3126929,9.18756 L9.60019286,9.61880571 L9.60019286,4.80003429 L6.60019286,3 L6.60018429,3 Z M4.80018429,6 L8.40018429,6 L8.40018429,10.2 L4.80018429,10.2 L4.80018429,6 L4.80018429,6 Z M14.3436129,6.6 L13.8561129,6.9 L13.9873586,8.21245714 L14.9998157,7.61245714 L14.34357,6.6 L14.3436129,6.6 Z M13.3123843,7.2 L12.2999271,7.85624571 L12.4124271,9.18747429 L13.4436557,8.51247429 L13.31241,7.2 L13.3123843,7.2 Z M11.8123843,8.15622857 L10.7999271,8.81247429 L10.9124271,10.1437029 L11.9436557,9.48745714 L11.81241,8.15622857 L11.8123843,8.15622857 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/toll_booth-s.svg b/data/styles/default/light/symbols/toll_booth-s.svg
index 2ed038ec2..3298a338a 100644
--- a/data/styles/default/light/symbols/toll_booth-s.svg
+++ b/data/styles/default/light/symbols/toll_booth-s.svg
@@ -1,10 +1,7 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>toll_booth-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="toll_booth-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#747E86"/>
-   <polygon id="Path" points="6.501 4 5.001 5.036 5.001 11 4 11 4 12 9 12 9 11.036 8 11 8 10.096 13 7 13 6 8 9 8.089 5.036" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-s</title>
+    <g id="toll_booth-s" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M4.50856084,0.999846424 L7.00863763,2.49992107 L7.00863763,6.51568727 L10.9615733,3.99993857 L11.5084615,4.84367877 L7.00863048,7.70319517 L7.00863048,10.0001229 L7.50864584,10.0001229 L7.50864584,11.0001536 L1.50846155,11.0001536 L1.50846155,10.0001229 L2.00847691,10.0001229 L2.00847691,2.4998925 L4.50856084,0.999846424 Z M6.00859977,3.49992321 L3.00850762,3.49992321 L3.00850762,7.00003072 L6.00859977,7.00003072 L6.00859977,3.49992321 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/vehicle_inspection-m.svg b/data/styles/default/light/symbols/vehicle_inspection-m.svg
index 2f8577f45..1557334eb 100644
--- a/data/styles/default/light/symbols/vehicle_inspection-m.svg
+++ b/data/styles/default/light/symbols/vehicle_inspection-m.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#747E86"/>
- <g stroke="#fff" stroke-linejoin="round" stroke-linecap="round" stroke-width="1.333">
-  <path d="m12.668 4.666h5.1992-5.1992zm0 2.668h5.1992-5.1992zm0 2.666h5.1992-5.1992z" fill="none"/>
-  <path d="m4.6666 8.6666 1.3333 2.6666 4-7.9999" fill="none"/>
-  <path d="m16.666 19.333v-4l-1.3333-2.6666h-6.6666l-1.3333 2.6666v4" fill="none"/>
-  <path d="m7.3333 15.333h9.3332v2.6666h-9.3332z" fill="#fff"/>
- </g>
- <circle cx="8.6666" cy="16.666" r=".66666" fill="#747E86"/>
- <circle cx="15.333" cy="16.666" r=".66666" fill="#747E86"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#AA96BC" r="11"/><g stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"><g fill="none"><path d="m12.668 4.666h5.1992zm0 2.668h5.1992zm0 2.666h5.1992z"/><path d="m4.6666 8.6666 1.3333 2.6666 4-7.9999"/><path d="m16.666 19.333v-4l-1.3333-2.6666h-6.6666l-1.3333 2.6666v4"/></g><path d="m7.3333 15.333h9.3332v2.6666h-9.3332z" fill="#fff"/></g><g fill="#AA96BC"><circle cx="8.6666" cy="16.666" r=".66666"/><circle cx="15.333" cy="16.666" r=".66666"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/volleyball-centre-m.svg b/data/styles/default/light/symbols/volleyball-centre-m.svg
new file mode 100644
index 000000000..b390519bb
--- /dev/null
+++ b/data/styles/default/light/symbols/volleyball-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9 3.375c-3.105 0-5.625 2.52-5.625 5.625s2.52 5.625 5.625 5.625 5.625-2.52 5.625-5.625-2.52-5.625-5.625-5.625zm.5625 1.164375c1.726875.21375 3.133125 1.4175 3.67875 3.015l-3.67875-2.12625zm-2.8125.568125c.66375-.388125 1.873125-.59625 1.6875-.57375v4.134375l-1.6875.973125zm-1.895625 5.63625c-.225-.54-.354375-1.125-.354375-1.74375 0-1.13625.4275-2.17125 1.125-2.964375v4.26375zm.568125.973125 3.5775-2.07 1.6875.973125-3.92625 2.266875c-.523125-.298125-.97875-.691875-1.33875-1.17zm3.5775 1.783125c-.30375 0-.601875-.03375-.88875-.09l3.70125-2.1375.765.43875c-.82125 1.085625-2.115 1.78875-3.5775 1.78875zm.5625-4.82625v-1.94625l3.9375 2.278125c0 .61875-.129375 1.20375-.354375 1.738125z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/volleyball-m.svg b/data/styles/default/light/symbols/volleyball-m.svg
index fa3a6f2a5..083b63693 100644
--- a/data/styles/default/light/symbols/volleyball-m.svg
+++ b/data/styles/default/light/symbols/volleyball-m.svg
@@ -1,7 +1 @@
-<svg enable-background="new 0 0 24 24" fill="#000000" version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <g fill="#747E86">
-  <g fill="#747E86">
-   <path d="m12 3c-4.968 0-9 4.032-9 9s4.032 9 9 9 9-4.032 9-9-4.032-9-9-9zm0.9 1.863c2.763 0.342 5.013 2.268 5.886 4.824l-5.886-3.402zm-4.5 0.909c1.062-0.621 2.997-0.954 2.7-0.918v6.615l-2.7 1.557zm-3.033 9.018c-0.36-0.864-0.567-1.8-0.567-2.79 0-1.818 0.684-3.474 1.8-4.743v6.822zm0.909 1.557 5.724-3.312 2.7 1.557-6.282 3.627c-0.837-0.477-1.566-1.107-2.142-1.872zm4.302 2.709m1.422 0.144c-0.486 0-0.963-0.054-1.422-0.144l5.922-3.42 1.224 0.702c-1.314 1.737-3.384 2.862-5.724 2.862zm0.9-7.722v-3.114l6.3 3.645c0 0.99-0.207 1.926-0.567 2.781z" fill="#747E86" stroke-width=".9"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9 2.25c-3.726 0-6.75 3.024-6.75 6.75s3.024 6.75 6.75 6.75 6.75-3.024 6.75-6.75-3.024-6.75-6.75-6.75zm.675 1.39725c2.07225.2565 3.75975 1.701 4.4145 3.618l-4.4145-2.5515zm-3.375.68175c.7965-.46575 2.24775-.7155 2.025-.6885v4.96125l-2.025 1.16775zm-2.27475 6.7635c-.27-.648-.42525-1.35-.42525-2.0925 0-1.3635.513-2.6055 1.35-3.55725v5.1165zm.68175 1.16775 4.293-2.484 2.025 1.16775-4.7115 2.72025c-.62775-.35775-1.1745-.83025-1.6065-1.404zm4.293 2.13975c-.3645 0-.72225-.0405-1.0665-.108l4.4415-2.565.918.5265c-.9855 1.30275-2.538 2.1465-4.293 2.1465zm.675-5.7915v-2.3355l4.725 2.73375c0 .7425-.15525 1.4445-.42525 2.08575z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/waterfall-m.svg b/data/styles/default/light/symbols/waterfall-m.svg
index 5e9631e70..4f908b2c2 100644
--- a/data/styles/default/light/symbols/waterfall-m.svg
+++ b/data/styles/default/light/symbols/waterfall-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.5337 14c1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552v-1.0385c.5063-.11252 1.0014-.31952 1.5337-.31952zm-1.5337 2.3195c.5063-.11252 1.0014-.31952 1.5337-.31952 1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552zm5.9106-12.32c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm-2 0c.084391.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.0001917.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658s-.25164-1.0661-.25164-1.0661zm4 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm2.002 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000192.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.0133-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000191-.53307-.25164-1.0661-.25164-1.0661z" fill="#54a3b6" transform="matrix(1.5 0 0 1.5 -5.2772 -4.1503)"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.5337 14c1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552v-1.0385c.5063-.11252 1.0014-.31952 1.5337-.31952zm-1.5337 2.3195c.5063-.11252 1.0014-.31952 1.5337-.31952 1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552zm5.9106-12.32c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm-2 0c.084391.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.0001917.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658s-.25164-1.0661-.25164-1.0661zm4 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm2.002 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000192.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.0133-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000191-.53307-.25164-1.0661-.25164-1.0661z" fill="#0797B8" transform="matrix(1.5 0 0 1.5 -5.2772 -4.1503)"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/waterfall-s.svg b/data/styles/default/light/symbols/waterfall-s.svg
index 10613daee..947174528 100644
--- a/data/styles/default/light/symbols/waterfall-s.svg
+++ b/data/styles/default/light/symbols/waterfall-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m2.8382 10.989c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.1918 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm0 3c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.19179 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm2.7923-13.5c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002908.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002908.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002907.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002907.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58156 1.322-.58126 1.8508-.000291.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.000291.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.000291-.5288-.38148-1.0576-.38148-1.0576z" fill="#54a3b6" stroke-width="1.5"/></svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m2.8382 10.989c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.1918 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm0 3c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.19179 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm2.7923-13.5c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002908.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002908.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002907.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002907.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58156 1.322-.58126 1.8508-.000291.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.000291.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.000291-.5288-.38148-1.0576-.38148-1.0576z" fill="#0797B8" stroke-width="1.5"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/wholesale-m.svg b/data/styles/default/light/symbols/wholesale-m.svg
index e0b544e1a..b117c262f 100644
--- a/data/styles/default/light/symbols/wholesale-m.svg
+++ b/data/styles/default/light/symbols/wholesale-m.svg
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BE75A3"/>
- <g fill="#fff" stroke="#BE75A3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667">
+ <circle cx="12" cy="12" r="11" fill="#AA96BC"/>
+ <g fill="#fff" stroke="#AA96BC" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667">
   <ellipse cx="8.6666" cy="6.6666" rx="2.3331" ry="2.3333"/>
   <ellipse cx="12.667" cy="5.3333" rx="2.3331" ry="2.3333"/>
   <ellipse cx="11.333" cy="8.6666" rx="2.3331" ry="2.3333"/>
   <ellipse cx="15.333" cy="7.3333" rx="2.3331" ry="2.3333"/>
  </g>
- <rect x="4" y="9.3332" width="16" height="2.6668" fill="#BE75A3" stroke="#BE75A3" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
+ <rect x="4" y="9.3332" width="16" height="2.6668" fill="#AA96BC" stroke="#AA96BC" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
  <g fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333">
   <rect x="4.6666" y="9.9999" width="14.667" height="1.3333"/>
   <rect x="4.6666" y="13.333" width="14.667" height="1.3333"/>
   <rect x="4.6666" y="16.666" width="14.667" height="1.3333"/>
  </g>
  <g stroke-linecap="round" stroke-width="1.333">
-  <rect x="5.9999" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#BE75A3" stroke="#BE75A3"/>
-  <rect x="15.333" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#BE75A3" stroke="#BE75A3"/>
+  <rect x="5.9999" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#AA96BC" stroke="#AA96BC"/>
+  <rect x="15.333" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#AA96BC" stroke="#AA96BC"/>
   <rect x="16" y="8.6665" width="1.3333" height="10.667" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
   <rect x="6.6666" y="8.6665" width="1.3333" height="10.667" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
  </g>
diff --git a/data/styles/default/light/symbols/windmill-m.svg b/data/styles/default/light/symbols/windmill-m.svg
index 9995a1aa9..72398b0ff 100644
--- a/data/styles/default/light/symbols/windmill-m.svg
+++ b/data/styles/default/light/symbols/windmill-m.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 12.967-2.7672 3.3823-0.24053 2.6503h6.0144l-0.23409-2.7692-2.7726-3.2633zm5.6869 0.13275-4.6388-2.949 4.6388-2.9508c0.3812-0.24337 0.41771-0.67295 0.081609-0.96149l-1.2134-1.0426c-0.33503-0.28762-0.83542-0.25535-1.1189 0.071904l-3.4351 3.9833-3.4394-3.9833c-0.28241-0.32726-0.7828-0.35952-1.1178-0.071904l-1.2155 1.0426c-0.33503 0.28762-0.29744 0.71812 0.083757 0.95964l4.642 2.9508-4.641 2.9518c-0.3812 0.24245-0.41771 0.67203-0.081609 0.96056l1.2123 1.0426c0.33503 0.28762 0.83542 0.25535 1.12-0.07006l3.4362-3.9842 3.4362 3.9815c0.28348 0.32818 0.7828 0.35952 1.1189 0.070982l1.2155-1.0408c0.3361-0.28854 0.29744-0.71904-0.083757-0.96149z" fill="#747E86"/>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m12 12.967-2.7672 3.3823-.24053 2.6503h6.0144l-.23409-2.7692-2.7726-3.2633zm5.6869.13275-4.6388-2.949 4.6388-2.9508c.3812-.24337.41771-.67295.081609-.96149l-1.2134-1.0426c-.33503-.28762-.83542-.25535-1.1189.071904l-3.4351 3.9833-3.4394-3.9833c-.28241-.32726-.7828-.35952-1.1178-.071904l-1.2155 1.0426c-.33503.28762-.29744.71812.083757.95964l4.642 2.9508-4.641 2.9518c-.3812.24245-.41771.67203-.081609.96056l1.2123 1.0426c.33503.28762.83542.25535 1.12-.07006l3.4362-3.9842 3.4362 3.9815c.28348.32818.7828.35952 1.1189.070982l1.2155-1.0408c.3361-.28854.29744-.71904-.083757-.96149z" fill="#9c6136"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/yoga-centre-m.svg b/data/styles/default/light/symbols/yoga-centre-m.svg
new file mode 100644
index 000000000..8d33aad9d
--- /dev/null
+++ b/data/styles/default/light/symbols/yoga-centre-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51ab8c" r="8.25"/><path d="m9 3.8034c-.71750073 0-1.29915.58164927-1.29915 1.29915s.58164927 1.29915 1.29915 1.29915 1.29915-.58164927 1.29915-1.29915-.58164927-1.29915-1.29915-1.29915zm-.33747 3.247875c-.38325 0-.747855.1693425-.994725.46815l-.8703 1.03905c-.94185 1.117275-2.18865 1.740675-3.643725 1.740675v1.29915c1.799325 0 3.371325-.759975 4.547025-2.1111v1.461525l-2.5209 1.007325c-.4352175.1753875-.7269375.6042075-.7269375 1.078425 0 .64308.5190525 1.162125 1.162125 1.162125h1.436175v-.3247875c0-.8964.7275225-1.6239 1.6239-1.6239h1.948725c.1818825 0 .3247875.142905.3247875.3247875s-.142905.3247875-.3247875.3247875h-1.948725c-.539145 0-.9744.4352175-.9744.9744v.3247875h4.68405c.64308 0 1.162125-.5190525 1.162125-1.162125 0-.4741875-.29175-.903075-.7269375-1.078425l-2.5209-1.007325v-1.461525c1.1757 1.351125 2.7477 2.1111 4.547025 2.1111v-1.29915c-1.455075 0-2.70195-.6233925-3.63735-1.740675l-.8703-1.03905c-.24684-.2988075-.611415-.46815-.99465-.46815z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/yoga-m.svg b/data/styles/default/light/symbols/yoga-m.svg
index bbb046a63..d79376e70 100644
--- a/data/styles/default/light/symbols/yoga-m.svg
+++ b/data/styles/default/light/symbols/yoga-m.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-	<circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#747E86"/>
-	<path d="m12 5.0712a1.7322 1.7322 0 0 0-1.7322 1.7322 1.7322 1.7322 0 0 0 1.7322 1.7322 1.7322 1.7322 0 0 0 1.7322-1.7322 1.7322 1.7322 0 0 0-1.7322-1.7322zm-0.44996 4.3305c-0.511 0-0.99714 0.22579-1.3263 0.6242l-1.1604 1.3854c-1.2558 1.4897-2.9182 2.3209-4.8583 2.3209v1.7322c2.3991 0 4.4951-1.0133 6.0627-2.8148v1.9487l-3.3612 1.3431c-0.58029 0.23385-0.96925 0.80561-0.96925 1.4379 0 0.85744 0.69207 1.5495 1.5495 1.5495h1.9149v-0.43305c0-1.1952 0.97003-2.1652 2.1652-2.1652h2.5983c0.24251 0 0.43305 0.19054 0.43305 0.43305s-0.19054 0.43305-0.43305 0.43305h-2.5983c-0.71886 0-1.2992 0.58029-1.2992 1.2992v0.43305h6.2454c0.85744 0 1.5495-0.69207 1.5495-1.5495 0-0.63225-0.389-1.2041-0.96925-1.4379l-3.3612-1.3431v-1.9487c1.5676 1.8015 3.6636 2.8148 6.0627 2.8148v-1.7322c-1.9401 0-3.6026-0.83119-4.8498-2.3209l-1.1604-1.3854c-0.32912-0.39841-0.81522-0.6242-1.3262-0.6242z" fill="#fff"/>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.000055 2.64855417c-.87694534 0-1.58785.71090466-1.58785 1.58785s.71090466 1.58785 1.58785 1.58785 1.58785-.71090466 1.58785-1.58785-.71090466-1.58785-1.58785-1.58785zm-.41246333 3.969625c-.46841667 0-.914045.20697416-1.215775.57218333l-1.0637 1.26995c-1.15115 1.36555833-2.67501667 2.1274917-4.45344167 2.1274917v1.58785c2.199175 0 4.12050833-.9288584 5.557475-2.58023337v1.78630837l-3.0811 1.231175c-.5319325.2143625-.88847917.7384758-.88847917 1.318075 0 .7859866.6343975 1.420375 1.420375 1.420375h1.755325v-.3969625c0-1.0956.88919417-1.9847667 1.98476667-1.9847667h2.381775c.2223008 0 .3969625.1746617.3969625.3969625s-.1746617.3969625-.3969625.3969625h-2.381775c-.658955 0-1.19093333.5319325-1.19093333 1.1909333v.3969625h5.72495003c.7859866 0 1.420375-.6343975 1.420375-1.420375 0-.5795625-.3565834-1.1037583-.8884792-1.318075l-3.0811-1.231175v-1.7863083c1.4369667 1.651375 3.3583 2.5802333 5.557475 2.5802333v-1.58785c-1.778425 0-3.3023833-.76192413-4.44565-2.12749163l-1.0637-1.26995c-.3016933-.36520917-.747285-.57218334-1.21568333-.57218334z" fill="#747E86"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/zoo-m.svg b/data/styles/default/light/symbols/zoo-m.svg
index 3900b9678..70ab3a6a1 100644
--- a/data/styles/default/light/symbols/zoo-m.svg
+++ b/data/styles/default/light/symbols/zoo-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>zoo-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="zoo-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#9C6136"/>
-   <path id="Path" d="m14.778 5c-1.4815 2.1538-1.692 3.9524-3.3333 5.3846-1.5679 1.368-4.4444 0.89837-4.4444 2.8718v0.71788c0 0.71798 0.74074 1.4011 0.74074 2.1538v0.71798c0 1.0769-0.37038 1.0769-0.74074 2.1538h0.74074l1.4815-2.1538v2.1538h1.1111v-4.3077h1.1111v4.3077h1.1111v-3.2308l1.1111 3.2308h0.74074l-1.1343-4.5096c0.43667-0.25825 0.39352-0.73565 0.39352-1.2339v-2.1538l1.6667-3.9488 1.6667 0.53846c0-0.050615-5.778e-4 -0.49754 0-0.53846 0 0-0.27057-0.26223-0.37037-0.35894l-1.8519-1.7949z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#EB785D" r="11"/><path d="m14.778 5c-1.4815 2.1538-1.692 3.9524-3.3333 5.3846-1.5679 1.368-4.4444.89837-4.4444 2.8718v.71788c0 .71798.74074 1.4011.74074 2.1538v.71798c0 1.0769-.37038 1.0769-.74074 2.1538h.74074l1.4815-2.1538v2.1538h1.1111v-4.3077h1.1111v4.3077h1.1111v-3.2308l1.1111 3.2308h.74074l-1.1343-4.5096c.43667-.25825.39352-.73565.39352-1.2339v-2.1538l1.6667-3.9488 1.6667.53846c0-.050615-.0005778-.49754 0-.53846 0 0-.27057-.26223-.37037-.35894l-1.8519-1.7949z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/zoo-s.svg b/data/styles/default/light/symbols/zoo-s.svg
index d933da677..a0d6d5737 100644
--- a/data/styles/default/light/symbols/zoo-s.svg
+++ b/data/styles/default/light/symbols/zoo-s.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>zoo-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="zoo-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#9C6136"/>
-   <path id="Path" d="m9.8519 3.3333c-0.98765 1.4359-1.128 2.6349-2.2222 3.5897-1.0453 0.91201-2.963 0.59891-2.963 1.9146v0.47858c0 0.47866 0.49383 0.93405 0.49383 1.4359v0.47866c0 0.71795-0.24692 0.71795-0.49383 1.4359h0.49383l0.98765-1.4359v1.4359h0.74074v-2.8718h0.74074v2.8718h0.74074v-2.1538l0.74074 2.1538h0.49383l-0.75618-3.0064c0.29111-0.17216 0.26235-0.49043 0.26235-0.82263v-1.4359l1.1111-2.6325 1.1111 0.35897c0-0.033744-3.852e-4 -0.33169 0-0.35897 0 0-0.18038-0.17482-0.24691-0.23929l-1.2346-1.1966z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="8" cy="8" fill="#fff" opacity=".6" r="8"/><circle cx="8" cy="8" fill="#EB785D" r="7.3333"/><path d="m9.8519 3.3333c-.98765 1.4359-1.128 2.6349-2.2222 3.5897-1.0453.91201-2.963.59891-2.963 1.9146v.47858c0 .47866.49383.93405.49383 1.4359v.47866c0 .71795-.24692.71795-.49383 1.4359h.49383l.98765-1.4359v1.4359h.74074v-2.8718h.74074v2.8718h.74074v-2.1538l.74074 2.1538h.49383l-.75618-3.0064c.29111-.17216.26235-.49043.26235-.82263v-1.4359l1.1111-2.6325 1.1111.35897c0-.033744-.0003852-.33169 0-.35897 0 0-.18038-.17482-.24691-.23929l-1.2346-1.1966z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 786089baa..e74d49303 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -42,7 +42,40 @@ leisure-playground                                  # area z15- (also has icon z
 === 200
 
 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre                               # area z13- (also has icon z17-, caption(optional) z17-)
+leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
+leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
 === 190
 
 amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
@@ -53,13 +86,14 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 
 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-fire_station                                # area z15- (also has icon z18-, caption(optional) z18-)
 amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-ranger_station                              # area z13- (also has icon z13-, caption(optional) z14-)
-amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z18-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
@@ -85,7 +119,7 @@ aeroway-terminal                                    # area z14- (also has captio
 === 150
 
 leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z17-, caption(optional) z17-)
+leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
 === 140
 
 landuse-flowerbed                                   # area z16-
@@ -193,7 +227,7 @@ amenity-clinic                                      # area z13- (also has icon z
 amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
 amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
 amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
 amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index ffca13ac8..7d1d6bab4 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -375,6 +375,9 @@ amenity-charging_station-motorcar                   # icon z14- (also has captio
 amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
+amenity-charging_station-motorcar-small             # icon z16- (also has caption(optional) z16-, area z15-)
+=== 4260
+
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250
 
@@ -748,7 +751,7 @@ piste:type-sled                                     # pathtext z15- (also has li
 piste:type-snow_park                                # caption z15- (also has area z13-)
 === 2770
 
-amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
+amenity-townhall                                    # icon z15- (also has caption(optional) z15-)
 leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
@@ -896,7 +899,7 @@ landuse-military-danger_area                        # icon z16- (also has captio
 
 amenity-sanitary_dump_station                       # icon z15- (also has caption(optional) z15-)
 leisure-golf_course                                 # icon z15- (also has caption(optional) z17-, area z12-)
-leisure-miniature_golf                              # icon z17- (also has caption(optional) z17-, area z14-)
+leisure-miniature_golf                              # icon z16- (also has caption(optional) z17-, area z14-)
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
 natural-wetland-fen                                 # caption z16- (also has area z11-)
@@ -917,6 +920,43 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
+leisure-sports_centre-sport-swimming                # icon z15- (also has caption(optional) z15-, area z13-)
+=== 1620
+
+leisure-fitness_centre-sport-yoga                   # icon z16- (also has caption(optional) z17-, area z16-)
+leisure-sports_centre-sport-american_football       # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-archery                 # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-athletics               # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-australian_football     # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-badminton               # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-baseball                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-basketball              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-beachvolleyball         # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-bowls                   # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-climbing                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-cricket                 # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-curling                 # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-equestrian              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-field_hockey            # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-futsal                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-golf                    # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-gymnastics              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-handball                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-ice_hockey              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-multi                   # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-padel                   # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-pelota                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-scuba_diving            # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-shooting                # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-skateboard              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-skiing                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-soccer                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-table_tennis            # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-tennis                  # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-volleyball              # icon z16- (also has caption(optional) z16-, area z13-)
+leisure-sports_centre-sport-yoga                    # icon z16- (also has caption(optional) z16-, area z13-)
+=== 1610
+
 amenity-animal_shelter                              # icon z17- (also has caption(optional) z17-)
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
@@ -925,7 +965,7 @@ amenity-driving_school                              # icon z17- (also has captio
 amenity-language_school                             # icon z17- (also has caption(optional) z17-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z17-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z18-, area z15-)
+amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -939,7 +979,7 @@ healthcare-optometrist                              # icon z17- (also has captio
 healthcare-physiotherapist                          # icon z17- (also has caption(optional) z17-)
 healthcare-sample_collection                        # icon z17- (also has caption(optional) z17-)
 leisure-escape_game                                 # icon z17- (also has caption(optional) z17-)
-leisure-fitness_centre                              # icon z17- (also has caption(optional) z17-)
+leisure-fitness_centre                              # icon z16- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
 office-estate_agent                                 # icon z18- (also has caption(optional) z18-)
@@ -1000,7 +1040,7 @@ shop-video_games                                    # icon z16- (also has captio
 
 aeroway-gate                                        # icon z17- (also has caption(optional) z17-)
 amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z13-)
-amenity-school                                      # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-school                                      # icon z16- (also has caption(optional) z16-, area z13-)
 amenity-studio                                      # icon z16- (also has caption(optional) z16-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
@@ -1067,12 +1107,12 @@ sport-soccer                                        # icon z17- (also has captio
 === 1300
 
 amenity-atm                                         # icon z18- (also has caption(optional) z18-)
-amenity-dojo                                        # icon z17- (also has caption(optional) z18-)
+amenity-dojo                                        # icon z16- (also has caption(optional) z18-)
 isoline-step_50                                     # pathtext z15- (also has line z13-)
 landuse-recreation_ground                           # caption z15- (also has area z12-)
-leisure-dance                                       # icon z17- (also has caption(optional) z17-)
+leisure-dance                                       # icon z16- (also has caption(optional) z17-)
 leisure-recreation_ground                           # caption z17-
-leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z13-)
+leisure-sports_centre                               # icon z16- (also has caption(optional) z16-, area z13-)
 leisure-sports_hall                                 # icon z17- (also has caption(optional) z17-)
 === 1250
 
@@ -1161,7 +1201,7 @@ leisure-amusement_arcade                            # icon z17- (also has captio
 office-company                                      # icon z18- (also has caption(optional) z18-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
-shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
+shop-agrarian                                       # icon z16- (also has caption(optional) z16-)
 shop-auction                                        # icon z18- (also has caption(optional) z18-)
 shop-bookmaker                                      # icon z18- (also has caption(optional) z18-)
 shop-carpet                                         # icon z18- (also has caption(optional) z18-)
@@ -1171,7 +1211,7 @@ shop-curtain                                        # icon z18- (also has captio
 shop-fabric                                         # icon z18- (also has caption(optional) z18-)
 shop-fishing                                        # icon z18- (also has caption(optional) z18-)
 shop-funeral_directors                              # icon z18- (also has caption(optional) z18-)
-shop-gas                                            # icon z18- (also has caption(optional) z18-)
+shop-gas                                            # icon z16- (also has caption(optional) z16-)
 shop-hearing_aids                                   # icon z18- (also has caption(optional) z18-)
 shop-herbalist                                      # icon z18- (also has caption(optional) z18-)
 shop-hifi                                           # icon z18- (also has caption(optional) z18-)
@@ -1180,7 +1220,7 @@ shop-medical_supply                                 # icon z18- (also has captio
 shop-outpost                                        # icon z18- (also has caption(optional) z18-)
 shop-pet_grooming                                   # icon z18- (also has caption(optional) z18-)
 shop-storage_rental                                 # icon z18- (also has caption(optional) z18-)
-shop-trade                                          # icon z18- (also has caption(optional) z18-)
+shop-trade                                          # icon z16- (also has caption(optional) z16-)
 shop-watches                                        # icon z18- (also has caption(optional) z18-)
 shop-wholesale                                      # icon z18- (also has caption(optional) z18-)
 === 500
@@ -1546,6 +1586,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
+# amenity-charging_station-motorcar-small           # caption(optional) z16- (also has icon z16-, area z15-)
+# === -5740
+
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750
 
@@ -1744,7 +1787,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # natural-rock                                      # caption(optional) z17- (also has icon z14-)
 # === -7150
 
-# amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
+# amenity-townhall                                  # caption(optional) z15- (also has icon z15-)
 # leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250
@@ -1883,10 +1926,47 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
 # leisure-golf_course                               # caption(optional) z17- (also has icon z15-, area z12-)
-# leisure-miniature_golf                            # caption(optional) z17- (also has icon z17-, area z14-)
+# leisure-miniature_golf                            # caption(optional) z17- (also has icon z16-, area z14-)
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200
 
+# leisure-sports_centre-sport-swimming              # caption(optional) z15- (also has icon z15-, area z13-)
+# === -8380
+
+# leisure-fitness_centre-sport-yoga                 # caption(optional) z17- (also has icon z16-, area z16-)
+# leisure-sports_centre-sport-american_football     # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-archery               # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-athletics             # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-australian_football   # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-badminton             # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-baseball              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-basketball            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-beachvolleyball       # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-bowls                 # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-climbing              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-cricket               # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-curling               # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-equestrian            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-field_hockey          # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-futsal                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-golf                  # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-gymnastics            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-handball              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-ice_hockey            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-multi                 # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-padel                 # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-pelota                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-scuba_diving          # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-shooting              # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-skateboard            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-skiing                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-soccer                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-table_tennis          # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-tennis                # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-volleyball            # caption(optional) z16- (also has icon z16-, area z13-)
+# leisure-sports_centre-sport-yoga                  # caption(optional) z16- (also has icon z16-, area z13-)
+# === -8390
+
 # amenity-animal_shelter                            # caption(optional) z17- (also has icon z17-)
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
@@ -1895,7 +1975,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-language_school                           # caption(optional) z17- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z17- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z18- (also has icon z17-, area z15-)
+# amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -1909,7 +1989,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-physiotherapist                        # caption(optional) z17- (also has icon z17-)
 # healthcare-sample_collection                      # caption(optional) z17- (also has icon z17-)
 # leisure-escape_game                               # caption(optional) z17- (also has icon z17-)
-# leisure-fitness_centre                            # caption(optional) z17- (also has icon z17-)
+# leisure-fitness_centre                            # caption(optional) z17- (also has icon z16-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
 # office-estate_agent                               # caption(optional) z18- (also has icon z18-)
@@ -1970,7 +2050,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # aeroway-gate                                      # caption(optional) z17- (also has icon z17-)
 # amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z13-)
-# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-school                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # amenity-studio                                    # caption(optional) z16- (also has icon z16-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
@@ -2036,9 +2116,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8700
 
 # amenity-atm                                       # caption(optional) z18- (also has icon z18-)
-# amenity-dojo                                      # caption(optional) z18- (also has icon z17-)
-# leisure-dance                                     # caption(optional) z17- (also has icon z17-)
-# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-dojo                                      # caption(optional) z18- (also has icon z16-)
+# leisure-dance                                     # caption(optional) z17- (also has icon z16-)
+# leisure-sports_centre                             # caption(optional) z16- (also has icon z16-, area z13-)
 # leisure-sports_hall                               # caption(optional) z17- (also has icon z17-)
 # === -8750
 
@@ -2109,7 +2189,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # office-company                                    # caption(optional) z18- (also has icon z18-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
-# shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
+# shop-agrarian                                     # caption(optional) z16- (also has icon z16-)
 # shop-auction                                      # caption(optional) z18- (also has icon z18-)
 # shop-bookmaker                                    # caption(optional) z18- (also has icon z18-)
 # shop-carpet                                       # caption(optional) z18- (also has icon z18-)
@@ -2119,7 +2199,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-fabric                                       # caption(optional) z18- (also has icon z18-)
 # shop-fishing                                      # caption(optional) z18- (also has icon z18-)
 # shop-funeral_directors                            # caption(optional) z18- (also has icon z18-)
-# shop-gas                                          # caption(optional) z18- (also has icon z18-)
+# shop-gas                                          # caption(optional) z16- (also has icon z16-)
 # shop-hearing_aids                                 # caption(optional) z18- (also has icon z18-)
 # shop-herbalist                                    # caption(optional) z18- (also has icon z18-)
 # shop-hifi                                         # caption(optional) z18- (also has icon z18-)
@@ -2128,7 +2208,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-outpost                                      # caption(optional) z18- (also has icon z18-)
 # shop-pet_grooming                                 # caption(optional) z18- (also has icon z18-)
 # shop-storage_rental                               # caption(optional) z18- (also has icon z18-)
-# shop-trade                                        # caption(optional) z18- (also has icon z18-)
+# shop-trade                                        # caption(optional) z16- (also has icon z16-)
 # shop-watches                                      # caption(optional) z18- (also has icon z18-)
 # shop-wholesale                                    # caption(optional) z18- (also has icon z18-)
 # === -9500
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 08df22b19..b5037e9cc 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -593,7 +593,10 @@ area|z14-[highway=rest_area],
 node|z12-[amenity=fuel],
 area|z13-[highway=services],
 area|z14-[highway=rest_area],
-node|z14-[amenity=charging_station][motorcar?],
+node|z14-[amenity=charging_station][motorcar?][!capacity],
+node|z14-[amenity=charging_station][motorcar?][capacity=1],
+node|z14-[amenity=charging_station][motorcar?][capacity=2],
+node|z14-[amenity=charging_station][motorcar?][capacity?],
 node|z15-[amenity=sanitary_dump_station],
 node|z16-[amenity=charging_station],
 node|z16-[amenity=parking],
@@ -622,16 +625,25 @@ node|z17[amenity=fuel],
 node|z18-[amenity=fuel],
 {icon-image: fuel-m.svg;font-size: 14.5;}
 
-node|z14[amenity=charging_station][motorcar?],
-{icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
+node|z14-[amenity=charging_station][motorcar?][!capacity],
+node|z14-[amenity=charging_station][motorcar?][capacity=1],
+node|z14-[amenity=charging_station][motorcar?][capacity=2],
+node|z16-[amenity=charging_station],
+{icon-image: charging-point-m.svg;}
+
+node|z14-[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging-station-m.svg;}
+
+node|z14[amenity=charging_station][motorcar?][capacity?],
+{text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
-{icon-image: charging-station-m.svg;icon-min-distance: 20;font-size: 12.5;}
+{icon-min-distance: 20;font-size: 12.5;}
 node|z16[amenity=charging_station],
-{icon-image: charging-station-m.svg;icon-min-distance: 10;font-size: 12.75;}
+{icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=charging_station],
-{icon-image: charging-station-m.svg; font-size: 13.75;}
+{font-size: 13.75;}
 node|z18-[amenity=charging_station],
-{icon-image: charging-station-m.svg;font-size: 14.75;}
+{font-size: 14.75;}
 
 area|z12[highway=services],
 {icon-image: car-repair-s.svg; icon-min-distance: 20;}
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index 7fad027b4..156c124e2 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -33,6 +33,7 @@ amenity-parking-street_side-private                 # area z15- (also has icon z
 
 amenity-car_wash                                    # area z17- (also has icon z17-, caption(optional) z17-)
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
 amenity-vehicle_inspection                          # area z17- (also has icon z17-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z14-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index fc46152de..bfe87f886 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -174,6 +174,9 @@ amenity-charging_station-motorcar                   # icon z14- (also has captio
 amenity-fuel                                        # icon z12- (also has caption(optional) z12-, area z15-)
 === 3200
 
+amenity-charging_station-motorcar-small             # icon z16- (also has caption(optional) z16-, area z15-)
+=== 3190
+
 amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
 amenity-vending_machine-fuel                        # icon z17- (also has caption(optional) z17-)
 === 3150
@@ -773,6 +776,9 @@ entrance-main                                       # icon z18- (also has captio
 # amenity-fuel                                      # caption(optional) z12- (also has icon z12-, area z15-)
 # === -6800
 
+# amenity-charging_station-motorcar-small           # caption(optional) z16- (also has icon z16-, area z15-)
+# === -6810
+
 # amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
 # amenity-vending_machine-fuel                      # caption(optional) z17- (also has icon z17-)
 # === -6850
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index 38f7e04aa..e173d21fd 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -43,6 +43,7 @@
 "type.amenity.charging_station" = "Ladestation";
 "type.amenity.charging_station.bicycle" = "Fahrrad-Ladestation";
 "type.amenity.charging_station.motorcar" = "Kfz-Ladestation";
+"type.amenity.charging_station.motorcar.small" = "Kfz-Ladepunkt";
 "type.amenity.childcare" = "Kindertagesstätte";
 "type.amenity.cinema" = "Kino";
 "type.leisure.bowling_alley" = "Bowlingbahn";
@@ -715,8 +716,39 @@
 "type.leisure.sauna" = "Sauna";
 "type.leisure.slipway" = "Bootsrampe";
 "type.leisure.sports_centre" = "Sportzentrum";
-"type.sport.climbing" = "Kletterhalle";
-"type.sport.yoga" = "Yoga Studio";
+"type.leisure.sports_centre.sport.multi" = "Sportzentrum";
+"type.leisure.sports_centre.sport.american_football" = "Sportzentrum";
+"type.leisure.sports_centre.sport.archery" = "Sportzentrum";
+"type.leisure.sports_centre.sport.athletics" = "Sportzentrume";
+"type.leisure.sports_centre.sport.australian_football" = "Sportzentrum";
+"type.leisure.sports_centre.sport.badminton" = "Sportzentrum";
+"type.leisure.sports_centre.sport.baseball" = "Sportzentrum";
+"type.leisure.sports_centre.sport.basketball" = "Sportzentrum";
+"type.leisure.sports_centre.sport.beachvolleyball" = "Sportzentrum";
+"type.leisure.sports_centre.sport.bowls" = "Sportzentrum";
+"type.leisure.sports_centre.sport.climbing" = "Sportzentrum";
+"type.leisure.sports_centre.sport.cricket" = "Sportzentrum";
+"type.leisure.sports_centre.sport.curling" = "Sportzentrum";
+"type.leisure.sports_centre.sport.equestrian" = "Sportzentrum";
+"type.leisure.sports_centre.sport.field_hockey" = "Sportzentrum";
+"type.leisure.sports_centre.sport.futsal" = "Sportzentrum";
+"type.leisure.sports_centre.sport.golf" = "Sportzentrum";
+"type.leisure.sports_centre.sport.gymnastics" = "Sportzentrum";
+"type.leisure.sports_centre.sport.handball" = "Sportzentrum";
+"type.leisure.sports_centre.sport.ice_hockey" = "Sportzentrum";
+"type.leisure.sports_centre.sport.padel" = "Sportzentrum";
+"type.leisure.sports_centre.sport.pelota" = "Sportzentrum";
+"type.leisure.sports_centre.sport.scuba_diving" = "Sportzentrum";
+"type.leisure.sports_centre.sport.shooting" = "Sportzentrum";
+"type.leisure.sports_centre.sport.skateboard" = "Sportzentrum";
+"type.leisure.sports_centre.sport.skiing" = "Sportzentrum";
+"type.leisure.sports_centre.sport.soccer" = "Sportzentrum";
+"type.leisure.sports_centre.sport.swimming" = "Schwimmbad";
+"type.leisure.sports_centre.sport.table_tennis" = "Sportzentrum";
+"type.leisure.sports_centre.sport.tennis" = "Sportzentrum";
+"type.leisure.sports_centre.sport.volleyball" = "Sportzentrum";
+"type.leisure.sports_centre.sport.yoga" = "Sportzentrum";
+"type.leisure.fitness_centre.sport.yoga" = "Yoga-Studio";
 "type.leisure.stadium" = "Stadion";
 "type.leisure.swimming_pool" = "Schwimmbecken";
 "type.leisure.swimming_pool.private" = "Schwimmbecken";
@@ -1307,24 +1339,32 @@
 "type.shop.watches" = "Uhrengeschäft";
 "type.shop.wholesale" = "Großhandelsgeschäft";
 "type.sport" = "Sport";
+"type.sport.multi" = "Verschiedene Sportarten";
+"type.sport.9pin" = "Kegeln";
+"type.sport.10pin" = "Bowling";
 "type.sport.american_football" = "American Football";
 "type.sport.archery" = "Bogenschießen";
 "type.sport.athletics" = "Leichtathletik";
 "type.sport.australian_football" = "Australian Football";
+"type.sport.badminton" = "Badminton";
 "type.sport.baseball" = "Baseball";
 "type.sport.basketball" = "Basketball";
 "type.sport.beachvolleyball" = "Beachvolleyball";
 "type.sport.bowls" = "Bowls";
 "type.sport.chess" = "Schach";
+"type.sport.climbing" = "Klettern";
 "type.sport.cricket" = "Cricket";
 "type.sport.curling" = "Curling";
+"type.sport.diving" = "Turmspringen";
 "type.sport.equestrian" = "Reitsport";
+"type.sport.field_hockey" = "Feldhockey";
+"type.sport.futsal" = "Futsal";
 "type.sport.golf" = "Golf";
 "type.sport.gymnastics" = "Gymnastik";
 "type.sport.handball" = "Handball";
-"type.sport.multi" = "Verschiedene Sportarten";
-
-/* Used to tag a scuba diving site. */
+"type.sport.ice_hockey" = "Eishockey";
+"type.sport.padel" = "Padel";
+"type.sport.pelota" = "Pelota Vasca";
 "type.sport.scuba_diving" = "Gerätetauchen";
 "type.sport.shooting" = "Schießen";
 "type.sport.skateboard" = "Skateboarden";
@@ -1332,16 +1372,9 @@
 "type.sport.soccer" = "Fußball";
 "type.sport.swimming" = "Schwimmen";
 "type.sport.table_tennis" = "Tischtennis";
-"type.sport.tennis" = "Tennisplatz";
+"type.sport.tennis" = "Tennis";
 "type.sport.volleyball" = "Volleyball";
-"type.sport.10pin" = "Bowling";
-"type.sport.9pin" = "Kegeln";
-"type.sport.padel" = "Padel";
-"type.sport.futsal" = "Futsal";
-"type.sport.ice_hockey" = "Eishockey";
-"type.sport.field_hockey" = "Feldhockey";
-"type.sport.badminton" = "Badminton";
-"type.sport.pelota" = "Pelota Vasca";
+"type.sport.yoga" = "Yoga";
 "type.tourism" = "Tourismus";
 "type.tourism.aquarium" = "Aquarium";
 
@@ -1468,7 +1501,6 @@
 "type.landuse.plant_nursery" = "Gärtnerei";
 "type.leisure.firepit" = "Feuerstelle";
 "type.amenity.studio" = "Studio";
-"type.sport.diving" = "Turmspringen";
 "type.man_made.crane" = "Kran";
 "type.railway.station.subway.qingdao" = "U-Bahn-Station";
 "type.natural.wetland.saltmarsh" = "Salzmarsch";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index ce47851fa..3b5718a47 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -43,6 +43,7 @@
 "type.amenity.charging_station" = "Charging Station";
 "type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
 "type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";
@@ -716,8 +717,39 @@
 "type.leisure.sauna" = "Sauna";
 "type.leisure.slipway" = "Slipway";
 "type.leisure.sports_centre" = "Sports Centre";
-"type.sport.climbing" = "Climbing Centre";
-"type.sport.yoga" = "Yoga Studio";
+"type.leisure.sports_centre.sport.multi" = "Sports Centre";
+"type.leisure.sports_centre.sport.american_football" = "Sports Centre";
+"type.leisure.sports_centre.sport.archery" = "Sports Centre";
+"type.leisure.sports_centre.sport.athletics" = "Sports Centre";
+"type.leisure.sports_centre.sport.australian_football" = "Sports Centre";
+"type.leisure.sports_centre.sport.badminton" = "Sports Centre";
+"type.leisure.sports_centre.sport.baseball" = "Sports Centre";
+"type.leisure.sports_centre.sport.basketball" = "Sports Centre";
+"type.leisure.sports_centre.sport.beachvolleyball" = "Sports Centre";
+"type.leisure.sports_centre.sport.bowls" = "Sports Centre";
+"type.leisure.sports_centre.sport.climbing" = "Sports Centre";
+"type.leisure.sports_centre.sport.cricket" = "Sports Centre";
+"type.leisure.sports_centre.sport.curling" = "Sports Centre";
+"type.leisure.sports_centre.sport.equestrian" = "Sports Centre";
+"type.leisure.sports_centre.sport.field_hockey" = "Sports Centre";
+"type.leisure.sports_centre.sport.futsal" = "Sports Centre";
+"type.leisure.sports_centre.sport.golf" = "Sports Centre";
+"type.leisure.sports_centre.sport.gymnastics" = "Sports Centre";
+"type.leisure.sports_centre.sport.handball" = "Sports Centre";
+"type.leisure.sports_centre.sport.ice_hockey" = "Sports Centre";
+"type.leisure.sports_centre.sport.padel" = "Sports Centre";
+"type.leisure.sports_centre.sport.pelota" = "Sports Centre";
+"type.leisure.sports_centre.sport.scuba_diving" = "Sports Centre";
+"type.leisure.sports_centre.sport.shooting" = "Sports Centre";
+"type.leisure.sports_centre.sport.skateboard" = "Sports Centre";
+"type.leisure.sports_centre.sport.skiing" = "Sports Centre";
+"type.leisure.sports_centre.sport.soccer" = "Sports Centre";
+"type.leisure.sports_centre.sport.swimming" = "Swimming Centre";
+"type.leisure.sports_centre.sport.table_tennis" = "Sports Centre";
+"type.leisure.sports_centre.sport.tennis" = "Sports Centre";
+"type.leisure.sports_centre.sport.volleyball" = "Sports Centre";
+"type.leisure.sports_centre.sport.yoga" = "Sports Centre";
+"type.leisure.fitness_centre.sport.yoga" = "Yoga Studio";
 "type.leisure.stadium" = "Stadium";
 "type.leisure.swimming_pool" = "Swimming Pool";
 "type.leisure.swimming_pool.private" = "Swimming Pool";
@@ -1308,41 +1340,41 @@
 "type.shop.watches" = "Watch Shop";
 "type.shop.wholesale" = "Wholesale Shop";
 "type.sport" = "Sport";
+"type.sport.9pin" = "Bowling";
+"type.sport.10pin" = "Bowling";
 "type.sport.american_football" = "American Football";
 "type.sport.archery" = "Archery";
 "type.sport.athletics" = "Athletics";
 "type.sport.australian_football" = "Australian Football";
+"type.sport.badminton" = "Badminton";
 "type.sport.baseball" = "Baseball";
 "type.sport.basketball" = "Basketball";
 "type.sport.beachvolleyball" = "Beach Volleyball";
 "type.sport.bowls" = "Bowls";
 "type.sport.chess" = "Chess";
+"type.sport.climbing" = "Climbing";
 "type.sport.cricket" = "Cricket";
 "type.sport.curling" = "Curling";
+"type.sport.diving" = "High Diving";
 "type.sport.equestrian" = "Equestrian Sports";
+"type.sport.field_hockey" = "Field Hockey";
+"type.sport.futsal" = "Futsal";
 "type.sport.golf" = "Golf";
 "type.sport.gymnastics" = "Gymnastics";
 "type.sport.handball" = "Handball";
-"type.sport.multi" = "Various Sports";
-
-/* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
+"type.sport.ice_hockey" = "Ice Hockey";
+"type.sport.padel" = "Padel";
+"type.sport.pelota" = "Basque Pelota";
+"type.sport.scuba_diving" = "Scuba Diving";
 "type.sport.shooting" = "Shooting";
 "type.sport.skateboard" = "Skateboarding";
 "type.sport.skiing" = "Skiing";
-"type.sport.soccer" = "Football";
+"type.sport.soccer" = "Soccer";
 "type.sport.swimming" = "Swimming";
 "type.sport.table_tennis" = "Table Tennis";
-"type.sport.tennis" = "Tennis Court";
+"type.sport.tennis" = "Tennis";
 "type.sport.volleyball" = "Volleyball";
-"type.sport.10pin" = "Bowling";
-"type.sport.9pin" = "Bowling";
-"type.sport.padel" = "Padel";
-"type.sport.futsal" = "Futsal";
-"type.sport.ice_hockey" = "Ice Hockey";
-"type.sport.field_hockey" = "Field Hockey";
-"type.sport.badminton" = "Badminton";
-"type.sport.pelota" = "Basque Pelota";
+"type.sport.yoga" = "Yoga";
 "type.tourism" = "Tourism";
 "type.tourism.aquarium" = "Aquarium";
 
@@ -1467,7 +1499,6 @@
 "type.railway.station.subway.qingdao" = "Subway Station";
 "type.leisure.firepit" = "Firepit";
 "type.natural.wetland.tidalflat" = "Tidal Flat";
-"type.sport.diving" = "High Diving";
 "type.highway.ladder" = "Ladder";
 "type.natural.wetland.swamp" = "Swamp";
 "type.man_made.crane" = "Crane";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index a3e1d5f3c..82b408ef6 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -50,6 +50,7 @@
 "type.amenity.charging_station" = "Charging Station";
 "type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
 "type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";
@@ -746,9 +747,40 @@
 "type.leisure.recreation_ground" = "Recreation Ground";
 "type.leisure.sauna" = "Sauna";
 "type.leisure.slipway" = "Slipway";
-"type.leisure.sports_centre" = "Sports Center";
-"type.sport.climbing" = "Climbing Centre";
-"type.sport.yoga" = "Yoga Studio";
+"type.leisure.sports_centre" = "Sports Centre";
+"type.leisure.sports_centre.sport.multi" = "Sports Centre";
+"type.leisure.sports_centre.sport.american_football" = "Sports Centre";
+"type.leisure.sports_centre.sport.archery" = "Sports Centre";
+"type.leisure.sports_centre.sport.athletics" = "Sports Centre";
+"type.leisure.sports_centre.sport.australian_football" = "Sports Centre";
+"type.leisure.sports_centre.sport.badminton" = "Sports Centre";
+"type.leisure.sports_centre.sport.baseball" = "Sports Centre";
+"type.leisure.sports_centre.sport.basketball" = "Sports Centre";
+"type.leisure.sports_centre.sport.beachvolleyball" = "Sports Centre";
+"type.leisure.sports_centre.sport.bowls" = "Sports Centre";
+"type.leisure.sports_centre.sport.climbing" = "Sports Centre";
+"type.leisure.sports_centre.sport.cricket" = "Sports Centre";
+"type.leisure.sports_centre.sport.curling" = "Sports Centre";
+"type.leisure.sports_centre.sport.equestrian" = "Sports Centre";
+"type.leisure.sports_centre.sport.field_hockey" = "Sports Centre";
+"type.leisure.sports_centre.sport.futsal" = "Sports Centre";
+"type.leisure.sports_centre.sport.golf" = "Sports Centre";
+"type.leisure.sports_centre.sport.gymnastics" = "Sports Centre";
+"type.leisure.sports_centre.sport.handball" = "Sports Centre";
+"type.leisure.sports_centre.sport.ice_hockey" = "Sports Centre";
+"type.leisure.sports_centre.sport.padel" = "Sports Centre";
+"type.leisure.sports_centre.sport.pelota" = "Sports Centre";
+"type.leisure.sports_centre.sport.scuba_diving" = "Sports Centre";
+"type.leisure.sports_centre.sport.shooting" = "Sports Centre";
+"type.leisure.sports_centre.sport.skateboard" = "Sports Centre";
+"type.leisure.sports_centre.sport.skiing" = "Sports Centre";
+"type.leisure.sports_centre.sport.soccer" = "Sports Centre";
+"type.leisure.sports_centre.sport.swimming" = "Swimming Centre";
+"type.leisure.sports_centre.sport.table_tennis" = "Sports Centre";
+"type.leisure.sports_centre.sport.tennis" = "Sports Centre";
+"type.leisure.sports_centre.sport.volleyball" = "Sports Centre";
+"type.leisure.sports_centre.sport.yoga" = "Sports Centre";
+"type.leisure.fitness_centre.sport.yoga" = "Yoga Studio";
 "type.leisure.stadium" = "Stadium";
 "type.leisure.swimming_pool" = "Swimming Pool";
 "type.leisure.swimming_pool.private" = "Swimming Pool";
@@ -1349,43 +1381,43 @@
 "type.shop.wholesale" = "Wholesale Store";
 "type.shop.lighting" = "Lighting Shop";
 "type.sport" = "Sport";
+"type.sport.multi" = "Various Sports";
+"type.sport.9pin" = "Bowling";
+"type.sport.10pin" = "Bowling";
 "type.sport.american_football" = "American Football";
 "type.sport.archery" = "Archery";
 "type.sport.athletics" = "Athletics";
 "type.sport.australian_football" = "Australian Football";
+"type.sport.badminton" = "Badminton";
 "type.sport.baseball" = "Baseball";
 "type.sport.basketball" = "Basketball";
 "type.sport.beachvolleyball" = "Beach Volleyball";
 "type.sport.bowls" = "Bowls";
 "type.sport.chess" = "Chess";
+"type.sport.climbing" = "Climbing";
 "type.sport.cricket" = "Cricket";
 "type.sport.curling" = "Curling";
+"type.sport.diving" = "High Diving";
 "type.sport.equestrian" = "Equestrian Sports";
+"type.sport.field_hockey" = "Field Hockey";
+"type.sport.futsal" = "Futsal";
 "type.sport.golf" = "Golf";
 "type.sport.gymnastics" = "Gymnastics";
 "type.sport.handball" = "Handball";
-"type.sport.multi" = "Various Sports";
-
-/* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
-/* Used for high diving sites. */
-"type.sport.diving" = "High Diving";
+"type.sport.ice_hockey" = "Ice Hockey";
+"type.sport.padel" = "Padel";
+"type.sport.pelota" = "Basque Pelota";
+"type.sport.scuba_diving" = "Scuba Diving";
 "type.sport.shooting" = "Shooting";
 "type.sport.skateboard" = "Skateboarding";
 "type.sport.skiing" = "Skiing";
 "type.sport.soccer" = "Soccer";
 "type.sport.swimming" = "Swimming";
 "type.sport.table_tennis" = "Table Tennis";
-"type.sport.tennis" = "Tennis Court";
+"type.sport.tennis" = "Tennis";
 "type.sport.volleyball" = "Volleyball";
-"type.sport.10pin" = "Bowling";
-"type.sport.9pin" = "Bowling";
-"type.sport.padel" = "Padel";
-"type.sport.futsal" = "Futsal";
-"type.sport.ice_hockey" = "Ice Hockey";
-"type.sport.field_hockey" = "Field Hockey";
-"type.sport.badminton" = "Badminton";
-"type.sport.pelota" = "Basque Pelota";
+"type.sport.yoga" = "Yoga";
+
 "type.tourism" = "Tourism";
 "type.tourism.aquarium" = "Aquarium";