diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6fabe5738..beb8d2f39 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5964,7 +5964,7 @@
             "name": "Insulator"
         },
         "craft/key_cutter": {
-            "icon": "maki-marker-stroked",
+            "icon": "fas-key",
             "fields": [
                 "name",
                 "operator",
diff --git a/data/presets/presets/craft/key_cutter.json b/data/presets/presets/craft/key_cutter.json
index 23923647a..626e7b5b8 100644
--- a/data/presets/presets/craft/key_cutter.json
+++ b/data/presets/presets/craft/key_cutter.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-marker-stroked",
+    "icon": "fas-key",
     "fields": [
         "name",
         "operator",
diff --git a/data/taginfo.json b/data/taginfo.json
index c938cd6e7..e6e1c6a1e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2662,7 +2662,7 @@
                 "node",
                 "area"
             ],
-            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/marker-stroked-15.svg?sanitize=true"
+            "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-key.svg?sanitize=true"
         },
         {
             "key": "craft",
diff --git a/svg/fontawesome/fas-key.svg b/svg/fontawesome/fas-key.svg
new file mode 100644
index 000000000..6307a19a6
--- /dev/null
+++ b/svg/fontawesome/fas-key.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="key" class="svg-inline--fa fa-key fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M512 176.001C512 273.203 433.202 352 336 352c-11.22 0-22.19-1.062-32.827-3.069l-24.012 27.014A23.999 23.999 0 0 1 261.223 384H224v40c0 13.255-10.745 24-24 24h-40v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24v-78.059c0-6.365 2.529-12.47 7.029-16.971l161.802-161.802C163.108 213.814 160 195.271 160 176 160 78.798 238.797.001 335.999 0 433.488-.001 512 78.511 512 176.001zM336 128c0 26.51 21.49 48 48 48s48-21.49 48-48-21.49-48-48-48-48 21.49-48 48z"></path></svg>
\ No newline at end of file