diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 00b983e043..b3e425d8e7 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index fefc65aa8e..55997c6099 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -44846,7 +44846,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44854,7 +44854,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -44863,7 +44863,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44871,7 +44871,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -44880,7 +44880,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44888,7 +44888,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45434,7 +45434,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45442,7 +45442,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45451,7 +45451,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45459,7 +45459,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45468,7 +45468,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45476,7 +45476,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 8e45ee7b4f..397a860d00 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index adf2ba2b0d..958725b34b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -44478,7 +44478,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44486,7 +44486,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -44495,7 +44495,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44503,7 +44503,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -44512,7 +44512,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44520,7 +44520,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45066,7 +45066,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45074,7 +45074,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45083,7 +45083,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45091,7 +45091,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45100,7 +45100,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45108,7 +45108,7 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 78670871ae..ac2ae40ba6 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 22e76acb51..d89bce8ef5 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -44593,7 +44593,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44601,7 +44601,7 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -44610,7 +44610,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44618,7 +44618,7 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -44627,7 +44627,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -44635,7 +44635,7 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45161,7 +45161,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45169,7 +45169,7 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45178,7 +45178,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45186,7 +45186,7 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580
@@ -45195,7 +45195,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-m"
+      name: "drinking-water-s"
       priority: 16580
       min_distance: 24
     }
@@ -45203,7 +45203,7 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 6
         is_optional: true
       }
       priority: 15580