diff --git a/assets/svg/square.svg b/assets/svg/square.svg
new file mode 100644
index 000000000..6597e364c
--- /dev/null
+++ b/assets/svg/square.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg3"
+   width="100"
+   height="100"
+   viewBox="0 0 100 100"
+   version="1.1"
+   style="fill:none">
+  <metadata
+     id="metadata9">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <rect
+     y="-1.4210855e-14"
+     x="-0.42372882"
+     height="100.42373"
+     width="100.84746"
+     id="rect819"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+</svg>
diff --git a/assets/themes/charging_stations/bicycle.svg b/assets/themes/charging_stations/bicycle.svg
new file mode 100644
index 000000000..ab99c13d4
--- /dev/null
+++ b/assets/themes/charging_stations/bicycle.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="800"
+   height="800"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="bicycle.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="697"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.295"
+     inkscape:cx="400"
+     inkscape:cy="400"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     d="m 600.236,251.91425 c 60.2012,0 109.004,48.8057 109.004,109.005 0,60.1993 -48.8027,108.997 -109.002,108.997 -60.1993,0 -108.998,-48.7988 -108.998,-108.996 0,-44.4746 26.6719,-82.6602 64.8594,-99.6094 l -0.007,-0.0215 -10.0693,-31.8105 -132.35,132.34 12.1113,34.5869 h 8.17188 c 6.19629,0 11.2207,5.02441 11.2207,11.2197 0,6.19824 -5.02246,11.2227 -11.2207,11.2227 h -32.5234 c -6.19824,0 -11.2227,-5.02246 -11.2227,-11.2227 0,-6.19531 5.02246,-11.2197 11.2227,-11.2197 h 2.61035 l -11.0225,-26.5186 h -31.6738 c -4.56836,55.9932 -51.3721,100.03 -108.544,100.03 -60.2012,0 -109,-48.7988 -109,-108.996 0,0 0.8418,-14.7031 2.94238,-24.2158 9.46094,-42.8682 40.7471,-71.4756 96.4258,-86.7461 22.4062,-6.14453 28.418,-22.749 26.748,-35.0977 -1.38965,-10.3242 -8.90234,-22.375 -25.5273,-22.375 h -30.7402 v 20.5322 c 0,8.71191 -7.06348,15.7773 -15.7754,15.7773 h -49.7246 c -8.71289,0 -15.7744,-7.06543 -15.7744,-15.7773 v -0.14063 h -29.8203 c -1.41309,0 -2.558586,-1.14551 -2.558586,-2.55859 v -12.7158 c 0,-1.41602 1.145506,-2.56348 2.558586,-2.56348 h 29.8203 v -27.4355 h -29.8203 c -1.41309,0 -2.558586,-1.14551 -2.558586,-2.55859 v -12.7158 c 0,-1.41602 1.145506,-2.56152 2.558586,-2.56152 h 29.8203 v -0.13671 c 0,-8.7168 7.06152,-15.7822 15.7744,-15.7822 h 49.7246 c 8.71191,0 15.7754,7.06641 15.7754,15.7812 v 20.5254 h 30.7383 c 24.7568,0 44.3525,17.1572 47.6641,41.7256 3.09082,22.959 -9.00195,50.2939 -42.9834,59.6162 -42.9551,11.7803 -68.0293,30.791 -77.835,59.9746 0,0 -3.86914,19.7227 -3.86621,29.4443 0.0205,47.1816 38.25,85.4307 85.4346,85.4307 44.1533,0 80.4727,-33.4951 84.958,-76.46 h -32.8154 c -4.28125,25.002 -25.9209,44.0781 -52.1455,44.0781 -29.2988,0 -53.0488,-23.7568 -53.0488,-53.0508 0,-29.3027 23.75,-53.0508 53.0488,-53.0508 3.06934,0 6.0332,0.40234 8.95996,0.90527 l 14.4961,-30.0234 10.3301,-21.3975 33.1113,-68.5654 -13.958,-34.6377 h -23.3193 c -6.54102,0 -6.61426,-5.29004 -6.61426,-11.8242 0,-6.53223 0.0732,-11.834 6.61426,-11.834 h 75.9678 c 6.53027,0 11.832,5.2998 11.832,11.834 0,6.5342 -5.2998,11.8242 -11.832,11.8242 h -27.1416 l 9.17383,22.7344 h 188.943 l -9.22949,-29.1465 c -0.75,-1.58789 -5.55371,-10.9756 -15.6143,-10.9756 h -28.417 c -6.53027,0 -6.60547,-5.2998 -6.60547,-11.8301 0,-6.53223 0.0752,-11.834 6.60547,-11.834 h 28.417 c 21.3887,0 33.7207,16.3057 37.6396,25.9385 0.11036,0.31348 8.87891,27.9746 20.1582,63.5801 0.11817,0.26562 0.16504,0.54297 0.25879,0.82031 5.0332,15.8916 10.5586,33.333 16.0273,50.6309 l 0.007,0.0147 c 6.99023,-1.40625 14.2188,-2.16406 21.624,-2.16406 z m -296.703,94.302 h 33.3389 c -4.24121,-24.3848 -18.7734,-45.1855 -39.0098,-57.7891 l -14.2266,29.4658 c 9.53125,6.84277 16.5479,16.7695 19.8975,28.3232 z m 57.226,0 22.4229,9.8e-4 -10.4668,-25.959 -6.52051,-0.0254 c -6.19629,-0.0186 -11.207,-4.82812 -11.1885,-10.7363 0.0166,-5.22168 3.95703,-9.55273 9.14844,-10.4766 l -32.5,-80.5928 -23.4658,48.6123 c 28.0762,16.6035 48.0186,45.4414 52.5703,79.1768 z m 44.237,-9.173 132.979,-132.968 -1.11523,-3.53027 h -186.895 l 39.6582,98.3652 9.16406,0.0283 c 6.19824,0.0215 11.208,4.82422 11.1875,10.7324 -0.0186,5.91309 -5.05664,10.6885 -11.2568,10.667 h -0.45605 z m 195.247,109.3036 c 47.1846,0 85.4336,-38.249 85.4336,-85.4268 0,-47.1895 -38.249,-85.4385 -85.4336,-85.4385 -5.13477,0 -10.1055,0.64258 -14.9932,1.51074 l 0.47949,1.51465 c 14.0137,44.2676 23.7354,77.6143 23.7354,77.6143 1.94824,6.16797 -1.46484,12.75 -7.64355,14.709 -6.16992,1.94824 -12.7588,-1.47461 -14.709,-7.63672 l -23.7188,-77.5771 -0.39746,-1.25781 c -28.4307,13.8711 -48.1846,42.7881 -48.1846,76.5576 0,47.1816 38.249,85.4307 85.4316,85.4307 z"
+     id="path2"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/assets/themes/charging_stations/car.svg b/assets/themes/charging_stations/car.svg
new file mode 100644
index 000000000..7ceb73118
--- /dev/null
+++ b/assets/themes/charging_stations/car.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="car.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="697"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" /><metadata
+     id="metadata14"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs12" /><path
+     style="fill:#000000;stroke-width:0.89789873"
+     d="m 91.489281,42.886869 -2.620068,-0.0099 v -1.820041 c 0,-5.78157 -4.688827,-10.470397 -10.471295,-10.470397 h -1.03438 L 69.323753,19.26046 C 67.912256,17.378464 66.552838,16.643983 64.38531,16.643983 H 42.424503 c -2.166629,0 -3.524252,0.734481 -4.938443,2.616477 l -8.037091,11.326094 -13.578922,0.0018 c -2.312988,0 -4.188698,1.873017 -4.188698,4.188698 v 8.099944 l -2.765528,0.01078 c -0.869166,0 -1.5704249,0.697667 -1.5704249,1.569527 v 4.138415 c 0,0.866472 0.7012589,1.571323 1.5704249,1.571323 l 7.814413,-0.0018 c -0.152643,0.655466 -0.232556,1.343256 -0.232556,2.046311 0,5.052476 4.097112,9.14869 9.14869,9.14869 5.051578,0 9.147792,-4.096214 9.147792,-9.14869 0,-0.706646 -0.08081,-1.394437 -0.232556,-2.05529 l 13.059937,-0.0054 17.140887,0.0099 c -0.149051,0.657262 -0.23076,1.345053 -0.23076,2.049903 0,5.052476 4.096214,9.147792 9.147792,9.147792 5.051578,0 9.147792,-4.096214 9.147792,-9.147792 0,-0.701259 -0.07901,-1.385458 -0.228066,-2.040026 l 8.890095,-0.0036 c 0.868268,0 1.571323,-0.704851 1.571323,-1.571323 v -4.139313 c 0,-0.870064 -0.703953,-1.569527 -1.571323,-1.569527 z M 25.64547,56.685776 c -2.470119,0 -4.474229,-2.002314 -4.474229,-4.473331 0,-2.471017 2.00411,-4.473331 4.474229,-4.473331 2.471017,0 4.472433,2.002314 4.472433,4.473331 0,2.471017 -2.002314,4.473331 -4.472433,4.473331 z M 56.130029,19.710307 c 1.972684,-1.974479 4.936648,0.985893 2.96127,2.962168 l -4.241673,4.240776 -2.960372,-2.963066 z m 3.034898,19.659493 -0.348385,-0.346589 -2.300416,2.300416 c -2.872378,2.873276 -7.41395,3.060937 -10.506313,0.567472 l -6.387652,6.38855 -2.96127,-2.962168 6.433445,-6.433445 c -2.18369,-3.076201 -1.896362,-7.366361 0.858391,-10.123808 l 2.300417,-2.300416 -0.678812,-0.67971 c -1.974479,-1.973581 0.988587,-4.935749 2.963066,-2.962168 l 13.588799,13.587902 c 1.974479,1.976275 -0.989484,4.938443 -2.96127,2.963964 z m 6.064408,-10.561983 -4.243469,4.241673 -2.960372,-2.962167 4.240775,-4.240776 c 1.97448,-1.974479 4.936647,0.987688 2.963066,2.96127 z m 8.448329,27.877959 c -2.471017,0 -4.472433,-2.002314 -4.472433,-4.473331 0,-2.471017 2.001416,-4.473331 4.472433,-4.473331 2.471915,0 4.473332,2.002314 4.473332,4.473331 0,2.471017 -2.001417,4.473331 -4.473332,4.473331 z"
+     id="path2"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/assets/themes/charging_stations/logo.svg b/assets/themes/charging_stations/logo.svg
new file mode 100644
index 000000000..8b8592dba
--- /dev/null
+++ b/assets/themes/charging_stations/logo.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24.152542 24.152542"
+   enable-background="new 0 0 24 24"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="logo.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   width="24.152542"
+   height="24.152542"><metadata
+   id="metadata14"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs12" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="995"
+   id="namedview10"
+   showgrid="false"
+   inkscape:zoom="11.125147"
+   inkscape:cx="-5.1237331"
+   inkscape:cy="7.0769496"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="layer1" />
+
+<g
+   inkscape:groupmode="layer"
+   id="layer1"
+   inkscape:label="bg"
+   style="display:inline"
+   transform="translate(0.12711811)"><circle
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path814"
+     cx="11.949153"
+     cy="12.076271"
+     r="12.076271" /></g><g
+   inkscape:groupmode="layer"
+   id="layer2"
+   inkscape:label="fg"
+   transform="translate(0.12711811)"><path
+     d="m 16.739623,11.453018 2.12132,-2.1213204 c 0.424264,-0.4242641 0.424264,-0.9899495 0,-1.4142136 -0.424264,-0.424264 -0.98995,-0.424264 -1.414214,0 l -2.12132,2.121321 -1.414213,-1.4142142 2.12132,-2.1213203 c 0.424264,-0.4242641 0.424264,-0.9899495 0,-1.4142136 -0.424264,-0.4242638 -1.06066,-0.3535532 -1.414214,2e-7 L 12.496982,7.2103775 11.082769,5.7961639 8.4664736,8.4124588 C 6.769417,10.109515 6.557285,12.72581 7.830077,14.705709 l -5.1618795,5.16188 1.4142136,1.414213 5.1618795,-5.161879 c 1.9798994,1.272792 4.5961944,1.06066 6.2932504,-0.636396 l 2.616295,-2.616295 z"
+     id="path2"
+     inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/assets/themes/charging_stations/plug.svg b/assets/themes/charging_stations/plug.svg
new file mode 100644
index 000000000..52132059b
--- /dev/null
+++ b/assets/themes/charging_stations/plug.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24 30"
+   enable-background="new 0 0 24 24"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="plug.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+   id="metadata14"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs12" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="995"
+   id="namedview10"
+   showgrid="false"
+   inkscape:zoom="7.8666667"
+   inkscape:cx="-9.1016949"
+   inkscape:cy="15"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg8" /><path
+   d="m 18.328606,12.15217 2.12132,-2.12132 c 0.424264,-0.4242635 0.424264,-0.9899493 0,-1.4142133 -0.424264,-0.4242641 -0.989949,-0.4242641 -1.414214,0 l -2.12132,2.1213203 -1.414213,-1.4142135 2.12132,-2.1213204 c 0.424264,-0.4242641 0.424264,-0.9899495 0,-1.4142135 -0.424264,-0.4242641 -1.06066,-0.3535534 -1.414214,0 L 14.085965,7.9095299 12.671751,6.4953163 10.055456,9.1116115 C 8.3584001,10.808667 8.1462681,13.424962 9.4190603,15.404861 l -5.1618795,5.16188 1.4142135,1.414213 5.1618797,-5.161879 c 1.979899,1.272792 4.596194,1.06066 6.29325,-0.636396 l 2.616295,-2.616295 z"
+   id="path2"
+   inkscape:connector-curvature="0" />
+
+</svg>
\ No newline at end of file
diff --git a/assets/themes/shops/shops.json b/assets/themes/shops/shops.json
index 65ab6f2c6..63bf4043e 100644
--- a/assets/themes/shops/shops.json
+++ b/assets/themes/shops/shops.json
@@ -17,7 +17,7 @@
     "fr"
   ],
   "maintainer": "MapComplete",
-  "icon": "./assets/themes/shops/shop.svg",
+  "icon": "circle:#fff;./assets/themes/shops/shop.svg",
   "version": "0",
   "startLat": 0,
   "startLon": 0,