diff --git a/assets/build b/assets/build
index 73a34a5a9..abcdde06a 100755
--- a/assets/build
+++ b/assets/build
@@ -26,7 +26,7 @@ my ( %data, %paths );
 
 for (
     sort { $b =~ /\.woff2$/ <=> $a =~ /\.woff2$/ or $a cmp $b }
-    <assets/*.{css,ico,js,woff2}>
+    <assets/*.{css,js,png,woff2,svg}>
 ) {
     say;
 
@@ -36,13 +36,35 @@ for (
 
     my $name = s/\.(\w)/\U$1/r;
 
-    if ( $_ eq 'favicon.ico' ) {
+    if ( $_ eq 'favicon.svg' ) {
         $data{$name} = $data;
 
         print $fh <<'GO';
-	case "/favicon.ico":
-		w.Header().Set("Content-Type", "image/x-icon")
-		w.Write(faviconIco)
+	case "/favicon.svg":
+		w.Header().Set("Content-Type", "image/svg+xml")
+		w.Write(faviconSvg)
+GO
+
+        next;
+    }
+    if ( $_ eq 'favicon16.png' ) {
+        $data{$name} = $data;
+
+        print $fh <<'GO';
+    case "/favicon16.png":
+        w.Header().Set("Content-Type", "image/png")
+        w.Write(favicon16Png)
+GO
+
+        next;
+    }
+    if ( $_ eq 'favicon32.png' ) {
+        $data{$name} = $data;
+
+        print $fh <<'GO';
+	case "/favicon32.png":
+		w.Header().Set("Content-Type", "image/png")
+		w.Write(favicon32Png)
 GO
 
         next;
diff --git a/assets/favicon.ico b/assets/favicon.ico
deleted file mode 100644
index e770d816b..000000000
Binary files a/assets/favicon.ico and /dev/null differ
diff --git a/assets/favicon.svg b/assets/favicon.svg
new file mode 100644
index 000000000..69b231d55
--- /dev/null
+++ b/assets/favicon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><style>g{fill:black;}@media(prefers-color-scheme: dark){g{fill: white;}}</style><g><rect x="138.3" width="100" height="760"/><polygon points="498,623.2 424.6,623.2 525.3,0 598.7,0"/><polygon points="742.3,623.2 668.8,623.2 769.7,0 843.1,0"/><rect x="338.1" y="172.8" width="588.8" height="71.2"/><rect x="338.1" y="400.5" width="588.8" height="71.2"/><ellipse cx="188.3" cy="923.4" rx="76.8" ry="76.6"/></g></svg>
\ No newline at end of file
diff --git a/assets/favicon16.png b/assets/favicon16.png
new file mode 100644
index 000000000..db1ac3507
Binary files /dev/null and b/assets/favicon16.png differ
diff --git a/assets/favicon32.png b/assets/favicon32.png
new file mode 100644
index 000000000..f2f66fdc3
Binary files /dev/null and b/assets/favicon32.png differ
diff --git a/logo.png b/logo.png
index 5af0b7be1..c7ba0f7eb 100644
Binary files a/logo.png and b/logo.png differ
diff --git a/logo.svg b/logo.svg
index f7aa9d330..421837398 100644
--- a/logo.svg
+++ b/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><g fill="#343a40"><path d="M32.25 200.35c0-21.2-1.5-43.9-17.7-43.9v-11.6c16.2 0 17.7-22.7 17.7-43.9 0-37.1 4.8-52 36.9-67.4v9.6c-20.2 14.1-25.5 22-25.5 54.3 0 26-.8 44.7-18.2 53.3 17.4 8.6 18.2 27.3 18.2 53.3 0 32.3 5.3 40.2 25.5 54.3v9.6c-32.1-15.6-36.9-30.5-36.9-67.6zm198.6 66.1v-9.6c20.2-14.1 25.5-22 25.5-54.3 0-26 .8-44.7 18.2-53.3-17.4-8.6-18.2-27.3-18.2-53.3 0-32.3-5.3-40.2-25.5-54.3v-9.6c32.1 15.4 36.9 30.3 36.9 67.4 0 21.2 1.5 43.9 17.7 43.9v11.6c-16.2 0-17.7 22.7-17.7 43.9 0 37.3-4.8 52.2-36.9 67.6zm-56.8-90.9c4 6.3 12.4 8.1 19.8 7.2 11.2-1.2 21.8-7.3 28.6-16.3 12.1-16.1 9.4-37.8.9-54.9-2.4-4.8-5.2-9.6-8.7-13.7-4.8-5.6-10.6-11-17.6-15.7-5.2-3.4-11-6.4-17.2-8.7-.8-.3-1.6-.6-2.4-.8-.8-.3-1.6-.5-2.4-.8-.8-.2-1.6-.4-2.5-.7-.8-.2-1.6-.5-2.5-.6l-2.5-.6c-.8-.2-1.7-.3-2.6-.5-1.3-.2-2.6-.5-3.9-.5-1.9-.4-3.9-.4-5.8-.6-1.2 0-2.4 0-3.5-.1h-2.7c-.8 0-1.7.1-2.5.1-.9.1-1.9.2-2.8.2-1.9.1-3.7.5-5.5.7-3.6.6-7.3 1.4-10.9 2.6l-1.4.4c-.2.1-.4.1-.6.2-1.2.4-2.3.8-3.4 1.3-1.8.8-3.5 1.4-5.2 2.3-3.5 1.6-6.8 3.5-10 5.7-3.3 2.1-6.3 4.5-9.2 7.1-5.9 5.2-11 11.3-15.2 18-4.2 6.7-7.5 14.1-9.6 21.8-1.1 3.9-1.8 7.8-2.4 11.8-.5 4-.7 8-.7 12l.1 2.9c0 .5 0 .9.1 1.4l.1 1.5.3 3 .4 3c.7 3.9 1.5 7.8 2.7 11.6 2.4 7.6 5.8 14.7 10.2 21.2 4.3 6.5 9.6 12.3 15.4 17.1 2.9 2.4 6 4.7 9.2 6.6 3.2 2 6.5 3.7 9.9 5.2 1.7.8 3.4 1.4 5.1 2 .9.3 1.7.6 2.6.9.4.1.9.3 1.3.4l1.3.4c3.5 1 7 1.6 10.5 2.2 1.8.2 3.5.4 5.2.5.9 0 1.7.1 2.6.1h3.9l1.2-.1c.8 0 1.7-.1 2.5-.1.9-.1 1.7-.2 2.6-.2.8-.1 1.7-.2 2.5-.3.8-.1 1.6-.2 2.5-.4.8-.1 1.6-.3 2.4-.5 1.2-.3 2.4-.4 3.5-.9 1.3-.2 2.4-.5 3.6-.9.8-.2 1.5-.5 2.3-.7.7-.3 1.5-.5 2.2-.8.7-.3 1.5-.5 2.2-.9 5.8-2.4 11.1-5.3 15.9-8.7 2.4-1.7 4.6-3.5 6.7-5.3.4-.3.7-.6 1.1-1 5.5-5.1 10.4-11.1 14.1-17.3 2.7-4.5 4.9-9.3 6.7-14.2h-.7c-1.9 4.7-4.3 9.2-7.1 13.5-4.2 6.4-9.3 12.1-15.1 17-.1.1-.2.2-.3.2-2.1 1.8-4.4 3.5-6.8 5.1-4.7 3.1-9.9 5.8-15.6 7.9-1.1.5-2.4.7-3.5 1.2-1 .3-2 .5-3.1.8-1.1.3-2.3.6-3.5.8-1.1.4-2.2.5-3.3.7-.8.1-1.6.3-2.3.4-.7.1-1.4.2-2.1.2-1.3.2-2.6.2-4 .3h-5.9c-.8 0-1.6-.1-2.5-.1-.8 0-1.6-.1-2.5-.2-1.6-.1-3.3-.4-4.9-.6-3.3-.6-6.6-1.3-9.8-2.3l-1.2-.4c-.4-.1-.8-.3-1.2-.4l-2.4-.9c-1.6-.7-3.2-1.3-4.7-2.1-3.1-1.5-6.1-3.2-9-5.1-2.9-1.9-5.7-4.1-8.3-6.4-5.3-4.7-9.9-10.2-13.7-16.3-3.8-6.1-6.7-12.7-8.7-19.7-1-3.5-1.6-7-2.1-10.6l-.3-2.7c-.1-.9-.1-1.8-.2-2.6l-.1-1.3v-4.1c.1-3.6.4-7.2 1-10.8.6-3.6 1.4-7.1 2.5-10.5 2.2-6.8 5.3-13.3 9.2-19.1 3.9-5.8 8.6-11 13.9-15.4 2.6-2.2 5.4-4.2 8.3-5.9 2.9-1.8 5.8-3.3 8.9-4.6 1.5-.7 3.1-1.2 4.6-1.8.8-.2 1.6-.5 2.3-.8.4-.1.8-.3 1.2-.4l1.2-.3c3.1-.9 6.3-1.5 9.4-1.9 1.6-.2 3.2-.4 4.6-.4.8 0 1.5-.1 2.3-.1h3.6s-.1 0 0 0l1.2.1c1 0 2 .1 3 .1 1.7.3 3.4.2 5 .7 1.1 0 2.1.3 3.2.5.7.2 1.5.3 2.2.5.7.2 1.4.4 2.1.5l2.1.6 2.1.6c.7.2 1.3.5 2 .7.7.2 1.3.5 2 .8 5.2 2.1 10 4.8 14.2 7.8 8.5 6.1 14.8 13.4 19.2 20.6 7.4 12 12.3 28.2 7.6 42-3.4 10.1-12.6 17.9-23.1 19.8-3.5.6-7.6-.2-9.7-3-1.5-2-1.8-4.6-1.7-7.1.1-5 1.5-9.9 2.9-14.7 2.7-9.4 5.4-18.9 8.1-28.3 1.5-5.4-2.6-10.7-8.1-10.5h-.1c-1.3 4.4-2.5 8.7-3.8 13.1 0 .1-.1 0-.1 0-.9-7.5-8.4-13-15.9-13.5-7.6-.4-15 3.4-20.7 8.4-9.6 8.3-15.8 20.3-17.3 32.9-.8 7.5.2 15.6 4.9 21.4 5 6.3 14.1 9 21.7 6.5 5.5-1.8 10-5.9 13.6-10.5 1.6-2.1 3.2-4.4 5.2-6.1h.1c-1.1 3.9-.6 8 1.5 11.2zm-23.5-2.1c-7.1.2-11.2-5-11.4-14-.4-16.8 10.2-40.4 25.3-40.7 8.9-.2 11.8 7.9 12 15.2.2 14.2-11 39.1-25.9 39.5zm51 38.7c-.3.3-.6.6-.9.8l-.1.1c.3-.3.6-.6 1-.9"/><g transform="translate(-390.25 -636.55)"><circle cx="490.1" cy="798.7" r="4.5"/><circle cx="526.7" cy="842.3" r="4.5"/><circle cx="483" cy="812.2" r="4.9"/><circle cx="488.6" cy="824.7" r="5.6"/><circle cx="498.5" cy="839" r="5.6"/><circle cx="502.8" cy="826.5" r="5.6"/><circle cx="498.5" cy="812.2" r="5.6"/><circle cx="512" cy="815.3" r="5.6"/><circle cx="519.5" cy="828.6" r="5.6"/><circle cx="512" cy="842.3" r="5.6"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><rect x="138.3" width="100" height="760"/><polygon points="498,623.2 424.6,623.2 525.3,0 598.7,0"/><polygon points="742.3,623.2 668.8,623.2 769.7,0 843.1,0"/><rect x="338.1" y="172.8" width="588.8" height="71.2"/><rect x="338.1" y="400.5" width="588.8" height="71.2"/><ellipse cx="188.3" cy="923.4" rx="76.8" ry="76.6"/></svg>
\ No newline at end of file
diff --git a/main.go b/main.go
index c499ddea7..795619e92 100644
--- a/main.go
+++ b/main.go
@@ -41,7 +41,9 @@ func main() {
 	r.Get("/about", routes.About)
 	r.Get("/assets/{asset}", routes.Asset)
 	r.Get("/callback", routes.Callback)
-	r.Get("/favicon.ico", routes.Asset)
+	r.Get("/favicon.svg", routes.Asset)
+	r.Get("/favicon16.png", routes.Asset)
+	r.Get("/favicon32.png", routes.Asset)
 	r.Get("/feeds/{feed}", routes.Feed)
 	r.Get("/ideas", routes.Ideas)
 	r.Get("/log-out", routes.LogOut)
diff --git a/views/header.html b/views/header.html
index 0423348aa..a0e2121a1 100644
--- a/views/header.html
+++ b/views/header.html
@@ -6,6 +6,9 @@
 <link rel=alternate href=/feeds/atom type=application/atom+xml>
 <link rel=alternate href=/feeds/rss  type=application/rss+xml>
 <link rel=alternate href=/feeds/json type=application/json>
+<link rel=icon type=image/svg+xml href=/favicon.svg>
+<link rel="alternate icon" type=image/png href=/favicon16.png sizes=16x16>
+<link rel="alternate icon" type=image/png href=/favicon32.png sizes=32x32>
 
 {{/* FIXME This won't change for dark themes :-( */}}
 <meta name=theme-color content=#343A40>
diff --git a/views/svg/logo.svg b/views/svg/logo.svg
index f5c0daf3e..421837398 100644
--- a/views/svg/logo.svg
+++ b/views/svg/logo.svg
@@ -1 +1 @@
-<svg viewBox="0 0 14 16"><path d="M0 0h3v12H0zm0 13h3v3H0zm4-7h10v2H4zm0-4h10v2H4zm6-2h2v10h-2zM6 0h2v10H6"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><rect x="138.3" width="100" height="760"/><polygon points="498,623.2 424.6,623.2 525.3,0 598.7,0"/><polygon points="742.3,623.2 668.8,623.2 769.7,0 843.1,0"/><rect x="338.1" y="172.8" width="588.8" height="71.2"/><rect x="338.1" y="400.5" width="588.8" height="71.2"/><ellipse cx="188.3" cy="923.4" rx="76.8" ry="76.6"/></svg>
\ No newline at end of file