diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6a21e343d..f10b3c784 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -498,7 +498,7 @@
     "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "dance/style"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
     "leisure/dog_park": {"icon": "maki-dog-park", "geometry": ["point", "area"], "fields": ["name"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
     "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
-    "leisure/fishing": {"icon": "maki-aquarium", "fields": ["name", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
+    "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
     "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
     "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "removeTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
diff --git a/data/presets/presets/leisure/fishing.json b/data/presets/presets/leisure/fishing.json
index ec66eac4e..d85bca817 100644
--- a/data/presets/presets/leisure/fishing.json
+++ b/data/presets/presets/leisure/fishing.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-aquarium",
+    "icon": "fas-fish",
     "fields": [
         "name",
         "access_simple"
diff --git a/data/taginfo.json b/data/taginfo.json
index 8adc8bae1..8c7f37dad 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -3328,7 +3328,7 @@
       "value": "fishing",
       "description": "Fishing Spot",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/aquarium-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fish.svg?sanitize=true"
     },
     {
       "key": "leisure",
diff --git a/svg/fontawesome/fas-fish.svg b/svg/fontawesome/fas-fish.svg
new file mode 100644
index 000000000..80d5bf6e9
--- /dev/null
+++ b/svg/fontawesome/fas-fish.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="fish" class="svg-inline--fa fa-fish fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M327.1 96c-89.97 0-168.54 54.77-212.27 101.63L27.5 131.58c-12.13-9.18-30.24.6-27.14 14.66L24.54 256 .35 365.77c-3.1 14.06 15.01 23.83 27.14 14.66l87.33-66.05C158.55 361.23 237.13 416 327.1 416 464.56 416 576 288 576 256S464.56 96 327.1 96zm87.43 184c-13.25 0-24-10.75-24-24 0-13.26 10.75-24 24-24 13.26 0 24 10.74 24 24 0 13.25-10.75 24-24 24z"></path></svg>
\ No newline at end of file