diff --git a/src/octoprint/static/img/favicon.svg b/src/octoprint/static/img/favicon.svg
new file mode 100644
index 00000000..a16a1a32
--- /dev/null
+++ b/src/octoprint/static/img/favicon.svg
@@ -0,0 +1,67 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg4693"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="octoprint-favicon-apple.svg">
+  <defs
+     id="defs4695" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="11.852657"
+     inkscape:cy="8.0632297"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="760"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4698">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.30326968;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 8.4712216,1037.1861 c -2.1050908,0.04 -4.0163689,0.8056 -5.7487668,2.3398 -1.0712052,0.9142 -1.82198358,1.9725 -2.25345195,3.1787 -0.37398533,1.751 -0.40029296,3.4654 -0.0863535,5.0991 0.18720389,1.0348 0.58340878,2.2568 1.19251915,3.6886 l 4.2190532,0 c -0.293453,-0.8621 -0.577953,-1.5323 -0.8471012,-2.0232 -1.153287,-2.1277 -1.411065,-4.2066 -0.7607457,-6.2052 0.2367104,-0.6185 0.5586836,-1.2169 0.9581276,-1.7806 0.1426595,-0.2013 0.3287285,-0.4113 0.5345786,-0.588 0.268515,-0.2936 0.8787071,-0.6679 1.8463495,-1.1514 0.3797863,-0.1946 0.7802208,-0.3318 1.2254154,-0.4195 0.055375,-0.021 0.4121338,-0.071 1.0485963,-0.1439 0.4166658,-0.047 0.9826928,0.01 1.7024248,0.218 0.68338,0.202 1.192041,0.4217 1.554388,0.6785 0.46971,0.3328 0.860598,0.6899 1.196632,1.0691 0.08834,0.1029 0.152532,0.1851 0.217943,0.292 0.119092,0.1449 0.28643,0.3643 0.501681,0.6579 0.120782,0.086 0.202303,0.1674 0.217943,0.2591 0.04417,0.051 0.07097,0.072 0.115138,0.1233 0.109582,0.1583 0.220475,0.3159 0.316636,0.4647 0.07883,0.1164 0.137371,0.2581 0.193271,0.3783 0.07894,-0.3674 0.06507,-0.8608 -0.08636,-1.4721 -0.180483,-0.7126 -0.391176,-1.2047 -0.633269,-1.5174 -0.507116,-0.6215 -0.808763,-0.9976 -0.933455,-1.1062 -0.03075,-0.042 -0.311374,-0.2417 -0.834763,-0.6127 -0.48313,-0.3423 -0.991284,-0.6213 -1.496819,-0.8183 -0.992045,-0.4208 -2.1359359,-0.6284 -3.3596164,-0.6086 z"
+       id="path3017-7-8"
+       sodipodi:nodetypes="ccccccccscccccsccccccccccscc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;stroke:#000000;stroke-width:0.30326967999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="m 10.140749,1039.1641 c -0.122741,0 -0.2371399,0 -0.3413068,0.016 -0.6364625,0.073 -0.9932215,0.1227 -1.0485963,0.1439 -0.4451946,0.088 -0.8456291,0.2249 -1.2254154,0.4195 -0.9676424,0.4835 -1.5778345,0.8578 -1.8463495,1.1514 -0.2058501,0.1767 -0.3919191,0.3867 -0.5345786,0.588 -0.399444,0.5637 -0.7214172,1.1621 -0.9581276,1.7806 -0.6503193,1.9986 -0.3925413,4.0775 0.7607457,6.2052 0.2691482,0.4909 0.5536482,1.1611 0.8471012,2.0232 l 4.2601723,0 c -0.1550496,-0.4598 -0.3855015,-0.9829 -0.7113982,-1.5709 -0.2465293,-0.4771 -0.5321843,-0.9815 -0.8553245,-1.4927 -0.013422,-0.01 -0.00409,-0.021 -0.00409,-0.021 -0.051988,-0.097 -0.098669,-0.1734 -0.1562603,-0.2343 -0.030751,-0.042 -0.051492,-0.073 -0.082242,-0.1152 l -0.1809343,-0.2549 c -0.069319,-0.1298 -0.140197,-0.2592 -0.2056073,-0.366 -0.2460015,-0.3356 -0.4342851,-0.6086 -0.5880347,-0.8183 -0.1308197,-0.2137 -0.2609169,-0.4291 -0.3783173,-0.6333 -1.1170471,-1.6383 -1.0194278,-3.0575 0.2878496,-4.2478 0.3736582,-0.2997 0.8097656,-0.577 1.3405561,-0.7855 0.3188143,-0.1369 0.6574538,-0.2389 0.9745783,-0.3166 2.3182336,-0.3127 4.3630076,0.4721 6.1270826,2.3069 -0.09616,-0.1488 -0.207055,-0.3105 -0.316635,-0.4688 -0.04417,-0.051 -0.07097,-0.068 -0.115139,-0.1192 -0.01564,-0.092 -0.09716,-0.1735 -0.217944,-0.2591 -0.215251,-0.2936 -0.382589,-0.5131 -0.50168,-0.6579 -0.06541,-0.1069 -0.129604,-0.1891 -0.217944,-0.292 -0.336034,-0.3792 -0.726922,-0.7363 -1.196632,-1.0691 -0.362348,-0.2568 -0.871009,-0.4765 -1.554388,-0.6785 -0.539798,-0.1558 -0.992892,-0.2286 -1.361116,-0.2344 z"
+       id="path3101-4-0" />
+  </g>
+</svg>
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index 09196c3a..e4c9108b 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -4,6 +4,7 @@
         <title data-bind="text: title">OctoPrint</title>
 
         <link rel="shortcut icon" href="{{ url_for('static', filename='img/tentacle-32x32.png') }}">
+        <link rel="mask-icon" href="{{ url_for('static', filename='img/favicon.svg') }}" color="#56BE37">
         <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}">
         <link rel="apple-touch-icon" sizes="144x144" href="{{ url_for('static', filename='img/apple-touch-icon-144x144.png') }}">