diff --git a/project.mml b/project.mml
index bc94b4ce23..9f69950b78 100644
--- a/project.mml
+++ b/project.mml
@@ -232,6 +232,7 @@ Layer:
         (SELECT
             way,
             "natural",
+            water,
             waterway,
             landuse,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
diff --git a/style/ferry-routes.mss b/style/ferry-routes.mss
index 18748dd9b4..bff314f02b 100644
--- a/style/ferry-routes.mss
+++ b/style/ferry-routes.mss
@@ -4,8 +4,10 @@
 #ferry-routes {
   [zoom >= 8] {
     /* background prevents problems with overlapping ferry-routes, see #457 */
-    background/line-color: @water-color;
+    background/line-color: @river-color;
     background/line-width: 1; /* Needs to be a bit wider than the route itself because of antialiasing */
+    background/line-comp-op: lighten;
+    background/line-dasharray: 4,4;
     line-color: @ferry-route;
     line-width: 0.4;
     line-dasharray: 4,4;
diff --git a/style/landcover.mss b/style/landcover.mss
index e85f9c05a2..a8c78da760 100644
--- a/style/landcover.mss
+++ b/style/landcover.mss
@@ -77,7 +77,7 @@
   ::high-zoom[zoom >= 12] {
 
   [feature = 'leisure_swimming_pool'][zoom >= 14] {
-    polygon-fill: @water-color;
+    polygon-fill: @ocean-color;
     [zoom >= 17] {
       line-width: 0.5;
       line-color: saturate(darken(@water-color, 20%), 20%);
diff --git a/style/shapefiles.mss b/style/shapefiles.mss
index 585cda6512..eca07f4287 100644
--- a/style/shapefiles.mss
+++ b/style/shapefiles.mss
@@ -13,7 +13,7 @@
 
 #ocean-lz,
 #ocean {
-  polygon-fill: @water-color;
+  polygon-fill: @ocean-color;
 }
 
 #icesheet-poly {
diff --git a/style/style.mss b/style/style.mss
index 6bb5b6aee5..de7f3fd1b7 100644
--- a/style/style.mss
+++ b/style/style.mss
@@ -2,8 +2,11 @@ Map {
   background-color: @land-color;
 }
 
-@water-color: #aad3df;
 @land-color: #f2efe9;
 
+@water-color: #a2d1e0;     // Lch(81,17,227)
+@ocean-color: #b5d7e3;     // Lch(84,13,227)
+@river-color: #8fcadd;     // Lch(78,21,227)
+
 @standard-halo-radius: 1;
 @standard-halo-fill: rgba(255,255,255,0.6);
diff --git a/style/water.mss b/style/water.mss
index 84829eda3d..92ca6f84c8 100644
--- a/style/water.mss
+++ b/style/water.mss
@@ -18,10 +18,7 @@
   }
 
   [waterway = 'dock'],
-  [landuse = 'basin'],
-  [natural = 'water'],
-  [landuse = 'reservoir'],
-  [waterway = 'riverbank'] {
+  [landuse = 'basin'] {
     [int_intermittent = 'no'] {
       polygon-fill: @water-color;
       [way_pixels >= 4] { polygon-gamma: 0.75; }
@@ -33,6 +30,41 @@
       [way_pixels >= 64] { polygon-pattern-gamma: 0.6; }
     }
   }
+
+  [natural = 'water']::natural,
+  [landuse = 'reservoir']::landuse,
+  [waterway = 'riverbank']::waterway {
+    [water != 'river'][water != 'canal'][waterway != 'riverbank'] {
+      [int_intermittent = 'no'] {
+        polygon-fill: @water-color;
+        [way_pixels >= 4] { polygon-gamma: 0.75; }
+        [way_pixels >= 64] { polygon-gamma: 0.6; }
+      }
+      [int_intermittent = 'yes'] {
+        polygon-pattern-file: url('symbols/intermittent_water.png');
+        polygon-pattern-alignment: global;
+        [way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
+        [way_pixels >= 64] { polygon-pattern-gamma: 0.6; }
+      }
+    }
+    [natural = 'water'][water = 'river'],
+    [natural = 'water'][water = 'canal'],
+    [waterway = 'riverbank'] {
+      [int_intermittent = 'no'] {
+        polygon-fill: @river-color;
+        [way_pixels >= 4] { polygon-gamma: 0.75; }
+        [way_pixels >= 64] { polygon-gamma: 0.6; }
+      }
+      [int_intermittent  = 'yes'] {
+        [zoom >= 15] {
+          polygon-pattern-file: url('symbols/intermittent_river.png');
+          polygon-pattern-alignment: global;
+          [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
+          [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
+        }
+      }
+    }
+  }
 }
 
 #water-lines-casing {
@@ -66,7 +98,7 @@
       line-join: round;
       line-clip: false;
     }
-    line-color: @water-color;
+    line-color: @river-color;
     line-width: 0.7;
     [zoom >= 9] { line-width: 1.2; }
     [zoom >= 10] { line-width: 1.6; }
@@ -96,7 +128,7 @@
       }
     }
 
-    water/line-color: @water-color;
+    water/line-color: @river-color;
     water/line-width: 2;
     water/line-cap: round;
     water/line-join: round;
@@ -154,7 +186,7 @@
         background/line-color: @land-color;
       }
       water/line-width: 2;
-      water/line-color: @water-color;
+      water/line-color: @river-color;
 
       [bridge = 'yes'] {
         bridgecasing/line-color: black;