diff --git a/app.js b/app.js
index 6fe79c1bd68..6201e95e0f1 100755
--- a/app.js
+++ b/app.js
@@ -181,6 +181,18 @@ if (defArgs.suppressConsoleLog) {
 
 const isDevMode = () => process.env.NODE_ENV !== 'production';
 
+function getFaviconFilename() {
+    if (isDevMode()) {
+        return 'favicon-dev.ico';
+    } else if (opts.env.includes('beta')) {
+        return 'favicon-beta.ico';
+    } else if (opts.env.includes('staging')) {
+        return 'favicon-staging.ico';
+    } else {
+        return 'favicon.ico';
+    }
+}
+
 const propHierarchy = [
     'defaults',
     defArgs.env,
@@ -776,7 +788,7 @@ async function main() {
             res.set('Content-Type', 'application/xml');
             res.render('sitemap');
         })
-        .use(sFavicon(utils.resolvePathFromAppRoot('static', 'favicon.ico')))
+        .use(sFavicon(utils.resolvePathFromAppRoot('static/favicons', getFaviconFilename())))
         .get('/client-options.js', (req, res) => {
             staticHeaders(res);
             res.set('Content-Type', 'application/javascript');
diff --git a/static/favicon.ico b/static/favicon.ico
deleted file mode 100644
index e3e20daefdb..00000000000
Binary files a/static/favicon.ico and /dev/null differ
diff --git a/static/favicons/favicon-beta.ico b/static/favicons/favicon-beta.ico
new file mode 100644
index 00000000000..7e8bacfd020
Binary files /dev/null and b/static/favicons/favicon-beta.ico differ
diff --git a/static/favicons/favicon-dev.ico b/static/favicons/favicon-dev.ico
new file mode 100644
index 00000000000..da43dee711f
Binary files /dev/null and b/static/favicons/favicon-dev.ico differ
diff --git a/static/favicons/favicon-staging.ico b/static/favicons/favicon-staging.ico
new file mode 100644
index 00000000000..deae8896162
Binary files /dev/null and b/static/favicons/favicon-staging.ico differ
diff --git a/static/favicons/favicon-suspend.ico b/static/favicons/favicon-suspend.ico
new file mode 100644
index 00000000000..cbe41d96026
Binary files /dev/null and b/static/favicons/favicon-suspend.ico differ
diff --git a/static/favicons/favicon.ico b/static/favicons/favicon.ico
new file mode 100644
index 00000000000..211afa9a9c9
Binary files /dev/null and b/static/favicons/favicon.ico differ
diff --git a/webpack.config.esm.js b/webpack.config.esm.js
index ca9cf32b422..911f89f234f 100644
--- a/webpack.config.esm.js
+++ b/webpack.config.esm.js
@@ -92,7 +92,7 @@ const plugins = [
         'window.PRODUCTION': JSON.stringify(!isDev),
     }),
     new CopyWebpackPlugin({
-        patterns: [{from: './static/favicon.ico', to: path.resolve(distPath, 'static', 'favicon.ico')}],
+        patterns: [{from: './static/favicons', to: path.resolve(distPath, 'static', 'favicons')}],
     }),
 ];