diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 88739b459..0fb9a597f 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -172,10 +172,10 @@ node|z15-[natural=geyser],
 node|z17-[natural=geyser],
 {font-size: 11;}
 
-node|z16-[amenity=water_point],
-node|z16-[amenity=drinking_water],
-node|z16-[man_made=water_tap],
-node|z16-[man_made=water_well],
+node|z17-[amenity=water_point],
+node|z17-[amenity=drinking_water],
+node|z17-[man_made=water_tap],
+node|z17-[man_made=water_well],
 {icon-image: drinking-water-s.svg;}
 node|z18-[amenity=water_point],
 node|z18-[amenity=drinking_water],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index f022eddde..895e50a1e 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -550,7 +550,7 @@ railway-tram_stop                                   # icon z14- (also has captio
 highway-bus_stop                                    # icon z16- (also has caption(optional) z17-)
 === 3600
 
-amenity-drinking_water                              # icon z16- (also has caption(optional) z18-)
+amenity-drinking_water                              # icon z17- (also has caption(optional) z18-)
 === 3500
 
 isoline-step_1000                                   # pathtext z11- (also has line z11-)
@@ -602,7 +602,7 @@ highway-unclassified-bridge                         # pathtext z13- (also has li
 highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
-amenity-water_point                                 # icon z16- (also has caption(optional) z18-)
+amenity-water_point                                 # icon z17- (also has caption(optional) z18-)
 highway-raceway                                     # pathtext z16- (also has line z14-)
 historic-aircraft                                   # icon z16- (also has caption(optional) z16-)
 historic-locomotive                                 # icon z16- (also has caption(optional) z16-)
@@ -613,8 +613,8 @@ historic-wreck                                      # icon z16- (also has captio
 landuse-allotments                                  # caption z15- (also has area z12-)
 landuse-cemetery                                    # icon z14- (also has caption(optional) z15-, area z10-)
 landuse-cemetery-christian                          # icon z14- (also has caption(optional) z15-, area z10-)
-man_made-water_tap                                  # icon z16- (also has caption(optional) z18-)
-man_made-water_well                                 # icon z16- (also has caption(optional) z18-)
+man_made-water_tap                                  # icon z17- (also has caption(optional) z18-)
+man_made-water_well                                 # icon z17- (also has caption(optional) z18-)
 man_made-windmill                                   # icon z16- (also has caption(optional) z16-)
 === 3050
 
@@ -1759,7 +1759,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # highway-bus_stop                                  # caption(optional) z17- (also has icon z16-)
 # === -6400
 
-# amenity-drinking_water                            # caption(optional) z18- (also has icon z16-)
+# amenity-drinking_water                            # caption(optional) z18- (also has icon z17-)
 # === -6500
 
 # leisure-beach_resort                              # caption(optional) z16- (also has icon z16-, area z10-)
@@ -1768,7 +1768,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-supermarket                                  # caption(optional) z16- (also has icon z16-)
 # === -6800
 
-# amenity-water_point                               # caption(optional) z18- (also has icon z16-)
+# amenity-water_point                               # caption(optional) z18- (also has icon z17-)
 # historic-aircraft                                 # caption(optional) z16- (also has icon z16-)
 # historic-locomotive                               # caption(optional) z16- (also has icon z16-)
 # historic-mine                                     # caption(optional) z15- (also has icon z15-)
@@ -1777,8 +1777,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-wreck                                    # caption(optional) z16- (also has icon z16-)
 # landuse-cemetery                                  # caption(optional) z15- (also has icon z14-, area z10-)
 # landuse-cemetery-christian                        # caption(optional) z15- (also has icon z14-, area z10-)
-# man_made-water_tap                                # caption(optional) z18- (also has icon z16-)
-# man_made-water_well                               # caption(optional) z18- (also has icon z16-)
+# man_made-water_tap                                # caption(optional) z18- (also has icon z17-)
+# man_made-water_well                               # caption(optional) z18- (also has icon z17-)
 # man_made-windmill                                 # caption(optional) z16- (also has icon z16-)
 # === -6950