diff --git a/data/categories.txt b/data/categories.txt
index 63e74cef5e..9b48fd22c7 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10873,6 +10873,42 @@ zh-Hant:機車停車格
fa:پارکینگ موتورسیکلت
mr:दुचाकी पार्किंग
+amenity-parking_space-disabled
+en:Disabled Parking Space
+ar:ﺔﺻﺎﺨﻟﺍ ﺕﺎﺟﺎﻴﺘﺣﻻﺍ ﻱﻭﺬﻟ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻮﻟ ﻦﻛﺎﻣﺃ
+be:Паркоўка для інвалідаў
+bg:Паркомясто за инвалиди
+cs:Parkovací místo pro invalidy
+da:Handicapparkeringsplads
+de:Behindertenparkplatz
+el:Χώρος στάθμευσης για ΑΜΕΑ
+es:Plaza de aparcamiento para discapacitados
+eu:Ezinduentzako aparkalekua
+fa:ﻦﯿﻟﻮﻠﻌﻣ ﮎﺭﺎﭘ ﯼﺎﺟ
+fi:Vammaispysäköinti
+fr:Place de stationnement handicapé
+he:םיכנל הינח
+hu:Mozgássérült parkolóhely
+id:Tempat parkir penyandang cacat
+it:Posto auto per disabili
+ja:身障者用駐車スペース
+ko:장애인 주차 공간
+nb:Parkeringsplass for funksjonshemmede
+nl:Invalide parkeerplaats
+pl:Miejsce parkingowe dla niepełnosprawnych
+pt:Estacionamento para deficientes
+ro:Loc de parcare pentru persoane cu handicap
+ru:Парковочное место для инвалидов
+sk:Parkovacie miesto pre invalidov
+sv:Handikappparkeringsplats
+sw:Nafasi ya maegesho iliyozimwa
+th:ที่จอดรถสำหรับผู้พิการ
+tr:Engelli park yeri
+uk:Паркомісце для інвалідів
+vi:Chỗ đậu xe dành cho người khuyết tật
+zh-Hans:残疾人停车位
+zh-Hant:殘疾人停車位
+
amenity-nursing_home
en:4Nursing Home
ru:3Дом престарелых
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index a119967e99..0d6c4d8eed 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1350,3 +1350,4 @@ recycling|cans;[recycling:cans=yes];;name;int_name;1351;
recycling|shoes;[recycling:shoes=yes];;name;int_name;1352;
recycling|green_waste;[recycling:green_waste=yes];;name;int_name;1353;
recycling|cartons;[recycling:cartons=yes];;name;int_name;1354;
+amenity|parking_space|disabled;[amenity=parking_space][parking_space=disabled];;name;int_name;1355;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index d9e420f7e5..fdf316c8e4 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -2375,6 +2375,42 @@
zh-Hans = 停车位
zh-Hant = 停車地點
+ [type.amenity.parking_space.disabled]
+ en = Disabled Parking Space
+ ar = ﺔﺻﺎﺨﻟﺍ ﺕﺎﺟﺎﻴﺘﺣﻻﺍ ﻱﻭﺬﻟ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻮﻟ ﻦﻛﺎﻣﺃ
+ be = Паркоўка для інвалідаў
+ bg = Паркомясто за инвалиди
+ cs = Parkovací místo pro invalidy
+ da = Handicapparkeringsplads
+ de = Behindertenparkplatz
+ el = Χώρος στάθμευσης για ΑΜΕΑ
+ es = Plaza de aparcamiento para discapacitados
+ eu = Ezinduentzako aparkalekua
+ fa = ﻦﯿﻟﻮﻠﻌﻣ ﮎﺭﺎﭘ ﯼﺎﺟ
+ fi = Vammaispysäköinti
+ fr = Place de stationnement handicapé
+ he = םיכנל הינח
+ hu = Mozgássérült parkolóhely
+ id = Tempat parkir penyandang cacat
+ it = Posto auto per disabili
+ ja = 身障者用駐車スペース
+ ko = 장애인 주차 공간
+ nb = Parkeringsplass for funksjonshemmede
+ nl = Invalide parkeerplaats
+ pl = Miejsce parkingowe dla niepełnosprawnych
+ pt = Estacionamento para deficientes
+ ro = Loc de parcare pentru persoane cu handicap
+ ru = Парковочное место для инвалидов
+ sk = Parkovacie miesto pre invalidov
+ sv = Handikappparkeringsplats
+ sw = Nafasi ya maegesho iliyozimwa
+ th = ที่จอดรถสำหรับผู้พิการ
+ tr = Engelli park yeri
+ uk = Паркомісце для інвалідів
+ vi = Chỗ đậu xe dành cho người khuyết tật
+ zh-Hans = 残疾人停车位
+ zh-Hant = 殘疾人停車位
+
[type.amenity.payment_terminal]
en = Payment Terminal
ar = محطة دفع
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 5ac9852a42..f1816247cd 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2699,3 +2699,7 @@ area|z18-[amenity=bicycle_parking]
node|z18-[amenity=motorcycle_parking],
area|z18-[amenity=motorcycle_parking]
{icon-image: motorcycle-parking-m.svg;icon-min-distance: 20;text-optional: true;}
+
+node|z18-[amenity=parking_space][parking_space=disabled],
+area|z18-[amenity=parking_space][parking_space=disabled]
+{icon-image: parking-disabled-m.svg;}
diff --git a/data/styles/clear/style-clear/symbols/parking-disabled-m.svg b/data/styles/clear/style-clear/symbols/parking-disabled-m.svg
new file mode 100644
index 0000000000..721ebe6755
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/parking-disabled-m.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/parking-disabled-m.svg b/data/styles/clear/style-night/symbols/parking-disabled-m.svg
new file mode 100644
index 0000000000..ca48594355
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/parking-disabled-m.svg
@@ -0,0 +1,65 @@
+
+