diff --git a/data/categories-strings/es.json/localize.json b/data/categories-strings/es.json/localize.json
index c7ababbb9..91f10deed 100644
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -225,11 +225,11 @@
"tourism-alpine_hut|@category_hotel": "4Cabaña|cabaña alpina|hotel de montaña",
"shop-hairdresser": "4Peluquería",
"aeroway-aerodrome": "3Aeropuerto|3avión|aeródromo",
-"leisure-stadium": "5Estadio",
-"leisure-playground|@category_children": "Patio de recreo|4Parque infantil|Corral|Corralito",
-"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-stadium": "5Estadio|4deporte",
+"leisure-playground|@category_children": "Patio de recreo|Parque infantil",
+"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|deporte",
+"leisure-golf_course": "Campo de golf",
+"leisure-miniature_golf": "Minigolf",
"leisure-escape_game": "Escape room|Sala de escape|Cuarto de escape",
"leisure-hackerspace": "Espacio hacker|Espacio para hackers|Hacklab|Hackerspace",
"leisure-pitch": "pista|deporte|cancha|campo",
diff --git a/data/categories-strings/fr.json/localize.json b/data/categories-strings/fr.json/localize.json
index 8b1404b0e..d2b434522 100644
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -224,7 +224,7 @@
"leisure-stadium": "4Stade|4sport",
"leisure-playground|@category_children": "Terrain de jeu|aire de jeu",
"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|Parcours de golf",
+"leisure-golf_course": "Terrain de golf",
"leisure-miniature_golf": "Minigolf",
"leisure-escape_game": "Salle d'évasion",
"leisure-pitch": "Terrain de sport|sport",
diff --git a/data/categories-strings/hu.json/localize.json b/data/categories-strings/hu.json/localize.json
index a6ab6b852..c012da0b6 100644
--- a/data/categories-strings/hu.json/localize.json
+++ b/data/categories-strings/hu.json/localize.json
@@ -210,7 +210,7 @@
"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|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-golf_course": "Golfpálya",
"leisure-miniature_golf": "Minigolf",
"leisure-escape_game": "Szabadulószoba",
"leisure-pitch": "4Sportpálya|sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F3C9|U+1F3C3",
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index c56baccb8..2bd5c8c69 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -441,15 +441,17 @@ node|z18-[historic=stone],
node|z12-14[historic=fort],
node|z12-14[historic=castle],
-{icon-image: remains-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: castle-s.svg;text-offset: 1;icon-min-distance: 12;}
node|z15[historic=fort],
node|z15[historic=castle],
-{icon-image: remains-m.svg;icon-min-distance: 5;}
+{icon-image: castle-m.svg;icon-min-distance: 5;}
node|z16[historic=fort],
node|z16[historic=castle],
-{icon-image: remains-m.svg;text-offset: 1;}
+{icon-image: castle-m.svg;text-offset: 1;}
node|z17-[historic=fort],
node|z17-[historic=castle],
+{icon-image: castle-m.svg;}
+node|z17-[historic=ruins][name],
{icon-image: remains-m.svg;}
node|z12-14[historic=castle][castle_type=castrum],
@@ -1457,7 +1459,7 @@ 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;}
diff --git a/data/styles/default/light/symbols/america-football-m.svg b/data/styles/default/light/symbols/america-football-m.svg
index 32ab666c0..e7f537dd9 100644
--- a/data/styles/default/light/symbols/america-football-m.svg
+++ b/data/styles/default/light/symbols/america-football-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 50c3ab1dc..4bf204a36 100644
--- a/data/styles/default/light/symbols/animal-m.svg
+++ b/data/styles/default/light/symbols/animal-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 248fb86e1..41f85500e 100644
--- a/data/styles/default/light/symbols/archery-m.svg
+++ b/data/styles/default/light/symbols/archery-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 80c69aa83..0a804cbdd 100644
--- a/data/styles/default/light/symbols/australian-football-m.svg
+++ b/data/styles/default/light/symbols/australian-football-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 a7744e2cd..4e717e446 100644
--- a/data/styles/default/light/symbols/badminton-m.svg
+++ b/data/styles/default/light/symbols/badminton-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 68fd292e9..2718a2042 100644
--- a/data/styles/default/light/symbols/baseball-m.svg
+++ b/data/styles/default/light/symbols/baseball-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 26146314e..08f5554c2 100644
--- a/data/styles/default/light/symbols/basketball-m.svg
+++ b/data/styles/default/light/symbols/basketball-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bowling-m.svg b/data/styles/default/light/symbols/bowling-m.svg
index 0451bd00e..8ac67d479 100644
--- a/data/styles/default/light/symbols/bowling-m.svg
+++ b/data/styles/default/light/symbols/bowling-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 b3c936651..72da2afce 100644
--- a/data/styles/default/light/symbols/climbing-m.svg
+++ b/data/styles/default/light/symbols/climbing-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 097ad7cdc..c5f00072f 100644
--- a/data/styles/default/light/symbols/cricket-m.svg
+++ b/data/styles/default/light/symbols/cricket-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 3e1bd7ef0..2e52b6107 100644
--- a/data/styles/default/light/symbols/curling-m.svg
+++ b/data/styles/default/light/symbols/curling-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 9ebb14d86..a5fc53db7 100644
--- a/data/styles/default/light/symbols/equestrian-m.svg
+++ b/data/styles/default/light/symbols/equestrian-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 75396b351..33085db31 100644
--- a/data/styles/default/light/symbols/golf-m.svg
+++ b/data/styles/default/light/symbols/golf-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 55cfab631..01d7a9f0f 100644
--- a/data/styles/default/light/symbols/handball-m.svg
+++ b/data/styles/default/light/symbols/handball-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 8aac10e90..cdb337b27 100644
--- a/data/styles/default/light/symbols/hockey-m.svg
+++ b/data/styles/default/light/symbols/hockey-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 637616a8a..c7e2ae028 100644
--- a/data/styles/default/light/symbols/martial-arts-m.svg
+++ b/data/styles/default/light/symbols/martial-arts-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 73423955b..6da9ff03f 100644
--- a/data/styles/default/light/symbols/padel-m.svg
+++ b/data/styles/default/light/symbols/padel-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 4901850dc..856b9d6d1 100644
--- a/data/styles/default/light/symbols/pelota-m.svg
+++ b/data/styles/default/light/symbols/pelota-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 75358ab88..1c86d9fde 100644
--- a/data/styles/default/light/symbols/pitch-m.svg
+++ b/data/styles/default/light/symbols/pitch-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/shower-m.svg b/data/styles/default/light/symbols/shower-m.svg
index fde2e4934..0bc0ab09b 100644
--- a/data/styles/default/light/symbols/shower-m.svg
+++ b/data/styles/default/light/symbols/shower-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 4fd7a99d2..a8aab0d1a 100644
--- a/data/styles/default/light/symbols/skateboard-m.svg
+++ b/data/styles/default/light/symbols/skateboard-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 2de774ea4..a33af2e4b 100644
--- a/data/styles/default/light/symbols/skiing-m.svg
+++ b/data/styles/default/light/symbols/skiing-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 b2e239dfe..9c14bcbf4 100644
--- a/data/styles/default/light/symbols/soccer-m.svg
+++ b/data/styles/default/light/symbols/soccer-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 6759f2c97..20aad7570 100644
--- a/data/styles/default/light/symbols/table-tennis-m.svg
+++ b/data/styles/default/light/symbols/table-tennis-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 b0cc72036..cf834bc2e 100644
--- a/data/styles/default/light/symbols/tennis-m.svg
+++ b/data/styles/default/light/symbols/tennis-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 780e100a4..083b63693 100644
--- a/data/styles/default/light/symbols/volleyball-m.svg
+++ b/data/styles/default/light/symbols/volleyball-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ 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 82973881e..d79376e70 100644
--- a/data/styles/default/light/symbols/yoga-m.svg
+++ b/data/styles/default/light/symbols/yoga-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index e9ea9ab3b..dfbd801e4 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -722,7 +722,7 @@
"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" = "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";
@@ -1503,7 +1503,7 @@
"type.highway.ladder" = "Leiter";
"type.landuse.plant_nursery" = "Gärtnerei";
"type.leisure.firepit" = "Feuerstelle";
-"type.amenity.studio" = "Medienstudio";
+"type.amenity.studio" = "Studio";
"type.man_made.crane" = "Kran";
"type.railway.station.subway.qingdao" = "U-Bahn-Station";
"type.natural.wetland.saltmarsh" = "Salzmarsch";