diff --git a/data/categories.txt b/data/categories.txt
index 660dbbc3e7..bf608aaa10 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -13354,6 +13354,45 @@ zh-Hant:淋浴間
fa:مرحاض
mr:अंघोळ|शॉवर
+emergency-assembly_point
+en:Emergency Assembly Point
+ar:نقطة التجمع في حالات الطوارئ
+be:Аварыйны зборны пункт
+bg:Авариен сборен пункт
+ca:Punt de reunió d'emergència
+cs:Nouzové shromažďovací místo
+da:Nødsamlingssted
+de:Notfall-Sammelpunkt
+el:Σημείο συναρμολόγησης έκτακτης ανάγκης
+es:Punto de reunión de emergencia
+et:Erakorraline kogunemispunkt
+eu:Larrialdietako Batzar Puntua
+fa:محل تجمع اضطراری
+fi:Hätäkokouspiste
+fr:Point de rassemblement d'urgence
+he:נקודת כינוס חירום
+hu:Sürgősségi gyülekezési pont
+id:Titik Berkumpul Darurat
+it:Punto di raccolta di emergenza
+ja:緊急集合場所
+ko:비상 집결지
+mr:आपत्कालीन विधानसभा पॉइंट
+nb:Nødsamlingssted
+nl:Verzamelpunt voor noodgevallen
+pl:Punkt Zgromadzeń Awaryjnych
+pt:Ponto de Reunião de Emergência
+ro:Punct de adunare de urgență
+ru:Пункт аварийного сбора
+sk:Núdzové zhromaždenie
+sv:Nöduppsamlingsplats
+sw:Sehemu ya Mkutano wa Dharura
+th:จุดรวมพลฉุกเฉิน
+tr:Acil Toplanma Noktası
+uk:Аварійний збірний пункт
+vi:Điểm tập hợp khẩn cấp
+zh-Hans:紧急集合点
+zh-Hant:緊急集合點
+
emergency-defibrillator
en:4Defibrillator|AED
ru:4Дефибриллятор
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index b6d112986d..640095dd10 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1640,3 +1640,4 @@ shop|collector;1564;
railway|station|subway|tehran;[railway=station][transport=subway][city=tehran],[railway=station][station=subway][city=tehran];;name;int_name;1565;
amenity|stripclub;1566;
tourism|aquarium;1567;
+emergency|assembly_point;1568;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 30e697c519..7ecfcbc7e6 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -9756,6 +9756,45 @@
tr = Acil
zh-Hans = 应急要素
+ [type.emergency.assembly_point]
+ en = Emergency Assembly Point
+ ar = نقطة التجمع في حالات الطوارئ
+ be = Аварыйны зборны пункт
+ bg = Авариен сборен пункт
+ ca = Punt de reunió d'emergència
+ cs = Nouzové shromažďovací místo
+ da = Nødsamlingssted
+ de = Notfall-Sammelpunkt
+ el = Σημείο συναρμολόγησης έκτακτης ανάγκης
+ es = Punto de reunión de emergencia
+ et = Erakorraline kogunemispunkt
+ eu = Larrialdietako Batzar Puntua
+ fa = محل تجمع اضطراری
+ fi = Hätäkokouspiste
+ fr = Point de rassemblement d'urgence
+ he = נקודת כינוס חירום
+ hu = Sürgősségi gyülekezési pont
+ id = Titik Berkumpul Darurat
+ it = Punto di raccolta di emergenza
+ ja = 緊急集合場所
+ ko = 비상 집결지
+ mr = आपत्कालीन विधानसभा पॉइंट
+ nb = Nødsamlingssted
+ nl = Verzamelpunt voor noodgevallen
+ pl = Punkt Zgromadzeń Awaryjnych
+ pt = Ponto de Reunião de Emergência
+ ro = Punct de adunare de urgență
+ ru = Пункт аварийного сбора
+ sk = Núdzové zhromaždenie
+ sv = Nöduppsamlingsplats
+ sw = Sehemu ya Mkutano wa Dharura
+ th = จุดรวมพลฉุกเฉิน
+ tr = Acil Toplanma Noktası
+ uk = Аварійний збірний пункт
+ vi = Điểm tập hợp khẩn cấp
+ zh-Hans = 紧急集合点
+ zh-Hant = 緊急集合點
+
[type.emergency.defibrillator]
en = Defibrillator
af = Defibrillator
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 208d28393f..85218ca248 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -993,6 +993,8 @@ node|z18-[amenity=fire_station],
area|z18-[amenity=fire_station],
node|z18-[emergency=defibrillator],
area|z18-[emergency=defibrillator],
+node|z18-[emergency=assembly_point],
+area|z18-[emergency=assembly_point],
node|z18-[amenity=toilets],
area|z18-[amenity=toilets],
node|z18-[amenity=atm],
@@ -1614,6 +1616,10 @@ node|z18-[emergency=defibrillator],
area|z18-[emergency=defibrillator]
{icon-image: defibrillator-m.svg;font-size: 11;}
+node|z18-[emergency=assembly_point],
+area|z18-[emergency=assembly_point]
+{icon-image: assembly_point-m.svg;font-size: 11;}
+
node|z17-[office=lawyer],
area|z17-[office=lawyer]
{icon-image: lawyer-m.svg;}
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index e214424d63..9e77d13d08 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -2105,6 +2105,7 @@ amenity-vending_machine-sweets # icon z18- (also has captio
amenity-bench # icon z18- (also has caption(optional) z19-)
amenity-waste_disposal # icon z18- (also has caption(optional) z18-)
+emergency-assembly_point # icon z18- (also has caption(optional) z18-)
emergency-defibrillator # icon z18- (also has caption(optional) z18-)
emergency-phone # icon z17-
=== -9980
@@ -2130,6 +2131,7 @@ amenity-loading_dock # icon z18- (also has captio
# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-)
# amenity-waste_basket # caption(optional) z19- (also has icon z18-)
# amenity-waste_disposal # caption(optional) z18- (also has icon z18-)
+# emergency-assembly_point # caption(optional) z18- (also has icon z18-)
# emergency-defibrillator # caption(optional) z18- (also has icon z18-)
# emergency-fire_hydrant # caption(optional) z18- (also has icon z18-)
# entrance # caption(optional) z19- (also has icon z19-)
diff --git a/data/styles/clear/style-clear/symbols/assembly_point-m.svg b/data/styles/clear/style-clear/symbols/assembly_point-m.svg
new file mode 100644
index 0000000000..772a10393c
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/assembly_point-m.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/assembly_point-m.svg b/data/styles/clear/style-night/symbols/assembly_point-m.svg
new file mode 100644
index 0000000000..76370cf9f1
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/assembly_point-m.svg
@@ -0,0 +1,10 @@
+
+