diff --git a/data/presets/presets.json b/data/presets/presets.json
index 946bc349e..deca603f1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2904,6 +2904,7 @@
             "name": "Shower"
         },
         "amenity/smoking_area": {
+            "icon": "fas-smoking",
             "fields": [
                 "name",
                 "shelter",
diff --git a/data/presets/presets/amenity/smoking_area.json b/data/presets/presets/amenity/smoking_area.json
index fba420882..7eaadbe61 100644
--- a/data/presets/presets/amenity/smoking_area.json
+++ b/data/presets/presets/amenity/smoking_area.json
@@ -1,4 +1,5 @@
 {
+    "icon": "fas-smoking",
     "fields": [
         "name",
         "shelter",
diff --git a/data/taginfo.json b/data/taginfo.json
index 9f4b1cece..3b5d69b80 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1250,7 +1250,8 @@
             "object_types": [
                 "node",
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-smoking.svg?sanitize=true"
         },
         {
             "key": "amenity",
diff --git a/svg/fontawesome/fas-smoking.svg b/svg/fontawesome/fas-smoking.svg
new file mode 100644
index 000000000..b044e1e39
--- /dev/null
+++ b/svg/fontawesome/fas-smoking.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="smoking" class="svg-inline--fa fa-smoking fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M632 352h-48c-4.4 0-8 3.6-8 8v144c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V360c0-4.4-3.6-8-8-8zM553.3 87.1c-5.7-3.8-9.3-10-9.3-16.8V8c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v62.3c0 22 10.2 43.4 28.6 55.4 42.2 27.3 67.4 73.8 67.4 124V280c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8v-30.3c0-65.5-32.4-126.2-86.7-162.6zM432 352H48c-26.5 0-48 21.5-48 48v64c0 26.5 21.5 48 48 48h384c8.8 0 16-7.2 16-16V368c0-8.8-7.2-16-16-16zm-32 112H224v-64h176v64zm87.7-322.4C463.8 125 448 99.3 448 70.3V8c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v66.4c0 43.7 24.6 81.6 60.3 106.7 22.4 15.7 35.7 41.2 35.7 68.6V280c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8v-30.3c0-43.3-21-83.4-56.3-108.1zM536 352h-48c-4.4 0-8 3.6-8 8v144c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V360c0-4.4-3.6-8-8-8z"></path></svg>
\ No newline at end of file