diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
index 75d6e6e3c..252089550 100644
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -74,6 +74,9 @@
Exhibition Center
Money Transfer
Music School
+ Sailing School
+ Flight School
+ Tutorial School
Language School
Embassy
Security Guards Office
diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json
index 0cc9a4d24..b6a6601c4 100644
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -415,6 +415,9 @@
"leisure-resort|@category_hotel": "Resort",
"amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
"amenity-driving_school": "4Driving school",
+"amenity-sailing_school": "4Sailing school|4Boating school",
+"amenity-flight_school": "5Flight school|Flying school",
+"amenity-prep_school": "3Tutorial school|Prep school|Test prep center|Cram school",
"amenity-music_school": "4Music school",
"amenity-language_school": "4Language school",
"amenity-ice_cream": "3Ice cream|Gelato",
diff --git a/data/editor.config b/data/editor.config
index 54db6a959..c5df5679d 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1255,6 +1255,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 4d4e583e4..99a9714b8 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -625,9 +625,9 @@ toilets|yes;502;
highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
drinking_water|no;505;
-deprecated|deprecated;506;x
-deprecated|deprecated;507;x
-deprecated|deprecated;508;x
+amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
+amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
+amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
amenity|car_pooling;509;
social_facility|soup_kitchen;510;
social_facility|food_bank;511;
diff --git a/data/styles/default/dark/symbols/boating_school-m.svg b/data/styles/default/dark/symbols/boating_school-m.svg
new file mode 100644
index 000000000..068ceb68f
--- /dev/null
+++ b/data/styles/default/dark/symbols/boating_school-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/driving_school-m.svg b/data/styles/default/dark/symbols/driving_school-m.svg
index d26ab956a..68e70f768 100644
--- a/data/styles/default/dark/symbols/driving_school-m.svg
+++ b/data/styles/default/dark/symbols/driving_school-m.svg
@@ -1,8 +1 @@
-
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/flying_school-m.svg b/data/styles/default/dark/symbols/flying_school-m.svg
new file mode 100644
index 000000000..2ab936ca2
--- /dev/null
+++ b/data/styles/default/dark/symbols/flying_school-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/language_school-m.svg b/data/styles/default/dark/symbols/language_school-m.svg
index 81787b2db..4daf48011 100644
--- a/data/styles/default/dark/symbols/language_school-m.svg
+++ b/data/styles/default/dark/symbols/language_school-m.svg
@@ -1,12 +1 @@
-
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/music_school-m.svg b/data/styles/default/dark/symbols/music_school-m.svg
index b2492818f..929fef511 100644
--- a/data/styles/default/dark/symbols/music_school-m.svg
+++ b/data/styles/default/dark/symbols/music_school-m.svg
@@ -1,7 +1 @@
-
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/prep_school-m.svg b/data/styles/default/dark/symbols/prep_school-m.svg
new file mode 100644
index 000000000..885f0b3f7
--- /dev/null
+++ b/data/styles/default/dark/symbols/prep_school-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 312ef4cee..870b5882d 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -857,6 +857,9 @@ node|z16-[amenity=school],
node|z17-[amenity=driving_school],
node|z17-[amenity=language_school],
node|z17-[amenity=music_school],
+node|z17-[amenity=sailing_school],
+node|z17-[amenity=flight_school],
+node|z17-[amenity=prep_school],
node|z17-[amenity=cinema],
node|z17-[amenity=ice_cream],
node|z17-[leisure=bowling_alley],
@@ -1089,6 +1092,12 @@ node|z17-[amenity=driving_school],
{icon-image: driving_school-m.svg;}
node|z17-[amenity=language_school],
{icon-image: language_school-m.svg;}
+node|z17-[amenity=sailing_school],
+{icon-image: boating_school-m.svg;}
+node|z17-[amenity=flight_school],
+{icon-image: flying_school-m.svg;}
+node|z17-[amenity=prep_school],
+{icon-image: prep_school-m.svg;}
node|z17-[leisure=hackerspace],
{icon-image: hackerspace-m.svg;}
node|z17-[leisure=escape_game]
diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss
index b8bd90c58..4c963a7b8 100644
--- a/data/styles/default/include/Icons_Label_Colors.mapcss
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -120,6 +120,7 @@ node[amenity=college],
node[amenity=courthouse],
node[amenity=driving_school],
node[amenity=fire_station],
+node[amenity=flight_school],
node[amenity=kindergarten],
node[amenity=language_school],
node[amenity=library],
@@ -130,7 +131,9 @@ node[amenity=nursing_home],
node[amenity=payment_centre],
node[amenity=police],
node[amenity=post_office],
+node[amenity=prep_school],
node[amenity=prison],
+node[amenity=sailing_school],
node[amenity=school],
node[amenity=townhall],
node[amenity=university][name],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 00890c9f2..489cef04a 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -968,12 +968,15 @@ amenity-car_wash # icon z17- (also has captio
amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-)
amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-)
amenity-driving_school # icon z17- (also has caption(optional) z17-)
+amenity-flight_school # icon z17- (also has caption(optional) z17-)
amenity-language_school # icon z17- (also has caption(optional) z17-)
amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-)
amenity-money_transfer # icon z17- (also has caption(optional) z18-)
amenity-music_school # icon z17- (also has caption(optional) z17-)
amenity-payment_centre # icon z17- (also has caption(optional) z18-)
+amenity-prep_school # icon z17- (also has caption(optional) z17-)
amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-)
+amenity-sailing_school # icon z17- (also has caption(optional) z17-)
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-)
@@ -1996,12 +1999,15 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-)
# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-driving_school # caption(optional) z17- (also has icon z17-)
+# amenity-flight_school # caption(optional) z17- (also has icon z17-)
# amenity-language_school # caption(optional) z17- (also has icon z17-)
# amenity-mobile_money_agent # caption(optional) z18- (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-payment_centre # caption(optional) z18- (also has icon z17-)
+# amenity-prep_school # caption(optional) z17- (also has icon z17-)
# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-)
+# amenity-sailing_school # caption(optional) z17- (also has icon z17-)
# 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-)
diff --git a/data/styles/default/light/symbols/boating_school-m.svg b/data/styles/default/light/symbols/boating_school-m.svg
new file mode 100644
index 000000000..4a6e2561a
--- /dev/null
+++ b/data/styles/default/light/symbols/boating_school-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/driving_school-m.svg b/data/styles/default/light/symbols/driving_school-m.svg
index 228ea9350..f463e9abd 100644
--- a/data/styles/default/light/symbols/driving_school-m.svg
+++ b/data/styles/default/light/symbols/driving_school-m.svg
@@ -1,8 +1 @@
-
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/flying_school-m.svg b/data/styles/default/light/symbols/flying_school-m.svg
new file mode 100644
index 000000000..4e39a99a4
--- /dev/null
+++ b/data/styles/default/light/symbols/flying_school-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/language_school-m.svg b/data/styles/default/light/symbols/language_school-m.svg
index 16fcbcf6d..87bf924ec 100644
--- a/data/styles/default/light/symbols/language_school-m.svg
+++ b/data/styles/default/light/symbols/language_school-m.svg
@@ -1,12 +1 @@
-
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/music_school-m.svg b/data/styles/default/light/symbols/music_school-m.svg
index db159328b..8210070a2 100644
--- a/data/styles/default/light/symbols/music_school-m.svg
+++ b/data/styles/default/light/symbols/music_school-m.svg
@@ -1,7 +1 @@
-
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/prep_school-m.svg b/data/styles/default/light/symbols/prep_school-m.svg
new file mode 100644
index 000000000..3dec7764d
--- /dev/null
+++ b/data/styles/default/light/symbols/prep_school-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 0d58654ea..c84f7b115 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -968,12 +968,15 @@ amenity-car_wash # icon z17- (also has captio
amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-)
amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-)
amenity-driving_school # icon z17- (also has caption(optional) z17-)
+amenity-flight_school # icon z17- (also has caption(optional) z17-)
amenity-language_school # icon z17- (also has caption(optional) z17-)
amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-)
amenity-money_transfer # icon z17- (also has caption(optional) z18-)
amenity-music_school # icon z17- (also has caption(optional) z17-)
amenity-payment_centre # icon z17- (also has caption(optional) z18-)
+amenity-prep_school # icon z17- (also has caption(optional) z17-)
amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-)
+amenity-sailing_school # icon z17- (also has caption(optional) z17-)
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-)
@@ -1999,12 +2002,15 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-)
# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-driving_school # caption(optional) z17- (also has icon z17-)
+# amenity-flight_school # caption(optional) z17- (also has icon z17-)
# amenity-language_school # caption(optional) z17- (also has icon z17-)
# amenity-mobile_money_agent # caption(optional) z18- (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-payment_centre # caption(optional) z18- (also has icon z17-)
+# amenity-prep_school # caption(optional) z17- (also has icon z17-)
# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-)
+# amenity-sailing_school # caption(optional) z17- (also has icon z17-)
# 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-)
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index cdfcbb245..2b6a8a298 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -68,6 +68,9 @@
"type.amenity.exhibition_centre" = "Exhibition Centre";
"type.amenity.money_transfer" = "Money Transfer";
"type.amenity.music_school" = "Music School";
+"type.amenity.sailing_school" = "Sailing School";
+"type.amenity.flight_school" = "Flight School";
+"type.amenity.prep_school" = "Tutorial School";
"type.amenity.language_school" = "Language School";
"type.office.diplomatic" = "Embassy";
"type.amenity.fast_food" = "Fast Food";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 9a10ae34f..a65e9b7d9 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -75,6 +75,9 @@
"type.amenity.exhibition_centre" = "Exhibition Center";
"type.amenity.money_transfer" = "Money Transfer";
"type.amenity.music_school" = "Music School";
+"type.amenity.sailing_school" = "Sailing School";
+"type.amenity.flight_school" = "Flight School";
+"type.amenity.prep_school" = "Tutorial School";
"type.amenity.language_school" = "Language School";
"type.office.diplomatic" = "Embassy";
"type.office.security" = "Security Guards Office";