diff --git a/bld.cmd b/bld.cmd
index 0ccff41de..e3f6a40a6 100644
--- a/bld.cmd
+++ b/bld.cmd
@@ -40,6 +40,7 @@ node .\tiddlywiki.js ^
 	--rendertiddler ContributingTemplate .\contributing.md text/html ^
 	--rendertiddler $:/editions/tw5.com/download-empty %TW5_BUILD_OUTPUT%\empty.html text/plain ^
 	--rendertiddler $:/editions/tw5.com/download-empty %TW5_BUILD_OUTPUT%\empty.hta text/plain ^
+	--savetiddler $:/green_favicon.ico %TW5_BUILD_OUTPUT%/static/favicon.ico ^
 	--rendertiddler $:/core/templates/static.template.html %TW5_BUILD_OUTPUT%\static.html text/plain ^
 	--rendertiddler $:/core/templates/static.template.css %TW5_BUILD_OUTPUT%\static\static.css text/plain ^
 	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html %TW5_BUILD_OUTPUT%\static text/plain ^
diff --git a/bld.sh b/bld.sh
index 55847d82e..0185524e9 100755
--- a/bld.sh
+++ b/bld.sh
@@ -41,6 +41,7 @@ node ./tiddlywiki.js \
 	--rendertiddler ContributingTemplate ./contributing.md text/html \
 	--rendertiddler $:/editions/tw5.com/download-empty $TW5_BUILD_OUTPUT/empty.html text/plain \
 	--rendertiddler $:/editions/tw5.com/download-empty $TW5_BUILD_OUTPUT/empty.hta text/plain \
+	--savetiddler $:/green_favicon.ico $TW5_BUILD_OUTPUT/static/favicon.ico \
 	--rendertiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
 	--rendertiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \
 	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
index 89afd3e53..29052063a 100644
--- a/core/templates/static.template.html.tid
+++ b/core/templates/static.template.html.tid
@@ -10,6 +10,7 @@ type: text/vnd.tiddlywiki-html
 <meta name="generator" content="TiddlyWiki" />
 <meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" />
 <meta name="format-detection" content="telephone=no">
+<link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>
 <div id="styleArea">
 {{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid
index 42272e3db..c9d711868 100644
--- a/core/templates/static.tiddler.html.tid
+++ b/core/templates/static.tiddler.html.tid
@@ -8,6 +8,7 @@ title: $:/core/templates/static.tiddler.html
 <meta name="generator" content="TiddlyWiki" />
 <meta name="tiddlywiki-version" content="`{{$:/core/templates/version}}`" />
 <meta name="format-detection" content="telephone=no">
+<link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" href="static.css">
 <title>`{{$:/core/wiki/title}}`</title>
 </head>
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.ico b/editions/tw5.com/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/green_favicon.ico differ
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.ico.meta b/editions/tw5.com/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon