diff --git a/data/categories.txt b/data/categories.txt
index f7c2cfe5a8..73256d8ce1 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10124,6 +10124,45 @@ vi:Người thiết kế và xây dựng cảnh quan
zh-Hans:园艺工
zh-Hant:園藝師
+craft-grinding_mill
+en:Mill
+ar:مطحنة
+be:Млын
+bg:Мелница
+ca:Molí
+cs:Mlýn
+da:Mølle
+de:Mühle
+el:Μύλος
+es:Molino
+et:Mill
+eu:Errota
+fa:کارخانه
+fi:Mill
+fr:Moulin
+he:טחנה
+hu:Malom
+id:Pabrik
+it:Mulino
+ja:ミル
+ko:밀
+mr:गिरणी
+nb:Mølle
+nl:Molen
+pl:Młyn
+pt:Moinho
+ro:Moara
+ru:Мельница
+sk:Mlyn
+sv:Kvarn
+sw:Kinu
+th:มิลล์
+tr:Değirmen
+uk:Млин
+vi:Cối xay
+zh-Hans:磨坊
+zh-Hant:磨
+
craft-handicraft
en:Handicraft
ar:مشغولات يدوية
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 73474db4b6..4450105d49 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1656,4 +1656,5 @@ historic|mine;1580;
historic|wreck;1581;
historic|locomotive;1582;
craft|caterer;1583;
+craft|grinding_mill;1584;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 54c331bfcb..996fe9916e 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -6613,6 +6613,46 @@
zh-Hans = 园艺工
zh-Hant = 園藝師
+ [type.craft.grinding_mill]
+ en = Grinding Mill
+ ar = طاحونة
+ be = Млын
+ bg = Мелница за смилане
+ ca = Molí de mòlta
+ cs = Mlýn na mletí
+ da = Slibemølle
+ de = Mühle
+ el = Μύλος λείανσης
+ es = Molino de molienda
+ et = Jahvatusveski
+ eu = Artezteko errota
+ fa = آسیاب آسیاب
+ fi = Jauhatusmylly
+ fr = Moulin à broyer
+ he = טחינה טחינה
+ hu = Csiszolómalom
+ id = Pabrik penggilingan
+ it = Mulino a macina
+ ja = 粉砕機
+ ko = 그라인딩 밀
+ mr = ग्राइंडिंग मिल
+ nb = Slipemølle
+ nl = Malende molen
+ pl = Młynek do mielenia
+ pt = Moinho de moagem
+ pt-BR = Moinho
+ ro = Moara de măcinat
+ ru = Мельница
+ sk = Mlynček na mletie
+ sv = Kvarn för slipning
+ sw = Kusaga kinu
+ th = โรงบด
+ tr = Öğütme değirmeni
+ uk = Млин
+ vi = Máy nghiền
+ zh-Hans = 磨粉机
+ zh-Hant = 磨粉機
+
[type.craft.handicraft]
en = Handicraft
af = Handvlyt
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 55f6e5bd40..9c139b1a0b 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2465,6 +2465,8 @@ area|z17-[craft=electronics_repair]
node|z17-[craft=gardener],
area|z17-[craft=gardener]
{icon-image:florist-m.svg;}
+node|z17-[craft=grinding_mill],
+{icon-image:grinding_mill-m.svg;}
node|z17-[craft=hvac],
{icon-image:plumber-m.svg;}
node|z17-[craft=key_cutter],
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index fd690c7c52..0103990b3d 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -1230,6 +1230,7 @@ amenity-internet_cafe # icon z18- (also has captio
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-grinding_mill # 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-)
@@ -2116,6 +2117,7 @@ amenity-parking-private # icon z18- (also has captio
# 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-grinding_mill # 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/grinding_mill-m.svg b/data/styles/clear/style-clear/symbols/grinding_mill-m.svg
new file mode 100644
index 0000000000..4a5aecde1c
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/grinding_mill-m.svg
@@ -0,0 +1,14 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/grinding_mill-m.svg b/data/styles/clear/style-night/symbols/grinding_mill-m.svg
new file mode 100644
index 0000000000..a80750f454
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/grinding_mill-m.svg
@@ -0,0 +1,14 @@
+
+