diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 74a6c9a0b10..45533b35c09 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -91,6 +91,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       inject: true,
       template: indexHtmlPath,
+      favicon: path.join(srcPath, 'favicon.ico'),
     }),
     new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"development"' }),
     // Note: only CSS is currently hot reloaded
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 5f792f3b88b..b16d1bb1a0c 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -92,6 +92,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       inject: true,
       template: indexHtmlPath,
+      favicon: path.join(srcPath, 'favicon.ico'),
       minify: {
         removeComments: true,
         collapseWhitespace: true,
diff --git a/template/src/favicon.ico b/template/src/favicon.ico
new file mode 100644
index 00000000000..5c125de5d89
Binary files /dev/null and b/template/src/favicon.ico differ