diff --git a/src/etherpad_icon.svg b/src/etherpad_icon.svg
new file mode 100644
index 00000000..ebdcde99
--- /dev/null
+++ b/src/etherpad_icon.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg2987">
+  <defs
+     id="defs2989" />
+  <metadata
+     id="metadata2992">
+    <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>
+  <g
+     transform="translate(0,-1036.3618)"
+     id="layer1">
+    <path
+       d="m 5.0621446,1039.5621 c 5.6960494,0 6.2053964,0 6.2053964,0 l -0.0238,-0.8981 -3.131226,-0.018 -3.1312269,-0.018 z"
+       id="path3806"
+       style="fill:#464646;fill-opacity:1;stroke:#464646;stroke-width:0.68021488;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 12.4892,1052.3561 0,-2.1733 2.173211,0 0,2.1733 z"
+       id="path3770-7-0-9"
+       style="fill:#b1b1b1;fill-opacity:1;stroke:none" />
+    <path
+       d="m 1.6231475,1052.3561 0,-2.1733 2.1732107,0 0,2.1733 z"
+       id="path3770-7-0"
+       style="fill:#b1b1b1;fill-opacity:1;stroke:none" />
+    <path
+       d="m 2.7097528,1041.49 2.1732106,-1.0866 0,-2.1251"
+       id="path3775"
+       style="fill:none;stroke:#aeaeae;stroke-width:0.54330266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 13.575806,1041.49 -2.17321,-1.0866 0.0065,-2.0833"
+       id="path3777"
+       style="fill:none;stroke:#aeaeae;stroke-width:0.54330266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 1.6231475,1041.49 c 0.014561,3.8432 -0.019342,6.178 0,7.6063 0.030207,2.23 0,2.1732 0,2.1732 1.1853886,0 1.1853886,0 1.1853886,1.0866 l 10.6684869,0 c 0,-1.0866 0,-1.0866 1.185388,-1.0866 0,-3.26 0,-6.5198 0,-9.7795 z"
+       id="path3019"
+       style="fill:#464646;fill-opacity:1;stroke:none" />
+    <path
+       d="m 3.7963582,1050.1828 c 6.3865768,0 8.6928418,0 8.6928418,0"
+       id="path3023"
+       style="fill:none;stroke:#09c900;stroke-width:1.07546031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 3.7963582,1048.0095 8.6928418,0"
+       id="path3025"
+       style="fill:none;stroke:#fcc200;stroke-width:1.1616298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 3.7963582,1045.8365 8.6928418,0"
+       id="path3027"
+       style="fill:none;stroke:#00a3fb;stroke-width:1.1616298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 3.7963582,1043.6632 8.6928418,0"
+       id="path3029"
+       style="fill:none;stroke:#ff4091;stroke-width:1.1616298;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 1.6231475,1042.5766 0,-4.3464 1.0866053,0 0,4.3464 z"
+       id="path3770"
+       style="fill:#464646;fill-opacity:1;stroke:none" />
+    <path
+       d="m 13.575806,1042.5766 0,-4.3464 1.086605,0 0,4.3464 z"
+       id="path3770-1"
+       style="fill:#464646;fill-opacity:1;stroke:none" />
+    <path
+       d="m 1.6231475,1038.2302 0,-1.0867 1.0866053,0 0,1.0867 z"
+       id="path3770-7"
+       style="fill:#b1b1b1;fill-opacity:1;stroke:none" />
+    <path
+       d="m 13.575806,1038.2302 0,-1.0867 1.086605,0 0,1.0867 z"
+       id="path3770-4"
+       style="fill:#b1b1b1;fill-opacity:1;stroke:none" />
+    <path
+       d="m 5.3413804,1038.5358 c 2.6160566,-2.5761 3.1649988,-2.3796 5.6028086,0.018"
+       id="path3767"
+       style="fill:none;stroke:#464646;stroke-width:0.54330266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.5999999;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/src/static/favicon.ico b/src/static/favicon.ico
index df7b6289..938e9550 100644
Binary files a/src/static/favicon.ico and b/src/static/favicon.ico differ