diff --git a/data/categories.txt b/data/categories.txt
index bbdee7d56b..f7c2cfe5a8 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -9893,6 +9893,46 @@ vi:Nhà máy bia
zh-Hans:酿酒厂
zh-Hant:釀酒廠
+craft-caterer
+en:Caterer
+ar:متعهد تقديم الطعام
+be:Кейтэрынг
+bg:Кетъринг
+ca:Càtering
+cs:Cateringová společnost
+da:Caterer
+de:Caterer
+el:Τροφοδότης
+es:Catering
+et:Catering
+eu:Catering
+fa:پذیرایی
+fi:Pitopalvelu
+fr:Traiteur
+he:קייטרינג
+hu:Catering
+id:Katering
+it:Catering
+ja:ケータリング
+ko:케이터링 업체
+mr:केटरर
+nb:Caterer
+nl:Traiteur
+pl:Firma cateringowa
+pt:Serviço de catering
+pt-BR:Serviço de bufê
+ro:Catering
+ru:Кейтеринг
+sk:Cateringová spoločnosť
+sv:Cateringfirma
+sw:Mpishi
+th:พนักงานจัดเลี้ยง
+tr:Yemek şirketi
+uk:Кейтеринг
+vi:Người cung cấp thực phẩm
+zh-Hans:餐饮
+zh-Hant:餐飲服務商
+
craft-carpenter
en:4Carpenter
ar:نجار
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 61c36db3a0..73474db4b6 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1655,4 +1655,5 @@ historic|tank;1579;
historic|mine;1580;
historic|wreck;1581;
historic|locomotive;1582;
+craft|caterer;1583;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index c26e3891c8..54c331bfcb 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -6377,6 +6377,46 @@
zh-Hans = 酿酒厂
zh-Hant = 釀酒廠
+ [type.craft.caterer]
+ en = Caterer
+ ar = متعهد تقديم الطعام
+ be = Кейтэрынг
+ bg = Кетъринг
+ ca = Càtering
+ cs = Cateringová společnost
+ da = Caterer
+ de = Caterer
+ el = Τροφοδότης
+ es = Catering
+ et = Catering
+ eu = Catering
+ fa = پذیرایی
+ fi = Pitopalvelu
+ fr = Traiteur
+ he = קייטרינג
+ hu = Catering
+ id = Katering
+ it = Catering
+ ja = ケータリング
+ ko = 케이터링 업체
+ mr = केटरर
+ nb = Caterer
+ nl = Traiteur
+ pl = Firma cateringowa
+ pt = Serviço de catering
+ pt-BR = Serviço de bufê
+ ro = Catering
+ ru = Кейтеринг
+ sk = Cateringová spoločnosť
+ sv = Cateringfirma
+ sw = Mpishi
+ th = พนักงานจัดเลี้ยง
+ tr = Yemek şirketi
+ uk = Кейтеринг
+ vi = Người cung cấp thực phẩm
+ zh-Hans = 餐饮
+ zh-Hant = 餐飲服務商
+
[type.craft.carpenter]
en = Carpenter
af = Skrynwerker
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index deeabb0f74..55f6e5bd40 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2451,6 +2451,8 @@ area|z17-[craft=brewery]
node|z17-[craft=carpenter],
area|z17-[craft=carpenter]
{icon-image:carpenter-m.svg;}
+node|z17-[craft=caterer],
+{icon-image:caterer-m.svg;}
node|z17-[craft=confectionery],
area|z17-[craft=confectionery]
{icon-image:sweets-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 9e6e01d0d2..fd690c7c52 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -1229,6 +1229,7 @@ amenity-bbq # icon z18- (also has captio
amenity-internet_cafe # icon z18- (also has caption(optional) z19-)
amenity-public_bookcase # icon z18- (also has caption(optional) z18-)
amenity-toilets # icon z18- (also has caption(optional) z18-)
+craft-caterer # icon z17- (also has caption(optional) z18-)
craft-handicraft # icon z18- (also has caption(optional) z18-)
craft-hvac # icon z17- (also has caption(optional) z18-)
craft-key_cutter # icon z17- (also has caption(optional) z18-)
@@ -2114,6 +2115,7 @@ amenity-parking-private # icon z18- (also has captio
# amenity-internet_cafe # caption(optional) z19- (also has icon z18-)
# amenity-public_bookcase # caption(optional) z18- (also has icon z18-)
# amenity-toilets # caption(optional) z18- (also has icon z18-)
+# craft-caterer # caption(optional) z18- (also has icon z17-)
# craft-handicraft # caption(optional) z18- (also has icon z18-)
# craft-hvac # caption(optional) z18- (also has icon z17-)
# craft-key_cutter # caption(optional) z18- (also has icon z17-)
diff --git a/data/styles/clear/style-clear/symbols/caterer-m.svg b/data/styles/clear/style-clear/symbols/caterer-m.svg
new file mode 100644
index 0000000000..e2d3553a4a
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/caterer-m.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/caterer-m.svg b/data/styles/clear/style-night/symbols/caterer-m.svg
new file mode 100644
index 0000000000..e275d1f461
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/caterer-m.svg
@@ -0,0 +1,10 @@
+
+