diff --git a/config/presets/http.json b/config/presets/http.json
index b773ce799..cde5b6fcc 100644
--- a/config/presets/http.json
+++ b/config/presets/http.json
@@ -28,6 +28,9 @@
         {
           "@type": "WaterfallHandler",
           "WaterfallHandler:_handlers": [
+            {
+              "@id": "urn:solid-server:default:FaviconHandler"
+            },
             {
               "@id": "urn:solid-server:default:StaticAssetHandler"
             },
diff --git a/config/presets/static.json b/config/presets/static.json
index aa253b1ec..34e0d5229 100644
--- a/config/presets/static.json
+++ b/config/presets/static.json
@@ -10,6 +10,17 @@
       "@id": "urn:solid-server:default:StaticAssetHandler",
       "@type": "UnsupportedAsyncHandler",
       "comment": "This value can be used to set a custom handler for static assets"
+    },
+    {
+      "@id": "urn:solid-server:default:FaviconHandler",
+      "@type": "StaticAssetHandler",
+      "comment": "Serves the favicon",
+      "StaticAssetHandler:_assets": [
+        {
+          "StaticAssetHandler:_assets_key": "/favicon.ico",
+          "StaticAssetHandler:_assets_value": "./templates/root/favicon.ico"
+        }
+      ]
     }
   ]
 }
diff --git a/templates/root/favicon.ico b/templates/root/favicon.ico
new file mode 100644
index 000000000..764acb205
Binary files /dev/null and b/templates/root/favicon.ico differ