diff --git a/bld.cmd b/bld.cmd
index 465ee0739..0ccff41de 100644
--- a/bld.cmd
+++ b/bld.cmd
@@ -26,10 +26,6 @@ rem Delete any existing content
 
 del /q /s %TW5_BUILD_OUTPUT%\static
 
-rem Copy the favicon
-
-copy favicon.ico %TW5_BUILD_OUTPUT%\favicon.ico
-
 rem The tw5.com wiki
 rem  index.html: the main file, including content
 rem  empty.html: the main file, excluding content
@@ -39,6 +35,7 @@ node .\tiddlywiki.js ^
 	.\editions\tw5.com ^
 	--verbose ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\index.html text/plain ^
+	--savetiddler $:/favicon.ico %TW5_BUILD_OUTPUT%\favicon.ico ^
 	--rendertiddler ReadMe .\readme.md text/html ^
 	--rendertiddler ContributingTemplate .\contributing.md text/html ^
 	--rendertiddler $:/editions/tw5.com/download-empty %TW5_BUILD_OUTPUT%\empty.html text/plain ^
diff --git a/bld.sh b/bld.sh
index b5bf01d09..55847d82e 100755
--- a/bld.sh
+++ b/bld.sh
@@ -27,10 +27,6 @@ mkdir -p $TW5_BUILD_OUTPUT/static
 
 rm $TW5_BUILD_OUTPUT/static/*
 
-# Copy the favicon
-
-cp favicon.ico $TW5_BUILD_OUTPUT/favicon.ico
-
 # The tw5.com wiki
 #  index.html: the main file, including content
 #  empty.html: the main file, excluding content
@@ -40,6 +36,7 @@ node ./tiddlywiki.js \
 	./editions/tw5.com \
 	--verbose \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/index.html text/plain \
+	--savetiddler $:/favicon.ico $TW5_BUILD_OUTPUT/favicon.ico \
 	--rendertiddler ReadMe ./readme.md text/html \
 	--rendertiddler ContributingTemplate ./contributing.md text/html \
 	--rendertiddler $:/editions/tw5.com/download-empty $TW5_BUILD_OUTPUT/empty.html text/plain \
diff --git a/boot/boot.js b/boot/boot.js
index c8eab4e05..ebc25b603 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1420,6 +1420,7 @@ $tw.boot.startup = function() {
 	$tw.utils.registerFileType("image/png","base64",".png");
 	$tw.utils.registerFileType("image/gif","base64",".gif");
 	$tw.utils.registerFileType("image/svg+xml","utf8",".svg");
+	$tw.utils.registerFileType("image/x-icon","base64",".ico");
 	$tw.utils.registerFileType("application/font-woff","base64",".woff");
 	// Create the wiki store for the app
 	$tw.wiki = new $tw.Wiki();
diff --git a/favicon.ico b/editions/tw5.com/tiddlers/images/favicon.ico
similarity index 100%
rename from favicon.ico
rename to editions/tw5.com/tiddlers/images/favicon.ico
diff --git a/editions/tw5.com/tiddlers/images/favicon.ico.meta b/editions/tw5.com/tiddlers/images/favicon.ico.meta
new file mode 100644
index 000000000..2f3e81713
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon