diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index ddcc86632d..d8357cde82 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -53904,13 +53904,12 @@ cont {
     circle {
       radius: 3
       color: 0x3050D8
+      border {
+	color: 0xF8FCFF
+	width: 2
+      }
       priority: 750
     }
-    circle {
-      radius: 5
-      color: 0xF8FCFF
-      priority: 749
-    }
   }
   element {
     scale: 16
@@ -53925,13 +53924,12 @@ cont {
     circle {
       radius: 4
       color: 0x3050D8
+      border {
+	color: 0xF8FCFF
+	width: 2
+      }
       priority: 1275
     }
-    circle {
-      radius: 6
-      color: 0xF8FCFF
-      priority: 1274
-    }
   }
   element {
     scale: 17
@@ -53946,13 +53944,12 @@ cont {
     circle {
       radius: 4
       color: 0x3050D8
+      border {
+	color: 0xF8FCFF
+	width: 4
+      }
       priority: 1436
     }
-    circle {
-      radius: 8
-      color: 0xF8FCFF
-      priority: 1433
-    }
   }
 }
 cont {
@@ -56994,6 +56991,7 @@ cont {
 cont {
   name: "waterway-river"
   element {
+    scale: 6
     lines {
       width: 0.03125
       color: 0xcde5ea