diff --git a/editions/de-AT-server/tiddlers/system/favicon.ico b/editions/de-AT-server/tiddlers/system/favicon.ico
deleted file mode 100644
index 3765a9a88..000000000
Binary files a/editions/de-AT-server/tiddlers/system/favicon.ico and /dev/null differ
diff --git a/editions/de-AT-server/tiddlers/system/favicon.png b/editions/de-AT-server/tiddlers/system/favicon.png
new file mode 100644
index 000000000..75be8e27d
Binary files /dev/null and b/editions/de-AT-server/tiddlers/system/favicon.png differ
diff --git a/editions/es-ES-server/tiddlers/system/favicon.ico.meta b/editions/de-AT-server/tiddlers/system/favicon.png.meta
similarity index 53%
rename from editions/es-ES-server/tiddlers/system/favicon.ico.meta
rename to editions/de-AT-server/tiddlers/system/favicon.png.meta
index 2f3e81713..76d0be1a8 100644
--- a/editions/es-ES-server/tiddlers/system/favicon.ico.meta
+++ b/editions/de-AT-server/tiddlers/system/favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/dev/tiddlers/images/favicon.ico b/editions/dev/tiddlers/images/favicon.ico
deleted file mode 100644
index b73f67d49..000000000
Binary files a/editions/dev/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/dev/tiddlers/images/favicon.png b/editions/dev/tiddlers/images/favicon.png
new file mode 100644
index 000000000..dd2cb686c
Binary files /dev/null and b/editions/dev/tiddlers/images/favicon.png differ
diff --git a/editions/de-AT-server/tiddlers/system/favicon.ico.meta b/editions/dev/tiddlers/images/favicon.png.meta
similarity index 53%
rename from editions/de-AT-server/tiddlers/system/favicon.ico.meta
rename to editions/dev/tiddlers/images/favicon.png.meta
index 2f3e81713..76d0be1a8 100644
--- a/editions/de-AT-server/tiddlers/system/favicon.ico.meta
+++ b/editions/dev/tiddlers/images/favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/es-ES-server/tiddlers/system/favicon.ico b/editions/es-ES-server/tiddlers/system/favicon.ico
deleted file mode 100644
index 3765a9a88..000000000
Binary files a/editions/es-ES-server/tiddlers/system/favicon.ico and /dev/null differ
diff --git a/editions/es-ES-server/tiddlers/system/favicon.png b/editions/es-ES-server/tiddlers/system/favicon.png
new file mode 100644
index 000000000..75be8e27d
Binary files /dev/null and b/editions/es-ES-server/tiddlers/system/favicon.png differ
diff --git a/editions/es-ES/tiddlers/images/favicon.ico.meta b/editions/es-ES-server/tiddlers/system/favicon.png.meta
similarity index 53%
rename from editions/es-ES/tiddlers/images/favicon.ico.meta
rename to editions/es-ES-server/tiddlers/system/favicon.png.meta
index 2f3e81713..76d0be1a8 100644
--- a/editions/es-ES/tiddlers/images/favicon.ico.meta
+++ b/editions/es-ES-server/tiddlers/system/favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/es-ES/tiddlers/images/favicon.ico b/editions/es-ES/tiddlers/images/favicon.ico
deleted file mode 100644
index d4fae0448..000000000
Binary files a/editions/es-ES/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/es-ES/tiddlers/images/favicon.png b/editions/es-ES/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/es-ES/tiddlers/images/favicon.png differ
diff --git a/editions/dev/tiddlers/images/favicon.ico.meta b/editions/es-ES/tiddlers/images/favicon.png.meta
similarity index 53%
rename from editions/dev/tiddlers/images/favicon.ico.meta
rename to editions/es-ES/tiddlers/images/favicon.png.meta
index 2f3e81713..76d0be1a8 100644
--- a/editions/dev/tiddlers/images/favicon.ico.meta
+++ b/editions/es-ES/tiddlers/images/favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/es-ES/tiddlers/images/green_favicon.ico b/editions/es-ES/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/es-ES/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/es-ES/tiddlers/images/green_favicon.png b/editions/es-ES/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/es-ES/tiddlers/images/green_favicon.png differ
diff --git a/editions/es-ES/tiddlers/images/green_favicon.ico.meta b/editions/es-ES/tiddlers/images/green_favicon.png.meta
similarity index 59%
rename from editions/es-ES/tiddlers/images/green_favicon.ico.meta
rename to editions/es-ES/tiddlers/images/green_favicon.png.meta
index f2e1cfa3c..1f2a3ecc0 100644
--- a/editions/es-ES/tiddlers/images/green_favicon.ico.meta
+++ b/editions/es-ES/tiddlers/images/green_favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/green_favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/fr-FR-server/tiddlers/system/favicon.ico b/editions/fr-FR-server/tiddlers/system/favicon.ico
deleted file mode 100644
index 3765a9a88..000000000
Binary files a/editions/fr-FR-server/tiddlers/system/favicon.ico and /dev/null differ
diff --git a/editions/fr-FR-server/tiddlers/system/favicon.ico.meta b/editions/fr-FR-server/tiddlers/system/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/fr-FR-server/tiddlers/system/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/fr-FR-server/tiddlers/system/favicon.png b/editions/fr-FR-server/tiddlers/system/favicon.png
new file mode 100644
index 000000000..75be8e27d
Binary files /dev/null and b/editions/fr-FR-server/tiddlers/system/favicon.png differ
diff --git a/editions/fr-FR-server/tiddlers/system/favicon.png.meta b/editions/fr-FR-server/tiddlers/system/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/fr-FR-server/tiddlers/system/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/fr-FR/tiddlers/images/favicon.ico b/editions/fr-FR/tiddlers/images/favicon.ico
deleted file mode 100644
index d4fae0448..000000000
Binary files a/editions/fr-FR/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/fr-FR/tiddlers/images/favicon.ico.meta b/editions/fr-FR/tiddlers/images/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/fr-FR/tiddlers/images/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/fr-FR/tiddlers/images/favicon.png b/editions/fr-FR/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/fr-FR/tiddlers/images/favicon.png differ
diff --git a/editions/fr-FR/tiddlers/images/favicon.png.meta b/editions/fr-FR/tiddlers/images/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/fr-FR/tiddlers/images/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/fr-FR/tiddlers/images/green_favicon.ico b/editions/fr-FR/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/fr-FR/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/fr-FR/tiddlers/images/green_favicon.png b/editions/fr-FR/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/fr-FR/tiddlers/images/green_favicon.png differ
diff --git a/editions/fr-FR/tiddlers/images/green_favicon.ico.meta b/editions/fr-FR/tiddlers/images/green_favicon.png.meta
similarity index 59%
rename from editions/fr-FR/tiddlers/images/green_favicon.ico.meta
rename to editions/fr-FR/tiddlers/images/green_favicon.png.meta
index f2e1cfa3c..1f2a3ecc0 100644
--- a/editions/fr-FR/tiddlers/images/green_favicon.ico.meta
+++ b/editions/fr-FR/tiddlers/images/green_favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/green_favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/ja-JP/tiddlers/images/favicon.ico b/editions/ja-JP/tiddlers/images/favicon.ico
deleted file mode 100644
index d4fae0448..000000000
Binary files a/editions/ja-JP/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/ja-JP/tiddlers/images/favicon.ico.meta b/editions/ja-JP/tiddlers/images/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/ja-JP/tiddlers/images/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/ja-JP/tiddlers/images/favicon.png b/editions/ja-JP/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/ja-JP/tiddlers/images/favicon.png differ
diff --git a/editions/ja-JP/tiddlers/images/favicon.png.meta b/editions/ja-JP/tiddlers/images/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/ja-JP/tiddlers/images/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/ja-JP/tiddlers/images/green_favicon.ico b/editions/ja-JP/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/ja-JP/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/ja-JP/tiddlers/images/green_favicon.png b/editions/ja-JP/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/ja-JP/tiddlers/images/green_favicon.png differ
diff --git a/editions/ja-JP/tiddlers/images/green_favicon.ico.meta b/editions/ja-JP/tiddlers/images/green_favicon.png.meta
similarity index 59%
rename from editions/ja-JP/tiddlers/images/green_favicon.ico.meta
rename to editions/ja-JP/tiddlers/images/green_favicon.png.meta
index f2e1cfa3c..1f2a3ecc0 100644
--- a/editions/ja-JP/tiddlers/images/green_favicon.ico.meta
+++ b/editions/ja-JP/tiddlers/images/green_favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/green_favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/ko-KR-server/tiddlers/system/favicon.ico b/editions/ko-KR-server/tiddlers/system/favicon.ico
deleted file mode 100644
index 3765a9a88..000000000
Binary files a/editions/ko-KR-server/tiddlers/system/favicon.ico and /dev/null differ
diff --git a/editions/ko-KR-server/tiddlers/system/favicon.ico.meta b/editions/ko-KR-server/tiddlers/system/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/ko-KR-server/tiddlers/system/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/ko-KR-server/tiddlers/system/favicon.png b/editions/ko-KR-server/tiddlers/system/favicon.png
new file mode 100644
index 000000000..75be8e27d
Binary files /dev/null and b/editions/ko-KR-server/tiddlers/system/favicon.png differ
diff --git a/editions/ko-KR-server/tiddlers/system/favicon.png.meta b/editions/ko-KR-server/tiddlers/system/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/ko-KR-server/tiddlers/system/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/ko-KR/tiddlers/images/favicon.ico b/editions/ko-KR/tiddlers/images/favicon.ico
deleted file mode 100644
index d4fae0448..000000000
Binary files a/editions/ko-KR/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/ko-KR/tiddlers/images/favicon.ico.meta b/editions/ko-KR/tiddlers/images/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/ko-KR/tiddlers/images/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/ko-KR/tiddlers/images/favicon.png b/editions/ko-KR/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/ko-KR/tiddlers/images/favicon.png differ
diff --git a/editions/ko-KR/tiddlers/images/favicon.png.meta b/editions/ko-KR/tiddlers/images/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/ko-KR/tiddlers/images/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/ko-KR/tiddlers/images/green_favicon.ico b/editions/ko-KR/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/ko-KR/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/ko-KR/tiddlers/images/green_favicon.png b/editions/ko-KR/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/ko-KR/tiddlers/images/green_favicon.png differ
diff --git a/editions/ko-KR/tiddlers/images/green_favicon.ico.meta b/editions/ko-KR/tiddlers/images/green_favicon.png.meta
similarity index 59%
rename from editions/ko-KR/tiddlers/images/green_favicon.ico.meta
rename to editions/ko-KR/tiddlers/images/green_favicon.png.meta
index f2e1cfa3c..1f2a3ecc0 100644
--- a/editions/ko-KR/tiddlers/images/green_favicon.ico.meta
+++ b/editions/ko-KR/tiddlers/images/green_favicon.png.meta
@@ -1,2 +1,2 @@
title: $:/green_favicon.ico
-type: image/x-icon
+type: image/png
diff --git a/editions/prerelease/tiddlers/system/favicon.ico b/editions/prerelease/tiddlers/system/favicon.ico
deleted file mode 100644
index 707c67577..000000000
Binary files a/editions/prerelease/tiddlers/system/favicon.ico and /dev/null differ
diff --git a/editions/prerelease/tiddlers/system/favicon.ico.meta b/editions/prerelease/tiddlers/system/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/prerelease/tiddlers/system/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/prerelease/tiddlers/system/favicon.png b/editions/prerelease/tiddlers/system/favicon.png
new file mode 100644
index 000000000..bbf053e28
Binary files /dev/null and b/editions/prerelease/tiddlers/system/favicon.png differ
diff --git a/editions/prerelease/tiddlers/system/favicon.png.meta b/editions/prerelease/tiddlers/system/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/prerelease/tiddlers/system/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/tw.org/tiddlers/$__favicon.ico.png b/editions/tw.org/tiddlers/$__favicon.ico.png
index c6b279307..b147a217b 100644
Binary files a/editions/tw.org/tiddlers/$__favicon.ico.png and b/editions/tw.org/tiddlers/$__favicon.ico.png differ
diff --git a/editions/tw5.com-server/tiddlers/system/favicon.ico b/editions/tw5.com-server/tiddlers/system/favicon.ico
deleted file mode 100644
index 3765a9a88..000000000
Binary files a/editions/tw5.com-server/tiddlers/system/favicon.ico and /dev/null differ
diff --git a/editions/tw5.com-server/tiddlers/system/favicon.ico.meta b/editions/tw5.com-server/tiddlers/system/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/tw5.com-server/tiddlers/system/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png
new file mode 100644
index 000000000..75be8e27d
Binary files /dev/null and b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png differ
diff --git a/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png.meta b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico
deleted file mode 100644
index 03a9b6ee9..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png
new file mode 100644
index 000000000..c0ae6e696
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png.meta
similarity index 80%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png.meta
index 53a3ac055..c83def11f 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico.meta
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png.meta
@@ -1,3 +1,3 @@
title: $:/_tw_shared/favicons/classic.tiddlywiki.com
-type: image/x-icon
+type: image/png
tags: TiddlyWikiSitesMenu
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/favicons.svg b/editions/tw5.com/tiddlers/_tw_shared/favicons/favicons.svg
new file mode 100644
index 000000000..26f29a39e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/favicons.svg
@@ -0,0 +1,296 @@
+
+
+
+
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/favicons.svg.md b/editions/tw5.com/tiddlers/_tw_shared/favicons/favicons.svg.md
new file mode 100644
index 000000000..7238bccdc
--- /dev/null
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/favicons.svg.md
@@ -0,0 +1,15 @@
+`favicons.svg` is an Inkscape file used to create most of the favicons in this folder. It should also be usable in any other vector graphics software. It's a template, not supposed to be directly displayed anywhere in wiki.
+
+Every favicon is stored in a separate layer. This allows to export all favicons at once in Inkscape:
+
+1. Go to Export > Batch Export > Layers.
+2. Select layers/favicons you want to export.
+3. Select "Export Selected Only"
+4. Choose PNG without suffix (exported files will be named after the layers).
+5. Change DPI to batch export at different resolution (the default 96 DPI will export at 128x128, 144 DPI would export at 192x192 and so on). If changing the DPI is undesired, the favicons can be single-exported (hide all layers but one, Export > Single Image) at specified DPI and resolution.
+6. Specify only export path without file name prefix (exported files will be named after the layers).
+7. Export.
+
+The colours used in the favicons are saved as swatches, named after the favicon using the colour.
+
+If the icons were to be used as SVG, the individual layers should be separately exported and then cleaned up from Inkscape's metadata.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico
deleted file mode 100644
index 7ad263dad..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png
new file mode 100644
index 000000000..8e4602dda
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png.meta
similarity index 80%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png.meta
index a21a05c4a..d53b194b7 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico.meta
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png.meta
@@ -1,3 +1,3 @@
title: $:/_tw_shared/favicons/links.tiddlywiki.org
-type: image/x-icon
+type: image/png
tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico
deleted file mode 100644
index b73f67d49..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png
new file mode 100644
index 000000000..dd2cb686c
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png.meta
similarity index 79%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png.meta
index 4f14e4af1..0913aa504 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico.meta
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png.meta
@@ -1,3 +1,3 @@
title: $:/_tw_shared/favicons/tiddlywiki.com.dev
-type: image/x-icon
+type: image/png
tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico
deleted file mode 100644
index abf226e9b..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png.meta
similarity index 78%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png.meta
index ad4a92d3b..b884444c3 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico.meta
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png.meta
@@ -1,3 +1,3 @@
title: $:/_tw_shared/favicons/tiddlywiki.com
-type: image/x-icon
+type: image/png
tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico
deleted file mode 100644
index 707c67577..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png
new file mode 100644
index 000000000..bbf053e28
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png.meta
similarity index 81%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png.meta
index a5d98ea5e..4757a18bc 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico.meta
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png.meta
@@ -1,3 +1,3 @@
title: $:/_tw_shared/favicons/tiddlywiki.com.prerelease
-type: image/x-icon
+type: image/png
tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico
deleted file mode 100644
index 6d8d018e9..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png
new file mode 100644
index 000000000..38f661431
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png.meta
similarity index 80%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png.meta
index ef6c637c9..9479c07b2 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png.meta
@@ -1,3 +1,3 @@
title: $:/_tw_shared/favicons/tiddlywiki.com.upgrade
-type: image/x-icon
+type: image/png
tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico
deleted file mode 100644
index c6b279307..000000000
Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png
new file mode 100644
index 000000000..b147a217b
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png.meta
similarity index 100%
rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico.meta
rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png.meta
diff --git a/editions/tw5.com/tiddlers/images/Favicon template.svg b/editions/tw5.com/tiddlers/images/Favicon template.svg
new file mode 100644
index 000000000..fe8f53afd
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/Favicon template.svg
@@ -0,0 +1,296 @@
+
+
+
+
diff --git a/editions/tw5.com/tiddlers/images/Favicon template.svg.meta b/editions/tw5.com/tiddlers/images/Favicon template.svg.meta
new file mode 100644
index 000000000..8d6a1a197
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/Favicon template.svg.meta
@@ -0,0 +1,3 @@
+title: Favicon template.svg
+tags: picture
+type: image/svg+xml
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/favicon.ico b/editions/tw5.com/tiddlers/images/favicon.ico
deleted file mode 100644
index abf226e9b..000000000
Binary files a/editions/tw5.com/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/images/favicon.ico.meta b/editions/tw5.com/tiddlers/images/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/tw5.com/tiddlers/images/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/tw5.com/tiddlers/images/favicon.png b/editions/tw5.com/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/favicon.png differ
diff --git a/editions/tw5.com/tiddlers/images/favicon.png.meta b/editions/tw5.com/tiddlers/images/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.ico b/editions/tw5.com/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/tw5.com/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.ico.meta b/editions/tw5.com/tiddlers/images/green_favicon.ico.meta
deleted file mode 100644
index f2e1cfa3c..000000000
--- a/editions/tw5.com/tiddlers/images/green_favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/green_favicon.ico
-type: image/x-icon
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.png b/editions/tw5.com/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/green_favicon.png differ
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.png.meta b/editions/tw5.com/tiddlers/images/green_favicon.png.meta
new file mode 100644
index 000000000..1f2a3ecc0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/green_favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/png
diff --git a/editions/zh-Hans/tiddlers/images/favicon.ico b/editions/zh-Hans/tiddlers/images/favicon.ico
deleted file mode 100644
index d4fae0448..000000000
Binary files a/editions/zh-Hans/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/zh-Hans/tiddlers/images/favicon.ico.meta b/editions/zh-Hans/tiddlers/images/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/zh-Hans/tiddlers/images/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/zh-Hans/tiddlers/images/favicon.png b/editions/zh-Hans/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/zh-Hans/tiddlers/images/favicon.png differ
diff --git a/editions/zh-Hans/tiddlers/images/favicon.png.meta b/editions/zh-Hans/tiddlers/images/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/zh-Hans/tiddlers/images/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.ico b/editions/zh-Hans/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/zh-Hans/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta b/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta
deleted file mode 100644
index f2e1cfa3c..000000000
--- a/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/green_favicon.ico
-type: image/x-icon
diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.png b/editions/zh-Hans/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/zh-Hans/tiddlers/images/green_favicon.png differ
diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.png.meta b/editions/zh-Hans/tiddlers/images/green_favicon.png.meta
new file mode 100644
index 000000000..1f2a3ecc0
--- /dev/null
+++ b/editions/zh-Hans/tiddlers/images/green_favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/png
diff --git a/editions/zh-Hant/tiddlers/images/favicon.ico b/editions/zh-Hant/tiddlers/images/favicon.ico
deleted file mode 100644
index d4fae0448..000000000
Binary files a/editions/zh-Hant/tiddlers/images/favicon.ico and /dev/null differ
diff --git a/editions/zh-Hant/tiddlers/images/favicon.ico.meta b/editions/zh-Hant/tiddlers/images/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/zh-Hant/tiddlers/images/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/zh-Hant/tiddlers/images/favicon.png b/editions/zh-Hant/tiddlers/images/favicon.png
new file mode 100644
index 000000000..d797bbe8d
Binary files /dev/null and b/editions/zh-Hant/tiddlers/images/favicon.png differ
diff --git a/editions/zh-Hant/tiddlers/images/favicon.png.meta b/editions/zh-Hant/tiddlers/images/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/editions/zh-Hant/tiddlers/images/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png
diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.ico b/editions/zh-Hant/tiddlers/images/green_favicon.ico
deleted file mode 100644
index 06e5f8e80..000000000
Binary files a/editions/zh-Hant/tiddlers/images/green_favicon.ico and /dev/null differ
diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta b/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta
deleted file mode 100644
index f2e1cfa3c..000000000
--- a/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/green_favicon.ico
-type: image/x-icon
diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.png b/editions/zh-Hant/tiddlers/images/green_favicon.png
new file mode 100644
index 000000000..ac96b571f
Binary files /dev/null and b/editions/zh-Hant/tiddlers/images/green_favicon.png differ
diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.png.meta b/editions/zh-Hant/tiddlers/images/green_favicon.png.meta
new file mode 100644
index 000000000..1f2a3ecc0
--- /dev/null
+++ b/editions/zh-Hant/tiddlers/images/green_favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/png
diff --git a/plugins/tiddlywiki/upgrade/favicon.ico b/plugins/tiddlywiki/upgrade/favicon.ico
deleted file mode 100644
index 6d8d018e9..000000000
Binary files a/plugins/tiddlywiki/upgrade/favicon.ico and /dev/null differ
diff --git a/plugins/tiddlywiki/upgrade/favicon.ico.meta b/plugins/tiddlywiki/upgrade/favicon.ico.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/plugins/tiddlywiki/upgrade/favicon.ico.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/plugins/tiddlywiki/upgrade/favicon.png b/plugins/tiddlywiki/upgrade/favicon.png
new file mode 100644
index 000000000..38f661431
Binary files /dev/null and b/plugins/tiddlywiki/upgrade/favicon.png differ
diff --git a/plugins/tiddlywiki/upgrade/favicon.png.meta b/plugins/tiddlywiki/upgrade/favicon.png.meta
new file mode 100644
index 000000000..76d0be1a8
--- /dev/null
+++ b/plugins/tiddlywiki/upgrade/favicon.png.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png