diff --git a/data/etc/apache2/conf-available/freedombox.conf b/data/etc/apache2/conf-available/freedombox.conf
index 8d07a3189..2571ac736 100644
--- a/data/etc/apache2/conf-available/freedombox.conf
+++ b/data/etc/apache2/conf-available/freedombox.conf
@@ -11,3 +11,13 @@ Header set Strict-Transport-Security "max-age=31536000; includeSubDomains" env=H
 RedirectMatch "^/$" "/plinth"
 RedirectMatch "^/freedombox" "/plinth"
 
+##
+## Serve FreedomBox icon as /favicon.ico for apps that don't present their own
+## icon using <link rel=''>.
+##
+<Location ~ ^/favicon\.ico$>
+    <IfModule mod_rewrite.c>
+        RewriteEngine On
+        RewriteRule /favicon\.ico$ "/plinth/static/theme/img/favicon.ico" [PT]
+    </IfModule>
+</Location>
diff --git a/static/themes/default/img/favicon.ico b/static/themes/default/img/favicon.ico
new file mode 100644
index 000000000..4e49e4cc2
Binary files /dev/null and b/static/themes/default/img/favicon.ico differ