diff --git a/data/categories.txt b/data/categories.txt
index db5c709bf9..b646e94ac7 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10823,9 +10823,9 @@ zh-Hant:啤酒花園
amenity-driving_school
en:4Driving School
-ru:4Автошкола|курсы вождения
-bg:4Автошкола|шофьорски курсове
ar:مدرسة قيادة
+be:Аўташкола
+bg:4Автошкола|шофьорски курсове
cs:4Autoškola
da:Køreskole
de:Fahrschule
@@ -10844,6 +10844,7 @@ nl:Rijschool
pl:Szkoła jazdy
pt:Escola de condução
pt-BR:4Autoescola|CFC
+ru:4Автошкола|курсы вождения
ro:Școală de șoferi
sk:4Autoškola
sv:Körskola
@@ -10857,6 +10858,78 @@ zh-Hant:駕訓班
fa:اموزشگاه رانندگی
mr:चालकशाळा|ड्रायव्हिंग स्कूल
+amenity-music_school
+en:Music School
+ar:ﻰﻘﻴﺳﻮﻣ ﺔﺳﺭﺪﻣ
+be:Музычная школа
+bg:Музикално училище
+cs:Hudební škola
+da:Musikskolen
+de:Musikschule
+el:Μουσική Σχολή
+es:Escuela de música
+eu:Musika Eskola
+fa:ﯽﻘﯿﺳﻮﻣ ﻩﺎﮕﺷﺯﻮﻣﺁ
+fi:Musiikkikoulu
+fr:École de musique
+he:הקיזומל רפס תיב
+hu:Zeneiskola
+id:Sekolah musik
+it:Scuola di Musica
+ja:音楽学校
+ko:음악 학교
+nb:Musikkskole
+nl:Muziekschool
+pl:Szkoła Muzyczna
+pt:Escola de música
+ro:Scoala de Muzica
+ru:Музыкальная школа
+sk:Hudobná škola
+sv:Musikskola
+sw:Shule ya Muziki
+th:โรงเรียนดนตรี
+tr:Müzik Okulu
+uk:Музична школа ім
+vi:Trường âm nhạc
+zh-Hans:音乐学校
+zh-Hant:音樂學校
+
+amenity-language_school
+en:Language School
+ar:ﺔﻐﻟ ﺔﺳﺭﺪﻣ
+be:Моўная школа
+bg:Езиково училище
+cs:Jazyková škola
+da:Sprogskole
+de:Sprachschule
+el:Σχολή Γλωσσών
+es:Escuela de idiomas
+eu:Hizkuntza Eskola
+fa:ﻥﺎﺑﺯ ﻪﺳﺭﺪﻣ
+fi:Kielikoulu
+fr:École de langue
+he:תופשל רפס תיב
+hu:Nyelviskola
+id:Sekolah bahasa
+it:Scuola di lingue
+ja:語学学校
+ko:언어 학교
+nb:Språkskole
+nl:Taalschool
+pl:Szkoła językowa
+pt:Escola de idiomas
+ro:Școala de limbi străine
+ru:Языковая школа
+sk:Jazyková škola
+sv:Språkskola
+sw:Shule ya Lugha
+th:โรงเรียนภาษา
+tr:Dil Okulu
+uk:Мовна школа
+vi:Ngôn ngữ Trường học
+zh-Hans:语言学校
+zh-Hant:語言學校
+
amenity-ice_cream
en:3Ice Cream|Gelato
ru:4Мороженое
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 08886545a2..2fe7a6e863 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1128,8 +1128,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n
amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130;
amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131;
deprecated|deprecated;1132;x
-deprecated|deprecated;1133;x
-deprecated|deprecated;1134;x
+amenity|music_school;1133;
+amenity|language_school;1134;
historic|city_gate;1135;
sport|padel;1136;
sport|futsal;1137;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index f0ea2b996f..09865315ca 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -1292,6 +1292,8 @@
[type.amenity.driving_school]
en = Driving School
ar = مدرسة قيادة
+ be = Аўташкола
+ bg = Автошкола
cs = Autoškola
da = Køreskole
de = Fahrschule
@@ -1323,6 +1325,78 @@
zh-Hans = 驾校
zh-Hant = 駕訓班
+ [type.amenity.music_school]
+ en = Music School
+ ar = ﻰﻘﻴﺳﻮﻣ ﺔﺳﺭﺪﻣ
+ be = Музычная школа
+ bg = Музикално училище
+ cs = Hudební škola
+ da = Musikskolen
+ de = Musikschule
+ el = Μουσική Σχολή
+ es = Escuela de música
+ eu = Musika Eskola
+ fa = ﯽﻘﯿﺳﻮﻣ ﻩﺎﮕﺷﺯﻮﻣﺁ
+ fi = Musiikkikoulu
+ fr = École de musique
+ he = הקיזומל רפס תיב
+ hu = Zeneiskola
+ id = Sekolah musik
+ it = Scuola di Musica
+ ja = 音楽学校
+ ko = 음악 학교
+ nb = Musikkskole
+ nl = Muziekschool
+ pl = Szkoła Muzyczna
+ pt = Escola de música
+ ro = Scoala de Muzica
+ ru = Музыкальная школа
+ sk = Hudobná škola
+ sv = Musikskola
+ sw = Shule ya Muziki
+ th = โรงเรียนดนตรี
+ tr = Müzik Okulu
+ uk = Музична школа ім
+ vi = Trường âm nhạc
+ zh-Hans = 音乐学校
+ zh-Hant = 音樂學校
+
+ [type.amenity.language_school]
+ en = Language School
+ ar = ﺔﻐﻟ ﺔﺳﺭﺪﻣ
+ be = Моўная школа
+ bg = Езиково училище
+ cs = Jazyková škola
+ da = Sprogskole
+ de = Sprachschule
+ el = Σχολή Γλωσσών
+ es = Escuela de idiomas
+ eu = Hizkuntza Eskola
+ fa = ﻥﺎﺑﺯ ﻪﺳﺭﺪﻣ
+ fi = Kielikoulu
+ fr = École de langue
+ he = תופשל רפס תיב
+ hu = Nyelviskola
+ id = Sekolah bahasa
+ it = Scuola di lingue
+ ja = 語学学校
+ ko = 언어 학교
+ nb = Språkskole
+ nl = Taalschool
+ pl = Szkoła językowa
+ pt = Escola de idiomas
+ ro = Școala de limbi străine
+ ru = Языковая школа
+ sk = Jazyková škola
+ sv = Språkskola
+ sw = Shule ya Lugha
+ th = โรงเรียนภาษา
+ tr = Dil Okulu
+ uk = Мовна школа
+ vi = Ngôn ngữ Trường học
+ zh-Hans = 语言学校
+ zh-Hant = 語言學校
+
[type.office.diplomatic]
en = Embassy
ar = سفارة
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 9554be058b..7ec7d17435 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1686,6 +1686,16 @@ node|z18-[amenity=school],
area|z18-[amenity=school]
{font-size: 11;text-optional: true;}
+node|z17-[amenity=music_school],
+area|z17-[amenity=music_school]
+{icon-image: music_school-m.svg;}
+node|z17-[amenity=driving_school],
+area|z17-[amenity=driving_school]
+{icon-image: driving_school-m.svg;}
+node|z17-[amenity=language_school],
+area|z17-[amenity=language_school]
+{icon-image: language_school-m.svg;}
+
/* 5.3 Sport */
node|z13-14[leisure=stadium]
diff --git a/data/styles/clear/style-clear/symbols/driving_school-m.svg b/data/styles/clear/style-clear/symbols/driving_school-m.svg
new file mode 100644
index 0000000000..43518cb7e3
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/driving_school-m.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/language_school-m.svg b/data/styles/clear/style-clear/symbols/language_school-m.svg
new file mode 100644
index 0000000000..49c00c0855
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/language_school-m.svg
@@ -0,0 +1,13 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/music_school-m.svg b/data/styles/clear/style-clear/symbols/music_school-m.svg
new file mode 100644
index 0000000000..fbef2e271b
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/music_school-m.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/driving_school-m.svg b/data/styles/clear/style-night/symbols/driving_school-m.svg
new file mode 100644
index 0000000000..8a35fb22ef
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/driving_school-m.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/language_school-m.svg b/data/styles/clear/style-night/symbols/language_school-m.svg
new file mode 100644
index 0000000000..4db1c7cde0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/language_school-m.svg
@@ -0,0 +1,13 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/music_school-m.svg b/data/styles/clear/style-night/symbols/music_school-m.svg
new file mode 100644
index 0000000000..b897bd529a
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/music_school-m.svg
@@ -0,0 +1,8 @@
+
+