diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5eb9f7680..ecf69505d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -642,7 +642,7 @@
     "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"},
     "leisure/sports_centre/swimming": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
     "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
-    "leisure/swimming_area": {"icon": "maki-swimming", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
+    "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
     "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
     "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/track/cycling_point": {"icon": "maki-bicycle", "fields": ["{leisure/track/cycling}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
diff --git a/data/presets/presets/leisure/swimming_area.json b/data/presets/presets/leisure/swimming_area.json
index f92362b1b..82b3d8b08 100644
--- a/data/presets/presets/leisure/swimming_area.json
+++ b/data/presets/presets/leisure/swimming_area.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-swimming",
+    "icon": "fas-swimmer",
     "fields": [
         "name",
         "access_simple",
diff --git a/data/taginfo.json b/data/taginfo.json
index 462cc8836..8e68df2f3 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -619,7 +619,7 @@
     {"key": "sport", "value": "climbing", "description": "🄿 Climbing Gym", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/abseiling.svg?sanitize=true"},
     {"key": "sport", "value": "swimming", "description": "🄿 Swimming Pool Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-swimmer.svg?sanitize=true"},
     {"key": "leisure", "value": "stadium", "description": "🄿 Stadium", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
-    {"key": "leisure", "value": "swimming_area", "description": "🄿 Natural Swimming Area", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"},
+    {"key": "leisure", "value": "swimming_area", "description": "🄿 Natural Swimming Area", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-swimmer.svg?sanitize=true"},
     {"key": "leisure", "value": "swimming_pool", "description": "🄿 Swimming Pool", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-swimming-pool.svg?sanitize=true"},
     {"key": "leisure", "value": "track", "description": "🄿 Racetrack (Non-Motorsport)", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/other-line.svg?sanitize=true"},
     {"key": "sport", "value": "cycling", "description": "🄿 Cycling Track", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"},