diff --git a/amenity-points.mss b/amenity-points.mss
index 674590107d..1ac381b0dd 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1201,12 +1201,6 @@
     marker-clip: false;
   }
 
-  [feature = 'natural_spring'][zoom >= 14] {
-    marker-file: url('symbols/spring.svg');
-    marker-placement: interior;
-    marker-clip: false;
-  }
-
   [feature = 'power_generator']['generator:source' = 'wind'],
   [feature = 'power_generator'][power_source = 'wind'] {
     [zoom >= 15] {
diff --git a/project.mml b/project.mml
index ecc5fc16a4..fdb99c16d0 100644
--- a/project.mml
+++ b/project.mml
@@ -278,6 +278,24 @@ Layer:
       type: shape
     properties:
       minzoom: 8
+  - id: springs
+    geometry: point
+    <<: *extents
+    Datasource:
+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+             way, "natural"
+           FROM planet_osm_polygon
+           WHERE "natural" IN ('spring')
+         UNION ALL
+         SELECT
+             way, "natural"
+           FROM planet_osm_point
+           WHERE "natural" IN ('spring')
+        ) AS springs
+    properties:
+      minzoom: 14
   - id: water-lines
     class: water-lines
     geometry: linestring
diff --git a/symbols/spring.svg b/symbols/spring.svg
index bab09a9254..47644c0c44 100644
--- a/symbols/spring.svg
+++ b/symbols/spring.svg
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="5"
-   height="7">
-	<rect width="5" height="7" fill="white" />
-	<path d="M 4,1 1,1 1,4 3,4 3,5 1,5 1,6 4,6 4,3 2,3 2,2 4,2 4,1 z" fill="#588499" />
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1">
+  <g
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       transform="matrix(1.1666667,0,0,1.1666667,0,1033.6955)"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4333"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 6.875,1048.8622 a 3.375,3.3750069 0 1 1 -6.75,0 3.375,3.3750069 0 1 1 6.75,0 z"
+       id="path4327-3"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       transform="matrix(1.125,0,0,1.1250023,0.125,1034.2372)"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4327"
+       style="display:inline;fill:none;stroke:#7abcec;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/water-features.mss b/water-features.mss
index 43005c2d55..f097f81678 100644
--- a/water-features.mss
+++ b/water-features.mss
@@ -163,3 +163,11 @@
     }
   }
 }
+
+#springs {
+  [natural = 'spring'][zoom >= 14] {
+    marker-file: url('symbols/spring.svg');
+    marker-placement: interior;
+    marker-clip: false;
+  }
+}