diff --git a/project.mml b/project.mml
index 5509d23cb4..9451a5b01e 100644
--- a/project.mml
+++ b/project.mml
@@ -229,6 +229,7 @@ Layer:
         (SELECT
             way,
             "natural",
+            water,
             waterway,
             landuse,
             name,
diff --git a/style.mss b/style.mss
index 6bb5b6aee5..7e3ee5d470 100644
--- a/style.mss
+++ b/style.mss
@@ -2,8 +2,10 @@ Map {
   background-color: @land-color;
 }
 
-@water-color: #aad3df;
 @land-color: #f2efe9;
 
+@water-color: #aad3df;
+@river-color: #8fcadd;     // Lch(78,21,227)
+
 @standard-halo-radius: 1;
 @standard-halo-fill: rgba(255,255,255,0.6);
diff --git a/symbols/intermittent_river.png b/symbols/intermittent_river.png
new file mode 100644
index 0000000000..a782778627
Binary files /dev/null and b/symbols/intermittent_river.png differ
diff --git a/water.mss b/water.mss
index f21b938270..ee91d52900 100644
--- a/water.mss
+++ b/water.mss
@@ -60,22 +60,42 @@
     [zoom >= 1][zoom < 2][way_pixels >= 16],
     [zoom >= 2][zoom < 8][way_pixels >= 32],
     [zoom >= 8] {
-      [int_intermittent = 'no'] {
-        polygon-fill: @water-color;
-        [way_pixels >= 4] {
-          polygon-gamma: 0.75;
+      [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;
+          }
         }
-        [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;
+          }
         }
       }
-      [int_intermittent = 'yes'] {
-        polygon-pattern-file: url('symbols/intermittent_water.png');
-        [way_pixels >= 4] {
-          polygon-pattern-gamma: 0.75;
+      [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; }
         }
-        [way_pixels >= 64] {
-          polygon-pattern-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;  }
+          }
         }
       }
     }
@@ -113,7 +133,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; }
@@ -143,7 +163,7 @@
       }
     }
 
-    water/line-color: @water-color;
+    water/line-color: @river-color;
     water/line-width: 2;
     water/line-cap: round;
     water/line-join: round;
@@ -202,7 +222,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;