diff --git a/mopidy/frontends/http/actor.py b/mopidy/frontends/http/actor.py
index 65cf9445..ef6808f0 100644
--- a/mopidy/frontends/http/actor.py
+++ b/mopidy/frontends/http/actor.py
@@ -55,6 +55,7 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
         logger.debug('HTTP server will serve "%s" at /', static_dir)
 
         mopidy_dir = os.path.join(os.path.dirname(__file__), 'data')
+        favicon = os.path.join(mopidy_dir, 'favicon.png')
 
         config = {
             b'/': {
@@ -62,6 +63,10 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
                 'tools.staticdir.index': 'index.html',
                 'tools.staticdir.dir': static_dir,
             },
+            b'/favicon.ico': {
+                'tools.staticfile.on': True,
+                'tools.staticfile.filename': favicon,
+            },
             b'/mopidy': {
                 'tools.staticdir.on': True,
                 'tools.staticdir.index': 'mopidy.html',
diff --git a/mopidy/frontends/http/data/favicon.png b/mopidy/frontends/http/data/favicon.png
new file mode 100644
index 00000000..a214c91f
Binary files /dev/null and b/mopidy/frontends/http/data/favicon.png differ