diff --git a/css/25_areas.css b/css/25_areas.css
index 081302258..3224a3c62 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -95,6 +95,9 @@ path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
+path.fill.tag-amenity-fountain {
+    fill: rgba(119, 211, 222, 0.3);
+}
 .preset-icon-fill-area.tag-amenity-swimming_pool,
 .preset-icon-fill-area.tag-leisure-swimming_pool,
 .preset-icon-fill-area.tag-landuse-aquaculture,
@@ -106,7 +109,7 @@ path.fill.tag-natural-water {
     background-color: rgba(119, 211, 222, 0.3);
 }
 .pattern-color-waves,
-.pattern-color-water,
+.pattern-color-water_standing,
 .pattern-color-pond {
     fill: rgba(119, 211, 222, 0.3);
 }
diff --git a/modules/svg/areas.js b/modules/svg/areas.js
index 1f3a0d1c3..8a0ef97e1 100644
--- a/modules/svg/areas.js
+++ b/modules/svg/areas.js
@@ -18,7 +18,8 @@ export function svgAreas(projection, context) {
         // tag - value - rules (optional tag-values, pattern name)
         // (matches earlier rules first, so fallback should be last entry)
         amenity: {
-            grave_yard: 'cemetery'
+            grave_yard: 'cemetery',
+            fountain: 'water_standing'
         },
         landuse: {
             cemetery: [
@@ -43,7 +44,7 @@ export function svgAreas(projection, context) {
             meadow: 'meadow',
             military: 'construction',
             orchard: 'orchard',
-            reservoir: 'water',
+            reservoir: 'water_standing',
             quarry: 'quarry',
             vineyard: 'vineyard'
         },
@@ -54,7 +55,7 @@ export function svgAreas(projection, context) {
             scrub: 'scrub',
             water: [
                 { water: 'pond', pattern: 'pond' },
-                { water: 'reservoir', pattern: 'water' },
+                { water: 'reservoir', pattern: 'water_standing' },
                 { pattern: 'waves' }
             ],
             wetland: [
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index a6eb14b39..47d9722a5 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -125,7 +125,7 @@ export function svgDefs(context) {
                 ['quarry', 'quarry'],
                 ['scrub', 'bushes'],
                 ['vineyard', 'vineyard'],
-                ['water', 'lines'],
+                ['water_standing', 'lines'],
                 ['waves', 'waves'],
                 ['wetland', 'wetland'],
                 ['wetland_marsh', 'wetland_marsh'],