diff --git a/src/c3nav/site/static/site/img/icons/cross.svg b/src/c3nav/site/static/site/img/icons/cross.svg
index ab1358a2..6716ee0d 100644
--- a/src/c3nav/site/static/site/img/icons/cross.svg
+++ b/src/c3nav/site/static/site/img/icons/cross.svg
@@ -1 +1,4 @@
-<?xml version="1.0" ?><svg height="48" viewBox="0 0 48 48" width="48" xmlns="http://www.w3.org/2000/svg"><path d="M38 12.83l-2.83-2.83-11.17 11.17-11.17-11.17-2.83 2.83 11.17 11.17-11.17 11.17 2.83 2.83 11.17-11.17 11.17 11.17 2.83-2.83-11.17-11.17z"/><path d="M0 0h48v48h-48z" fill="none"/></svg>
\ No newline at end of file
+<svg fill="#000000" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
+    <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file
diff --git a/src/c3nav/site/static/site/img/icons/location.svg b/src/c3nav/site/static/site/img/icons/location.svg
index a553cc0e..9fa28f85 100644
--- a/src/c3nav/site/static/site/img/icons/location.svg
+++ b/src/c3nav/site/static/site/img/icons/location.svg
@@ -1,45 +1,4 @@
-<?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"
-   enable-background="new 0 0 512 512"
-   height="512px"
-   version="1.1"
-   viewBox="0 0 512 512"
-   width="512px"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="icon_location.svg"><metadata
-     id="metadata20"><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="defs18" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1732"
-     inkscape:window-height="480"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="0.4609375"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><path
-     style="fill:#000000;fill-opacity:1"
-     inkscape:connector-curvature="0"
-     id="path10"
-     d="m 256,36.082 c -84.553,0 -153.105,68.554 -153.105,153.106 0,113.559 153.105,286.73 153.105,286.73 0,0 153.106,-173.172 153.106,-286.73 C 409.106,104.636 340.552,36.082 256,36.082 Z m 0,217.705 c -35.682,0 -64.6,-28.917 -64.6,-64.6 0,-35.683 28.918,-64.6 64.6,-64.6 35.682,0 64.6,28.917 64.6,64.6 0,35.683 -28.918,64.6 -64.6,64.6 z" /></svg>
\ No newline at end of file
+<svg fill="#000000" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file
diff --git a/src/c3nav/site/static/site/img/icons/navigation.svg b/src/c3nav/site/static/site/img/icons/navigation.svg
new file mode 100644
index 00000000..20d6b393
--- /dev/null
+++ b/src/c3nav/site/static/site/img/icons/navigation.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12 2L4.5 20.29l.71.71L12 18l6.79 3 .71-.71z"/>
+</svg>
\ No newline at end of file
diff --git a/src/c3nav/site/static/site/img/icons/toilet.svg b/src/c3nav/site/static/site/img/icons/toilet.svg
deleted file mode 100644
index 9eae1619..00000000
--- a/src/c3nav/site/static/site/img/icons/toilet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><svg height="399.035" id="svg1569" width="432.631" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs1571"><marker id="ArrowEnd" markerHeight="3" markerUnits="strokeWidth" markerWidth="4" orient="auto" refX="0" refY="5" viewBox="0 0 10 10"><path d="M 0 0 L 10 5 L 0 10 z" id="path1574"/></marker><marker id="ArrowStart" markerHeight="3" markerUnits="strokeWidth" markerWidth="4" orient="auto" refX="10" refY="5" viewBox="0 0 10 10"><path d="M 10 0 L 0 5 L 10 10 z" id="path1577"/></marker></defs><g id="g1579"><g id="g1581"><path d="M 245.234 3.578L 245.234 396.839L 208.192 396.839L 208.192 3.578L 245.234 3.578z" id="path1583" style="stroke:none; fill:#000000"/><path d="M 226.713 200.209" id="path1585" style="stroke:none; fill:#000000"/></g><g id="g1587"><g id="g1589"><path d="M 91.6336 64.828C 109.536 64.828 124.049 50.317 124.049 32.414C 124.049 14.514 109.536 0 91.6336 0C 73.7346 0 59.2206 14.514 59.2206 32.414C 59.2206 50.317 73.7346 64.828 91.6336 64.828z" id="path1591" style="stroke:none; fill:#000000"/><path d="M 91.6336 32.414" id="path1593" style="stroke:none; fill:#000000"/></g><path d="M 86.8416 270.35L 86.8546 383.735C 86.8546 404.135 56.2896 404.135 56.2896 383.735L 56.2766 270.35L 15.7726 270.35L 59.1116 120.007L 52.2996 120.007L 26.7766 205.888C 20.7016 224.62 -5.01541 216.925 0.868576 196.867L 29.2066 103.564C 32.2446 92.924 45.7006 74.061 68.9926 74.061L 90.4696 74.061L 90.4696 74.061L 113.585 74.061C 136.669 74.061 150.186 93.083 153.679 103.564L 182.029 196.776C 187.699 216.823 162.184 225.126 156.109 205.585L 130.595 120.007L 123.219 120.007L 167.023 270.35L 126.342 270.35L 126.342 383.885C 126.342 404.135 95.9046 404.034 95.9046 383.885L 95.9046 270.35L 86.8416 270.35z" id="path1595" style="stroke:none; fill:#000000"/></g><g id="g1597"><path d="M 322.947 73.94C 300.139 73.94 281.796 92.807 281.796 116.34L 281.796 216.64C 281.796 236.14 309.932 236.14 309.932 216.64L 309.932 124.926L 316.593 124.926L 316.593 379.053C 316.593 405.125 354.061 404.358 354.061 379.053L 354.061 230.277L 360.514 230.277L 360.514 379.053C 360.514 404.358 398.187 405.125 398.187 379.053L 398.187 124.926L 404.692 124.926L 404.692 216.64C 404.692 236.291 432.682 236.29 432.631 216.64L 432.631 116.94C 432.631 95.24 416.017 73.985 390.975 73.985L 322.947 73.94z" id="path1599" style="stroke:none; fill:#000000"/><g id="g1601"><path d="M 357.134 64.828C 375.035 64.828 389.548 50.317 389.548 32.414C 389.548 14.514 375.035 0 357.134 0C 339.234 0 324.72 14.514 324.72 32.414C 324.72 50.317 339.234 64.828 357.134 64.828z" id="path1603" style="stroke:none; fill:#000000"/><path d="M 357.134 32.414" id="path1605" style="stroke:none; fill:#000000"/></g></g></g></svg>
\ No newline at end of file