diff --git a/static/toodego/_maps.scss b/static/toodego/_maps.scss
index 04a19d1a..7b4e4495 100644
--- a/static/toodego/_maps.scss
+++ b/static/toodego/_maps.scss
@@ -23,9 +23,12 @@
 div.leaflet-div-icon span.layer-aire-de-covoiturage,
 div.leaflet-div-icon span.layer-autopartage,
 div.leaflet-div-icon span.layer-bibliotheque,
+div.leaflet-div-icon span.layer-borne-fontaine,
 div.leaflet-div-icon span.layer-decheterie,
 div.leaflet-div-icon span.layer-donnerie,
 div.leaflet-div-icon span.layer-evenement-routier,
+div.leaflet-div-icon span.layer-fontaine-eau-potable,
+div.leaflet-div-icon span.layer-fontaine-ornementale,
 div.leaflet-div-icon span.layer-mairie,
 div.leaflet-div-icon span.layer-mdr,
 div.leaflet-div-icon span.layer-parc-velo,
@@ -116,6 +119,18 @@ div.leaflet-div-icon span.layer-silo-a-verre {
 	background-image: url($data_uri_ic_Silos_verre);
 }
 
+div.leaflet-div-icon span.layer-borne-fontaine {
+	background-image: url($data_uri_ic_BorneFontaine);
+}
+
+div.leaflet-div-icon span.layer-fontaine-eau-potable {
+	background-image: url($data_uri_ic_FontaineEauPotable);
+}
+
+div.leaflet-div-icon span.layer-fontaine-ornementale {
+	background-image: url($data_uri_ic_FontaineOrnementale);
+}
+
 div.location-icon {
 	background: $red;
 	border: 1px solid white;
diff --git a/static/toodego/img/ic_BorneFontaine.svg b/static/toodego/img/ic_BorneFontaine.svg
new file mode 100644
index 00000000..45e2444d
--- /dev/null
+++ b/static/toodego/img/ic_BorneFontaine.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg data-name="Calque 1" version="1.1" viewBox="0 0 31 43" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>ic_Déchetterie</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style>.cls-1{fill:#0090bb;}.cls-2{fill:#fff;}</style>
+ </defs>
+ <title>ic_Déchetterie</title>
+ <path class="cls-1" d="M15.18,0A15.18,15.18,0,0,0,0,15.17a15.9,15.9,0,0,0,3.14,9.25l12,16.86,12-16.86a15.91,15.91,0,0,0,3.14-9.25A15.18,15.18,0,0,0,15.18,0Z" fill="#0090bb"/>
+ <path class="cls-2" d="m24.65 15.17a9.47 9.47 0 1 1-9.47-9.47 9.46 9.46 0 0 1 9.47 9.47z"/>
+ <g transform="matrix(.0034173 0 0 -.0034173 9.2131 23.047)" fill="#0090bb" stroke-width="39.017">
+  <path d="m2320.2 3654.2c247.36-0.07 448.08 200.65 448 448 0.08 247.83-200.64 448.57-448 449-247.85-0.43-448.58-201.17-449-449 0.42-247.35 201.15-448.07 449-448"/>
+  <path d="m1290.2 4015.2c254.75 129.75 609.75-110.25 612-374v-853l407-448c185.75-210.25-109.28-497.76-315-288l-460 506c-28.01 27.26-49.34 60.81-49 139v408l-801-433v-2172c-0.281-490.25-664.75-490.15-665-4v2575c0.25 143.28 57.16 282.88 199 364l1072 580"/>
+  <path d="m2955.2 1810.2h705v1285l-1420 2c-182.75 0.25-251.09-205.58-138-335l853-952"/>
+  <path d="m2546.2 3155.2c29.79 0.13 54.32 24.67 54 55 0.32 30.2-24.21 54.74-54 55-30.74-0.26-55.28-24.8-55-55-0.28-30.33 24.26-54.87 55-55"/>
+  <path d="m2692.2 3146.2c30.55-0.47 55.09 24.07 55 54 0.09 30.6-24.45 55.13-55 55-29.98 0.13-54.51-24.4-55-55 0.49-29.93 25.02-54.47 55-54"/>
+  <path d="m2702.2 3307.2c29.95 0.49 54.49 25.03 54 55 0.49 30.56-24.05 55.1-54 55-30.58 0.1-55.11-24.44-55-55-0.11-29.97 24.42-54.51 55-55"/>
+  <path d="m2556.2 3318.2c29.77-0.29 54.3 24.24 54 55 0.3 29.77-24.23 54.31-54 54-30.76 0.31-55.3-24.23-55-54-0.3-30.76 24.24-55.29 55-55"/>
+  <path d="m2603.2 3468.2c31.75-0.08 57.51 25.68 58 57-0.49 32.24-26.25 58-58 58-31.81 0-57.57-25.76-58-58 0.43-31.32 26.19-57.08 58-57"/>
+  <path d="m2781.2 3439.2c32.14 0.13 57.9 25.89 58 58-0.1 31.45-25.86 57.21-58 57-31.42 0.21-57.18-25.55-57-57-0.18-32.11 25.58-57.87 57-58"/>
+  <path d="m2718.2 3587.2c33.34 0.43 60.39 27.48 60 61 0.39 33.22-26.66 60.27-60 60-33.39 0.27-60.45-26.78-60-60-0.45-33.52 26.61-60.57 60-61"/>
+  <path d="m2925.2 3491.2c32.9 0.45 59.95 27.5 60 61-0.05 33.23-27.1 60.28-60 60-33.83 0.28-60.89-26.77-61-60 0.11-33.5 27.17-60.55 61-61"/>
+  <path d="m2859.2 3640.2c33.15 0.22 60.2 27.27 60 61 0.2 33.01-26.85 60.06-60 60-33.58 0.06-60.63-26.99-61-60 0.37-33.73 27.42-60.78 61-61"/>
+  <path d="m3022.2 3640.2c36.52 0.02 66.35 29.84 66 67 0.35 36.42-29.48 66.24-66 66-37.05 0.24-66.88-29.58-67-66 0.12-37.16 29.95-66.98 67-67"/>
+  <path d="m3073.2 3434.2c37.18-0.34 67 29.49 67 66 0 37.06-29.82 66.89-67 67-36.4-0.11-66.22-29.94-66-67-0.22-36.51 29.6-66.34 66-66"/>
+  <path d="m3175.2 3561.2c38.92 0.1 70.24 31.42 70 70 0.24 38.67-31.08 69.99-70 70-38.33-0.01-69.65-31.33-70-70 0.35-38.58 31.67-69.9 70-70"/>
+  <path d="m3309.2 3426.2c40.56-0.37 73.44 32.51 73 73 0.44 40.63-32.44 73.51-73 74-40.56-0.49-73.44-33.37-73-74-0.44-40.49 32.44-73.37 73-73"/>
+  <path d="m3182.2 3296.2c40.74 0.06 73.62 32.94 74 74-0.38 40.06-33.26 72.94-74 73-40.37-0.06-73.25-32.94-73-73-0.25-41.06 32.63-73.94 73-74"/>
+ </g>
+</svg>
diff --git a/static/toodego/img/ic_FontaineEauPotable.svg b/static/toodego/img/ic_FontaineEauPotable.svg
new file mode 100644
index 00000000..5827af5e
--- /dev/null
+++ b/static/toodego/img/ic_FontaineEauPotable.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg data-name="Calque 1" version="1.1" viewBox="0 0 31 43" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>ic_Déchetterie</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style>.cls-1{fill:#0090bb;}.cls-2{fill:#fff;}</style>
+ </defs>
+ <title>ic_Déchetterie</title>
+ <path class="cls-1" d="M15.18,0A15.18,15.18,0,0,0,0,15.17a15.9,15.9,0,0,0,3.14,9.25l12,16.86,12-16.86a15.91,15.91,0,0,0,3.14-9.25A15.18,15.18,0,0,0,15.18,0Z" fill="#0090bb"/>
+ <path class="cls-2" d="m24.65 15.17a9.47 9.47 0 1 1-9.47-9.47 9.46 9.46 0 0 1 9.47 9.47z"/>
+ <g transform="matrix(.05042 0 0 .05042 8.0127 8.2645)" fill="#0090bb" stroke-width="19.834">
+  <path d="m96.359 90.597c2.245 0 4.441-0.912 6.026-2.497 1.584-1.584 2.497-3.781 2.497-6.026 0-2.246-0.913-4.442-2.497-6.027-1.584-1.583-3.78-2.496-6.026-2.496s-4.442 0.913-6.027 2.496c-1.583 1.584-2.496 3.781-2.496 6.027 0 2.245 0.913 4.441 2.496 6.026 1.584 1.584 3.781 2.497 6.027 2.497z"/>
+  <path d="m187.6 123.18c-2.236 0-4.443 0.913-6.027 2.496-1.583 1.584-2.496 3.781-2.496 6.027 0 2.245 0.913 4.441 2.496 6.026 1.584 1.584 3.79 2.497 6.027 2.497 2.245 0 4.441-0.913 6.026-2.497 1.594-1.584 2.497-3.781 2.497-6.026 0-2.246-0.903-4.442-2.497-6.027-1.585-1.583-3.781-2.496-6.026-2.496z"/>
+  <path d="m220.68 76.048c-1.583 1.584-2.496 3.781-2.496 6.027 0 2.245 0.913 4.441 2.496 6.026 1.584 1.584 3.781 2.497 6.027 2.497 2.245 0 4.441-0.912 6.026-2.497 1.584-1.584 2.497-3.781 2.497-6.026 0-2.246-0.913-4.442-2.497-6.027-1.584-1.583-3.781-2.496-6.026-2.496-2.247 0-4.443 0.912-6.027 2.496z"/>
+  <path d="m271.42 176.65c-1.577-2.392-4.251-3.832-7.117-3.832h-231.61c-2.866 0-5.539 1.44-7.117 3.832-1.576 2.393-1.846 5.418-0.716 8.051 3.444 8.025 7.705 15.431 12.69 22.207h221.9c4.985-6.777 9.246-14.182 12.69-22.207 1.13-2.633 0.86-5.658-0.716-8.051z"/>
+  <path d="m148.5 256.04c40.267 0 74.003-12.072 97.578-34.09h-195.16c23.575 22.017 57.311 34.09 97.578 34.09z"/>
+  <path d="m148.5 270.07c-15.402 0-29.92-1.626-43.486-4.824-3.286 6.541-5.142 13.918-5.142 21.724 0 5.537 4.489 10.027 10.027 10.027h77.205c5.537 0 10.027-4.49 10.027-10.027 0-7.806-1.856-15.183-5.142-21.725-13.568 3.199-28.087 4.825-43.489 4.825z"/>
+  <path d="m98.868 63.265c5.537 0 10.027-4.489 10.027-10.027 0-8.768 7.127-15.902 15.889-15.902s15.889 7.133 15.889 15.902v51.28c-2.424-0.696-4.98-1.077-7.625-1.077-15.262 0-27.679 12.421-27.679 27.687 0 5.537 4.489 10.027 10.027 10.027 5.537 0 10.027-4.489 10.027-10.027 0-4.209 3.421-7.634 7.626-7.634s7.625 3.424 7.625 7.634v27.65h20.053v-60.16c0-4.411 3.585-8 7.991-8s7.991 3.589 7.991 8c0 5.537 4.489 10.027 10.027 10.027s10.027-4.489 10.027-10.027c0-15.469-12.58-28.053-28.044-28.053-2.776 0-5.457 0.412-7.991 1.167v-27.135c0-13.533 11.003-24.544 24.527-24.544s24.527 11.011 24.527 24.544c0 5.537 4.49 10.027 10.027 10.027s10.027-4.49 10.027-10.027c-3e-3 -24.591-20.001-44.597-44.583-44.597-17.171 0-32.096 9.769-39.54 24.036-5.899-4.243-13.125-6.752-20.929-6.752-19.818 0-35.942 16.13-35.942 35.955 0 5.537 4.489 10.026 10.026 10.026z"/>
+ </g>
+</svg>
diff --git a/static/toodego/img/ic_FontaineOrnementale.svg b/static/toodego/img/ic_FontaineOrnementale.svg
new file mode 100644
index 00000000..5ac5d903
--- /dev/null
+++ b/static/toodego/img/ic_FontaineOrnementale.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg data-name="Calque 1" version="1.1" viewBox="0 0 31 43" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>ic_Déchetterie</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style>.cls-1{fill:#0090bb;}.cls-2{fill:#fff;}</style>
+ </defs>
+ <title>ic_Déchetterie</title>
+ <path class="cls-1" d="M15.18,0A15.18,15.18,0,0,0,0,15.17a15.9,15.9,0,0,0,3.14,9.25l12,16.86,12-16.86a15.91,15.91,0,0,0,3.14-9.25A15.18,15.18,0,0,0,15.18,0Z" fill="#0090bb"/>
+ <path class="cls-2" d="m24.65 15.17a9.47 9.47 0 1 1-9.47-9.47 9.46 9.46 0 0 1 9.47 9.47z"/>
+ <g transform="matrix(.024467 0 0 .024467 8.8179 8.681)" fill="#0090bb" stroke-width="40.871">
+  <path d="m113.53 360.16h328.95v52.02h-328.95zm415.55 60.587h-511.94c-9.486 0-17.136 7.65-17.136 17.136s7.65 17.136 17.136 17.136h10.098v60.589h493.27v-60.589h8.568c9.486 0 17.137-7.649 17.137-17.136s-7.65-17.136-17.137-17.136zm-380.66-141.07c0 12.853 10.404 23.868 23.868 23.868 8.568 0 15.912-4.284 20.196-11.628 8.568 16.218 16.218 36.72 16.218 58.752h155.75c0-24.479 5.814-44.37 12.547-59.67 4.283 7.038 11.934 11.934 20.502 11.934 12.852 0 23.867-10.403 23.867-23.867 0-12.546-9.484-22.95-22.031-23.562h-1.836-5.814-15.912-23.561-28.766-31.518-32.129-30.294-26.01-19.584c-4.896 0-9.792-0.612-14.688 0.306-6.12 0.918-11.322 3.978-15.3 8.568-3.366 4.283-5.508 9.791-5.508 15.299zm181.15-186.05c-1.836 0.612-3.672 0.918-6.121 0.918-1.836 0-3.977 0-5.812-0.612-8.568-1.53-15.912-7.038-21.115-12.852-0.611 0.612-0.918 0.918-0.918 1.53-5.201 6.732-13.77 10.404-24.48 11.628h-4.284c-13.464 0-22.338-5.814-27.846-12.546-2.754 2.754-6.732 5.202-10.098 7.65 7.65 15.3 13.77 34.272 13.77 54.468h78.336c0-19.584 3.979-36.108 8.568-50.184zm-146.27 82.314c0 12.852 10.404 23.868 23.868 23.868 8.568 0 15.912-4.284 20.196-11.628 8.568 16.218 16.218 36.72 16.218 58.752h78.029c0-24.48 5.814-44.37 12.547-59.67 4.283 7.038 11.934 11.934 20.502 11.934 12.852 0 23.867-10.404 23.867-23.868 0-12.546-9.486-22.95-22.031-23.562h-1.836-9.486-23.867-32.131-33.66-28.764-17.442c-6.426 0-13.158 1.53-18.054 6.12-5.202 4.59-7.956 11.322-7.956 18.054zm226.75-134.03s-39.781-11.322-130.66-11.322c-90.883 0-115.67 10.404-115.67 10.404-17.136 9.486-40.086 40.086-18.972 42.228h1.836c21.114 0 52.02-26.928 52.02-26.928s-9.486 24.786 3.366 29.682c1.836 0.612 3.672 0.918 6.12 0.918 5.814 0 11.628-2.448 16.83-5.202 7.038-4.284 12.852-10.098 15.912-15.3 0 0 4.284 19.278 26.316 19.278h3.366c25.398-1.836 22.951-22.95 22.951-22.95s11.627 20.502 25.703 23.562c1.529 0.612 2.754 0.612 3.672 0.612 11.016 0 14.383-10.098 14.383-24.48 0 0 0 4.284 2.447 9.18 2.754 6.12 8.568 13.77 22.031 13.77 1.531 0 3.367 0 4.896-0.612 13.465-1.53 9.18-21.114 4.285-28.764 0 0 22.338 29.07 39.779 29.07 4.283 0 8.568-1.836 11.934-6.12 14.688-18.666-12.544-37.026-12.544-37.026zm-317.02 88.74c3.366 2.754 9.18 1.53 12.546-2.754s3.672-18.054 3.672-18.054-13.464 4.284-16.83 8.568c-2.754 3.978-2.754 9.792 0.612 12.24zm1.836-59.976c-4.896 1.836-7.65 6.732-6.12 11.016s6.732 5.814 11.934 4.284c4.896-1.836 12.852-13.464 12.852-13.464s-13.464-3.672-18.666-1.836zm-32.436 65.484c3.366-4.284 3.672-18.054 3.672-18.054s-13.464 4.284-16.83 8.568-2.754 10.098 0.612 12.546c3.366 2.754 9.18 1.224 12.546-3.06zm409.73-54.774c-4.283-2.754-18.055-3.366-18.055-3.366s4.896 13.464 9.18 16.218c4.285 2.754 10.1 2.754 12.547-0.918 2.143-3.978 0.611-9.18-3.672-11.934zm-27.846 50.49c3.672-1.836 5.201-7.038 3.365-11.934s-14.381-11.934-14.381-11.934-2.449 13.77 0 18.666c2.142 4.897 7.345 7.038 11.016 5.202zm32.129 20.502c2.449 4.896 7.039 7.038 11.629 5.202 4.283-1.836 5.201-7.038 3.365-11.934s-14.381-11.934-14.381-11.934-3.06 14.076-0.613 18.666z" fill="#0090bb" stroke-width="40.871"/>
+ </g>
+</svg>