diff --git a/data/categories.txt b/data/categories.txt
index fce98cf8ba..60f7092427 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -16515,3 +16515,44 @@ uk:Інвалідний візок|5Інвалід
vi:Xe lăn
zh-Hans:轮椅
zh-Hant:輪椅
+
+amenity-social_facility
+en:Social Facility
+ar:المرفق الاجتماعي
+be:Сацыяльная ўстанова
+bg:Социално съоръжение
+ca:Equipament Social
+cs:Sociální zařízení
+da:Social facilitet
+de:Soziale Einrichtung
+el:Κοινωνική διευκόλυνση
+es:Servicio social
+et:Sotsiaalne rajatis
+eu:Gizarte-ekipamendua
+fa:تسهیلات اجتماعی
+fi:Sosiaalinen väline
+fr:Établissement de services sociaux
+he:מתקן חברתי
+hi:सामाजिक सुविधा
+hu:Szociális létesítmény
+id:Fasilitas Sosial
+it:Struttura sociale
+ja:社会施設
+ko:사회 시설
+mr:सामाजिक सुविधा
+nb:Sosialt anlegg
+nl:Sociale voorziening
+pl:Obiekt socjalny
+pt:Instituição de serviços sociais
+pt-BR:Unidade de assistência social
+ro:Facilitate socială
+ru:Социальное учреждение
+sk:Sociálne zariadenie
+sv:Social anläggning
+sw:Kituo cha Kijamii
+th:สิ่งอำนวยความสะดวกทางสังคม
+tr:Sosyal Tesis
+uk:Соціальна установа
+vi:Cơ sở xã hội
+zh-Hans:社会设施
+zh-Hant:社會設施
diff --git a/data/editor.config b/data/editor.config
index b322a185d5..da8701d9ae 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1115,6 +1115,9 @@
+
+
+
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index b29dd41606..94b6074f20 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1711,3 +1711,4 @@ railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;nam
railway|station|subway|boston;[railway=station][transport=subway][city=boston],[railway=station][station=subway][city=boston];;name;int_name;1596;
railway|subway_entrance|boston;[railway=subway_entrance][city=boston];;name;int_name;1597;
leisure|miniature_golf;1598;
+amenity|social_facility;1599;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index c0f20edbc5..085123ee65 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -32412,3 +32412,48 @@
vi = Không tự phục vụ
zh-Hans = 无自助服务
zh-Hant = 沒有自助服務
+
+ [type.amenity.social_facility]
+ comment = https://wiki.openstreetmap.org/wiki/Key:social_facility
+ en = Social Facility
+ af = Sosiale fasiliteit
+ ar = المرفق الاجتماعي
+ az = Sosial obyekt
+ be = Сацыяльная ўстанова
+ bg = Социално съоръжение
+ ca = Equipament Social
+ cs = Sociální zařízení
+ da = Social facilitet
+ de = Soziale Einrichtung
+ el = Κοινωνική διευκόλυνση
+ es = Servicio social
+ et = Sotsiaalne rajatis
+ eu = Gizarte-ekipamendua
+ fa = تسهیلات اجتماعی
+ fi = Sosiaalinen väline
+ fr = Établissement de services sociaux
+ he = מתקן חברתי
+ hi = सामाजिक सुविधा
+ hu = Szociális létesítmény
+ id = Fasilitas Sosial
+ it = Struttura sociale
+ ja = 社会施設
+ ko = 사회 시설
+ lt = Socialinė priemonė
+ mr = सामाजिक सुविधा
+ nb = Sosialt anlegg
+ nl = Sociale voorziening
+ pl = Obiekt socjalny
+ pt = Instituição de serviços sociais
+ pt-BR = Unidade de assistência social
+ ro = Facilitate socială
+ ru = Социальное учреждение
+ sk = Sociálne zariadenie
+ sv = Social anläggning
+ sw = Kituo cha Kijamii
+ th = สิ่งอำนวยความสะดวกทางสังคม
+ tr = Sosyal Tesis
+ uk = Соціальна установа
+ vi = Cơ sở xã hội
+ zh-Hans = 社会设施
+ zh-Hant = 社會設施
diff --git a/data/styles/default/dark/symbols/social_facility-m.svg b/data/styles/default/dark/symbols/social_facility-m.svg
new file mode 100644
index 0000000000..781dfe8f78
--- /dev/null
+++ b/data/styles/default/dark/symbols/social_facility-m.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index d45a26c55b..d64aa0e5fc 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -952,6 +952,8 @@ node|z17-[amenity=courthouse],
area|z17-[amenity=courthouse],
node|z17-[amenity=nursing_home],
area|z17-[amenity=nursing_home],
+node|z17-[amenity=social_facility],
+area|z17-[amenity=social_facility],
node|z17-[amenity=kindergarten],
area|z17-[amenity=kindergarten],
node|z17-[amenity=childcare],
@@ -1561,6 +1563,10 @@ node|z17-[amenity=nursing_home],
area|z17-[amenity=nursing_home]
{icon-image: home-m.svg;}
+node|z17-[amenity=social_facility],
+area|z17-[amenity=social_facility]
+{icon-image: social_facility-m.svg;}
+
node|z17-[amenity=cinema],
area|z17-[amenity=cinema]
{icon-image: cinema-m.svg;}
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 7b791132b2..b800116afa 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1050,6 +1050,7 @@ amenity-grave_yard # icon z17- (also has captio
amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z14-)
amenity-nursing_home # icon z17- (also has caption(optional) z17-)
amenity-prison # icon z17- (also has caption(optional) z17-, area z12-)
+amenity-social_facility # icon z17- (also has caption(optional) z17-)
amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-)
historic-ruins # icon z17- (also has caption(optional) z17-)
landuse-farmland # caption z15- (also has area z10-)
@@ -1949,6 +1950,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z14-)
# amenity-nursing_home # caption(optional) z17- (also has icon z17-)
# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-)
+# amenity-social_facility # caption(optional) z17- (also has icon z17-)
# amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-)
# historic-ruins # caption(optional) z17- (also has icon z17-)
# leisure-ice_rink # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/default/light/symbols/social_facility-m.svg b/data/styles/default/light/symbols/social_facility-m.svg
new file mode 100644
index 0000000000..df80283ddf
--- /dev/null
+++ b/data/styles/default/light/symbols/social_facility-m.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 51c785860a..50453bed3a 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1050,6 +1050,7 @@ amenity-grave_yard # icon z17- (also has captio
amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z14-)
amenity-nursing_home # icon z17- (also has caption(optional) z17-)
amenity-prison # icon z17- (also has caption(optional) z17-, area z12-)
+amenity-social_facility # icon z17- (also has caption(optional) z17-)
amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-)
historic-ruins # icon z17- (also has caption(optional) z17-)
landuse-farmland # caption z15- (also has area z10-)
@@ -1949,6 +1950,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z14-)
# amenity-nursing_home # caption(optional) z17- (also has icon z17-)
# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-)
+# amenity-social_facility # caption(optional) z17- (also has icon z17-)
# amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-)
# historic-ruins # caption(optional) z17- (also has icon z17-)
# leisure-ice_rink # caption(optional) z17- (also has icon z17-)