diff --git a/app.js b/app.js
index d0675555c..0db8af0b8 100755
--- a/app.js
+++ b/app.js
@@ -651,7 +651,7 @@ Promise.all([findCompilers(), aws.initConfig(awsProps)])
                 res.set('Content-Type', 'application/xml');
                 res.render('sitemap');
             })
-            .use(sFavicon(path.join(staticDir, webpackConfig.output.publicPath, 'favicon.png')));
+            .use(sFavicon(path.join(staticDir, webpackConfig.output.publicPath, 'favicon.ico')));
 
         webServer
             .use(bodyParser.json({limit: ceProps('bodyParserLimit', maxUploadSize)}))
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 000000000..e3e20daef
Binary files /dev/null and b/static/favicon.ico differ
diff --git a/static/favicon.png b/static/favicon.png
deleted file mode 100644
index dece7859d..000000000
Binary files a/static/favicon.png and /dev/null differ
diff --git a/views/head.pug b/views/head.pug
index c81f94d6e..f330ff7ec 100644
--- a/views/head.pug
+++ b/views/head.pug
@@ -1,5 +1,5 @@
 title Compiler Explorer
-link(rel="icon" href="favicon.png")
+link(rel="icon" href="favicon.ico?v=1")
 meta(charset="utf-8")
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
 meta(name="description" content="Compiler Explorer is an interactive online compiler which shows the assembly output of compiled C, C++, Rust, Go, D, Haskell, Swift & Pascal code.")
diff --git a/webpack.config.js b/webpack.config.js
index 7c78a4092..5b0f9840b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -35,7 +35,7 @@ let plugins = [
         to: vsPath,
     },
     {
-        from: path.join(staticPath, "favicon.png"),
+        from: path.join(staticPath, "favicon.ico"),
         to: distPath,
     },
     ]),