diff --git a/data/categories.txt b/data/categories.txt
index 021142b5e9..bbdee7d56b 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10199,6 +10199,46 @@ vi:Nhà kim khí
 zh-Hans:金属制造工
 zh-Hant:鐵工
 
+craft-key_cutter
+en:Key Cutting
+ar:قطع المفاتيح
+be:Выраб ключоў
+bg:Рязане на ключове
+ca:Tall de claus
+cs:Řezání klíčů
+da:Nøgleskæring
+de:Schlüssel-Nachmachdienst
+el:Κοπή κλειδιού
+es:Copista de llaves
+et:Võtme lõikamine
+eu:Giltza-mozketa
+fa:برش کلید
+fi:Avaimen leikkaaminen
+fr:Reproduction de clé
+he:חיתוך מפתח
+hu:Kulcsvágás
+id:Pemotongan Kunci
+it:Taglio chiave
+ja:キーカット
+ko:키 커팅
+mr:की कटिंग
+nb:Key Cutting
+nl:Sleutel snijden
+pl:Cięcie kluczy
+pt:Chaveiro
+pt-BR:Chaveiro
+ro:Tăierea cheilor
+ru:Изготовление ключей
+sk:Rezanie kľúčov
+sv:Nyckelklippning
+sw:Kukata Muhimu
+th:ตัดกุญแจ
+tr:Anahtar Kopyalama
+uk:Нарізка ключів
+vi:Cắt chính
+zh-Hans:钥匙切割
+zh-Hant:鍵切割
+
 craft-locksmith
 en:Locksmith
 ar:قفال
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index ba2061591e..6676cd9408 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2463,6 +2463,10 @@ area|z17-[craft=electronics_repair]
 node|z17-[craft=gardener],
 area|z17-[craft=gardener]
 {icon-image:florist-m.svg;}
+node|z17-[craft=key_cutter],
+{icon-image:key_cutter-m.svg;}
+node|z17-[craft=locksmith],
+{icon-image:key_cutter-m.svg;}
 node|z17-[craft=painter],
 area|z17-[craft=painter]
 {icon-image:painter-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 8b352ff9e3..7678c5f14e 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -1231,8 +1231,8 @@ amenity-public_bookcase                             # icon z18- (also has captio
 amenity-toilets                                     # icon z18- (also has caption(optional) z18-)
 craft-handicraft                                    # icon z18- (also has caption(optional) z18-)
 craft-hvac                                          # icon z18- (also has caption(optional) z18-)
-craft-key_cutter                                    # icon z18- (also has caption(optional) z18-)
-craft-locksmith                                     # icon z18- (also has caption(optional) z18-)
+craft-key_cutter                                    # icon z17- (also has caption(optional) z18-)
+craft-locksmith                                     # icon z17- (also has caption(optional) z18-)
 === 450
 
 amenity-parking                                     # icon z16- (also has caption(optional) z18-, area z15-)
@@ -2116,8 +2116,8 @@ amenity-parking-private                             # icon z18- (also has captio
 # amenity-toilets                                   # caption(optional) z18- (also has icon z18-)
 # craft-handicraft                                  # caption(optional) z18- (also has icon z18-)
 # craft-hvac                                        # caption(optional) z18- (also has icon z18-)
-# craft-key_cutter                                  # caption(optional) z18- (also has icon z18-)
-# craft-locksmith                                   # caption(optional) z18- (also has icon z18-)
+# craft-key_cutter                                  # caption(optional) z18- (also has icon z17-)
+# craft-locksmith                                   # caption(optional) z18- (also has icon z17-)
 # === -9550
 
 # amenity-parking                                   # caption(optional) z18- (also has icon z16-, area z15-)
diff --git a/data/styles/clear/style-clear/symbols/key_cutter-m.svg b/data/styles/clear/style-clear/symbols/key_cutter-m.svg
new file mode 100644
index 0000000000..65e7646b86
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/key_cutter-m.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+ <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="7.3333" cy="12" r="3.3332" fill="none" stroke="#fff" stroke-width="2.667"/>
+ <rect x="10.667" y="10.667" width="10.667" height="2.6667" fill="#fff"/>
+ <rect x="17.333" y="10.667" width="2.6667" height="5.3333" fill="#fff"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/key_cutter-m.svg b/data/styles/clear/style-night/symbols/key_cutter-m.svg
new file mode 100644
index 0000000000..673eaf9925
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/key_cutter-m.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
+ <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="7.3333" cy="12" r="3.3332" fill="none" stroke="#000" stroke-width="2.667"/>
+ <rect x="10.667" y="10.667" width="10.667" height="2.6667" fill="#000"/>
+ <rect x="17.333" y="10.667" width="2.6667" height="5.3333" fill="#000"/>
+</svg>