diff --git a/packages/strapi-admin/admin/src/containers/HomePage/index.js b/packages/strapi-admin/admin/src/containers/HomePage/index.js
index e8834d639d..284c799e31 100644
--- a/packages/strapi-admin/admin/src/containers/HomePage/index.js
+++ b/packages/strapi-admin/admin/src/containers/HomePage/index.js
@@ -9,6 +9,7 @@ import Helmet from 'react-helmet';
 import { FormattedMessage } from 'react-intl';
 import { get, upperFirst } from 'lodash';
 import { auth } from 'strapi-helper-plugin';
+import favicon from '../../favicon.ico';
 
 import useFetch from './hooks';
 import {
@@ -100,7 +101,12 @@ const HomePage = ({ global: { plugins }, history: { push } }) => {
   return (
     <>
       <FormattedMessage id="HomePage.helmet.title">
-        {title => <Helmet title={title} />}
+        {title => (
+          <Helmet
+            title={title}
+            link={[{ rel: 'icon', type: 'image/png', href: favicon }]}
+          />
+        )}
       </FormattedMessage>
       <Container className="container-fluid">
         <div className="row">
diff --git a/packages/strapi-admin/admin/src/containers/PluginDispatcher/index.js b/packages/strapi-admin/admin/src/containers/PluginDispatcher/index.js
index b302f734b1..0da434fa0a 100644
--- a/packages/strapi-admin/admin/src/containers/PluginDispatcher/index.js
+++ b/packages/strapi-admin/admin/src/containers/PluginDispatcher/index.js
@@ -10,6 +10,7 @@ import { get } from 'lodash';
 
 import Helmet from 'react-helmet';
 import { BlockerComponent } from 'strapi-helper-plugin';
+import favicon from '../../favicon.ico';
 
 import { LOGIN_LOGO } from '../../config';
 import ErrorBoundary from '../ErrorBoundary';
@@ -46,7 +47,10 @@ export function PluginDispatcher(props) {
 
   return (
     <div>
-      <Helmet title={`Strapi - ${name}`} />
+      <Helmet
+        title={`Strapi - ${name}`}
+        link={[{ rel: 'icon', type: 'image/png', href: favicon }]}
+      />
       <ErrorBoundary>
         <PluginEntryComponent
           {...props}
diff --git a/packages/strapi-admin/webpack.config.js b/packages/strapi-admin/webpack.config.js
index 7dce7d45a5..45c6f2d2fd 100644
--- a/packages/strapi-admin/webpack.config.js
+++ b/packages/strapi-admin/webpack.config.js
@@ -193,7 +193,7 @@ module.exports = ({
           use: 'file-loader',
         },
         {
-          test: /\.(jpg|png|gif)$/,
+          test: /\.(jpg|png|gif|ico)$/,
           loaders: [
             require.resolve('file-loader'),
             {
@@ -241,7 +241,7 @@ module.exports = ({
       new HtmlWebpackPlugin({
         inject: true,
         template: path.resolve(__dirname, 'index.html'),
-        favicon: path.resolve(__dirname, 'admin/src/favicon.ico'),
+        // favicon: path.resolve(__dirname, 'admin/src/favicon.ico'),
       }),
       new webpack.DefinePlugin({
         'process.env.NODE_ENV': JSON.stringify(