diff --git a/data/presets/presets.json b/data/presets/presets.json
index eb1aea4e9..b94d11b42 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1159,7 +1159,7 @@
             "name": "Dojo / Martial Arts Academy"
         },
         "amenity/drinking_water": {
-            "icon": "water",
+            "icon": "drinking-water",
             "geometry": [
                 "point"
             ],
@@ -2682,7 +2682,7 @@
             "name": "Waste Transfer Station"
         },
         "amenity/water_point": {
-            "icon": "water",
+            "icon": "drinking-water",
             "geometry": [
                 "area",
                 "vertex",
diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json
index 9437c6024..cff034bb7 100644
--- a/data/presets/presets/amenity/drinking_water.json
+++ b/data/presets/presets/amenity/drinking_water.json
@@ -1,5 +1,5 @@
 {
-    "icon": "water",
+    "icon": "drinking-water",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/water_point.json b/data/presets/presets/amenity/water_point.json
index 0cdce3f52..834a6f99f 100644
--- a/data/presets/presets/amenity/water_point.json
+++ b/data/presets/presets/amenity/water_point.json
@@ -1,5 +1,5 @@
 {
-    "icon": "water",
+    "icon": "drinking-water",
     "geometry": [
         "area",
         "vertex",