diff --git a/data/presets/presets.json b/data/presets/presets.json
index 74f4ab6a1..7c214f1a2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1305,6 +1305,7 @@
             "name": "Food Court"
         },
         "amenity/fountain": {
+            "icon": "poi-fountain",
             "geometry": [
                 "point",
                 "area"
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index 1a92b3d33..05bc7d092 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-fountain",
     "geometry": [
         "point",
         "area"
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index 4368187eb..b3c95cef3 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -281,10 +281,12 @@
     "poi-vending-machine":      { "viewBox": "400 335 15 15" },
     "poi-dice":                 { "viewBox": "415 335 15 15" },
     "poi-beach":                { "viewBox": "430 335 15 15" },
+    "poi-fountain":             { "viewBox": "445 335 15 15" },
 
     "poi-vending-machine-shape":   { "fill": "currentColor" },
     "poi-dice-shape":              { "fill": "currentColor" },
     "poi-beach-shape":             { "fill": "currentColor" },
+    "poi-fountain-shape":          { "fill": "currentColor" },
 
     "turn-yes":                 { "viewBox": "200 320 44 24" },
     "turn-no":                  { "viewBox": "244 320 44 24" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index 85c68d94d..13a9fef1e 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index 3201e729b..ceb62703a 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -232,6 +232,9 @@
     </g>
   </g>
   <g id="poi">
+    <g id="poi-fountain">
+      <path d="M451,347 L454,347 C454,347 453.966,349 452.966,349 C451.966,349 453,349 452,349 C451,349 451,347 451,347 z M448.5,337 C447.75,337 446.887,337.363 446.25,338 C445.5,338.75 445.25,340 445.25,341.75 C445.25,342.5 445.75,342.75 446,342.75 C446.25,342.75 446.75,342.5 446.75,341.75 C446.75,339.168 447.5,338.5 448.5,338.5 C450.5,338.5 451.479,342.928 451.479,342.928 C451.479,342.928 451.469,342.75 450.5,342.75 C449,342.75 448,343.866 448,346 C448,346.5 448.25,346.75 448.5,346.75 C448.75,346.75 449,346.5 449,346 C449,344.533 450,344 450.5,344 C451,344 451.75,344 451.75,345.5 C451.75,346.25 452.25,346.5 452.5,346.5 C452.75,346.5 453.25,346.25 453.25,345.5 C453.25,343.5 453.925,343.25 454.425,343.25 C454.75,343.25 455.5,343.75 455.5,345 C455.5,345.5 455.75,345.75 456,345.75 C456.25,345.75 456.5,345.5 456.5,345 C456.5,343.5 455.5,342.25 454.5,342.25 C453.75,342.25 453.5,342.5 453.5,342.5 C453.75,341.5 454.25,339.5 456,339.5 C457.25,339.5 458.25,341.25 458.25,343.75 C458.25,344.5 458.75,344.75 459,344.75 C459.25,344.75 459.75,344.5 459.75,343.75 C459.75,342 459.25,340 458.25,339 C457.75,338.5 457,338 456,338 C453.75,338 453,339.75 452.5,341.25 C452.25,339.5 450.75,337 448.5,337 z" fill="#000000" id="poi-fountain-shape"/>
+    </g>
     <g id="poi-beach">
       <path d="M445,338 C445,338 445.045,348 445.045,348 L430.045,348 C432.195,347.952 434.838,345.924 434.838,345.924 C434.838,345.924 434.336,346.042 433.55,345.588 C433.4,345.458 433.26,345.318 433.11,345.198 C432.825,344.944 432.395,344.944 432.11,345.198 L431.64,345.608 C431.322,345.872 430.923,346.017 430.51,346.018 C430.234,346.024 430.006,345.804 430,345.528 C430,345.525 430,345.522 430,345.518 C430,345.242 430.224,345.018 430.5,345.018 C430.759,344.996 430.999,344.874 431.17,344.678 C431.441,344.39 431.788,344.182 432.17,344.078 C432.781,343.897 433.443,344.036 433.93,344.448 L434.32,344.798 C434.618,345.102 435.105,345.107 435.409,344.809 C435.413,344.806 435.416,344.802 435.42,344.798 C435.56,344.678 435.69,344.548 435.84,344.428 C436.556,344.042 436.85,344.12 436.85,344.12 L438.128,342.691 L437.94,342.578 C437.78,342.448 437.63,342.298 437.47,342.168 C437.185,341.914 436.755,341.914 436.47,342.168 C436.31,342.298 436.16,342.448 436,342.578 C435.292,343.175 434.258,343.175 433.55,342.578 C433.4,342.448 433.26,342.308 433.11,342.188 C432.825,341.934 432.395,341.934 432.11,342.188 L431.64,342.598 L431.112,342.907 L430.51,343.018 C430.51,343.018 430.02,343.036 430.01,342.518 C430,342 430.234,342.018 430.51,342.018 C430.769,341.996 431.009,341.874 431.18,341.678 C431.451,341.39 431.798,341.182 432.18,341.078 C432.792,340.897 433.453,341.036 433.94,341.448 L434.27,341.788 C434.568,342.092 435.055,342.097 435.359,341.799 C435.363,341.796 435.366,341.792 435.37,341.788 C435.51,341.668 435.64,341.538 435.79,341.418 C436.518,340.84 437.556,340.869 438.25,341.488 L438.64,341.828 L438.799,341.925 C440.426,339.835 442.351,338.275 445,338 z" fill="#000000" id="poi-beach-shape"/>
     </g>