diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index bed3c1ed2c..7ae2b9f0f0 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1713,3 +1713,4 @@ railway|subway_entrance|boston;[railway=subway_entrance][city=boston];;name;int_
leisure|miniature_golf;1598;
amenity|social_facility;1599;
craft;[craft?];;name;int_name;1600;
+emergency|emergency_ward_entrance;1601;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 5e13c70e86..3a9d04f2e0 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -32506,3 +32506,48 @@
vi = Cơ sở xã hội
zh-Hans = 社会设施
zh-Hant = 社會設施
+
+ [type.emergency.emergency_ward_entrance]
+ comment = https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance
+ en = Emergency Ward Entrance
+ af = Noodsaal-ingang
+ ar = مدخل جناح الطوارئ
+ az = Təcili yardım şöbəsinin girişi
+ be = Уваход у аддзяленне хуткай дапамогі
+ bg = Вход на спешното отделение
+ ca = Entrada d'urgències
+ cs = Vchod do pohotovostního oddělení
+ da = Indgang til akutafdeling
+ de = Eingang der Notfallstation
+ el = Είσοδος θαλάμου έκτακτης ανάγκης
+ es = Entrada a urgencias
+ et = Erakorralise meditsiini osakonna sissepääs
+ eu = Larrialdietarako Sarrera
+ fa = ورودی بخش اورژانس
+ fi = Hätäosaston sisäänkäynti
+ fr = Entrée du service des urgences
+ he = כניסה למיון
+ hi = आपातकालीन वार्ड प्रवेश द्वार
+ hu = Sürgősségi kórterem bejárata
+ id = Pintu Masuk Bangsal Darurat
+ it = Ingresso del reparto di emergenza
+ ja = 救急病棟入口
+ ko = 응급 병동 입구
+ lt = Skubios pagalbos skyriaus įėjimas
+ mr = आपत्कालीन प्रभाग प्रवेशद्वार
+ nb = Inngang til akuttmottaket
+ nl = Ingang noodafdeling
+ pl = Wejście na oddział ratunkowy
+ pt = Entrada do Serviço de Urgência
+ pt-BR = Entrada da ala de emergência
+ ro = Intrarea secției de urgență
+ ru = Вход в отделение неотложной помощи
+ sk = Vchod do pohotovostného oddelenia
+ sv = Ingång till akutmottagning
+ sw = Mlango wa Wadi ya Dharura
+ th = ทางเข้าแผนกฉุกเฉิน
+ tr = Acil Servis Girişi
+ uk = Вхід до відділення невідкладної допомоги
+ vi = Lối vào khu cấp cứu
+ zh-Hans = 急诊室入口
+ zh-Hant = 急診病房入口
diff --git a/data/styles/default/dark/symbols/entrance-emergency-s.svg b/data/styles/default/dark/symbols/entrance-emergency-s.svg
new file mode 100644
index 0000000000..bea61139ab
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-emergency-s.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index 6384a4c8e0..6dfe31f0c2 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -654,6 +654,7 @@ node|z16-[addr:housenumber][addr:street]::int_name,
{text: int_name; text-color: @housenumber; text-position: center;}
node|z18-[entrance=main],
+node|z18-[emergency=emergency_ward_entrance],
node|z19-[entrance],
node|z19-[entrance=exit],
node|z19-[amenity=loading_dock],
@@ -705,6 +706,8 @@ node|z19-[entrance=exit],
{icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;}
node|z18-[entrance=main],
{icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;}
+node|z18-[emergency=emergency_ward_entrance],
+{icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;}
/* 8.3 Airports */
area|z14-[aeroway=terminal]
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 48fa93ed7e..95e3f54b0a 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1158,6 +1158,7 @@ amenity-motorcycle_parking # icon z17- (also has captio
amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking_entrance # icon z17- (also has caption(optional) z19-)
amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-)
+emergency-emergency_ward_entrance # icon z18- (also has caption(optional) z18-)
=== 250
building # caption z16- (also has area z14-)
@@ -2044,6 +2045,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking_entrance # caption(optional) z19- (also has icon z17-)
# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-)
+# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z18-)
# === -9750
# power-plant-wind # caption(optional) z16- (also has icon z15-)
diff --git a/data/styles/default/light/symbols/entrance-emergency-s.svg b/data/styles/default/light/symbols/entrance-emergency-s.svg
new file mode 100644
index 0000000000..c1e69e6de2
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-emergency-s.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 4fa3470a9a..487ba7edbf 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1158,6 +1158,7 @@ amenity-motorcycle_parking # icon z17- (also has captio
amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking_entrance # icon z17- (also has caption(optional) z19-)
amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-)
+emergency-emergency_ward_entrance # icon z18- (also has caption(optional) z18-)
=== 250
building # caption z16- (also has area z14-)
@@ -2044,6 +2045,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking_entrance # caption(optional) z19- (also has icon z17-)
# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-)
+# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z18-)
# === -9750
# power-plant-wind # caption(optional) z16- (also has icon z13-)
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index 5361e25720..ebaa6df1e3 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -509,6 +509,7 @@ node|z18-[addr:housenumber][addr:street]::int_name,
{text: int_name; text-color: @housenumber; text-position: center;}
node|z18-[entrance=main],
+node|z18-[emergency=emergency_ward_entrance],
node|z19-[entrance],
node|z19-[entrance=exit],
node|z19-[amenity=loading_dock],
@@ -550,6 +551,8 @@ node|z19-[entrance=exit],
{icon-image: entrance-exit-s.svg; font-size: 13; text-offset: 1;}
node|z18-[entrance=main],
{icon-image: entrance-main-s.svg; font-size: 13; text-offset: 1;}
+node|z18-[emergency=emergency_ward_entrance],
+{icon-image: entrance-emergency-s.svg; font-size: 13; text-offset: 1;}
/* 8.3 Airports */
area|z14-[aeroway=terminal]
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 0bb7310a3d..f4f17d9f33 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -680,6 +680,7 @@ amenity-parking-private # icon z17- (also has captio
amenity-parking-street_side-private # icon z17- (also has caption(optional) z17-, area z15-)
amenity-parking-underground-private # icon z17- (also has caption(optional) z17-)
amenity-parking_entrance-private # icon z19-
+emergency-emergency_ward_entrance # icon z18- (also has caption(optional) z18-)
=== 500
natural-wetland # caption z16- (also has area z11-)
@@ -1153,6 +1154,7 @@ entrance-main # icon z18- (also has captio
# amenity-parking-private # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-parking-street_side-private # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-parking-underground-private # caption(optional) z17- (also has icon z17-)
+# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z18-)
# === -9500
# railway-tram_stop # caption(optional) z17- (also has icon z17-)