diff --git a/packages/client/public/index.html b/packages/client/public/index.html
index 0e7bef2500..577afc3741 100644
--- a/packages/client/public/index.html
+++ b/packages/client/public/index.html
@@ -18,7 +18,7 @@
       href="<%=htmlWebpackPlugin.files.favicon%>"
     />
 
-    <link rel="manifest" href="../../../public/manifest.json" />
+    <link rel="manifest" href="/manifest.json" />
     <!-- Tell the browser it's a PWA -->
     <!-- <meta name="mobile-web-app-capable" content="yes" /> -->
     <!-- Tell iOS it's a PWA -->
diff --git a/packages/client/webpack.config.js b/packages/client/webpack.config.js
index 9cf7ecb26c..4ca88f9b86 100644
--- a/packages/client/webpack.config.js
+++ b/packages/client/webpack.config.js
@@ -96,7 +96,9 @@ const config = {
 
       let folder = result.join("/");
 
-      return `${folder}/[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
+      folder += result.length === 0 ? "" : "/";
+
+      return `${folder}[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
     },
   },
 
diff --git a/packages/common/utils/index.ts b/packages/common/utils/index.ts
index 1b628d1159..6aaefaebb2 100644
--- a/packages/common/utils/index.ts
+++ b/packages/common/utils/index.ts
@@ -5,7 +5,7 @@ import DocseditorSvgUrl from "../../../public/images/logo/docseditor.svg?url";
 import LightSmallSvgUrl from "../../../public/images/logo/lightsmall.svg?url";
 import DocsEditoRembedSvgUrl from "../../../public/images/logo/docseditorembed.svg?url";
 import DarkLightSmallSvgUrl from "../../../public/images/logo/dark_lightsmall.svg?url";
-import FaviconIcoUrl from "../../../public/favicon.ico?url";
+import FaviconIco from "../../../public/favicon.ico";
 
 import BackgroundPatternReactSvgUrl from "../../../public/images/background.pattern.react.svg?url";
 import BackgroundPatternOrangeReactSvgUrl from "../../../public/images/background.pattern.orange.react.svg?url";
@@ -519,7 +519,7 @@ export const getLogoFromPath = (path) => {
     case "docseditorembed.svg":
       return DocsEditoRembedSvgUrl;
     case "favicon.ico":
-      return FaviconIcoUrl;
+      return FaviconIco;
     default:
       break;
   }
diff --git a/packages/components/.storybook/webpack.config.js b/packages/components/.storybook/webpack.config.js
index debb8797a9..2c46748ace 100644
--- a/packages/components/.storybook/webpack.config.js
+++ b/packages/components/.storybook/webpack.config.js
@@ -21,7 +21,9 @@ module.exports = ({ config }) => {
 
     let folder = result.join("/");
 
-    return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`; ;
+    folder += result.length === 0 ? "" : "/";
+
+    return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`; ;
   };
 
   // rules.push({
diff --git a/packages/editor/webpack/webpack.client.js b/packages/editor/webpack/webpack.client.js
index 7cf07a95ce..cbc69a64a7 100644
--- a/packages/editor/webpack/webpack.client.js
+++ b/packages/editor/webpack/webpack.client.js
@@ -42,7 +42,9 @@ const clientConfig = {
 
       let folder = result.join("/");
 
-      return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
+      folder += result.length === 0 ? "" : "/";
+
+      return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
     },
   },
 
diff --git a/packages/editor/webpack/webpack.server.js b/packages/editor/webpack/webpack.server.js
index 311a5ce1eb..7f6eb362a3 100644
--- a/packages/editor/webpack/webpack.server.js
+++ b/packages/editor/webpack/webpack.server.js
@@ -29,7 +29,9 @@ const serverConfig = {
 
       let folder = result.join("/");
 
-      return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
+      folder += result.length === 0 ? "" : "/";
+
+      return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
     },
   },
 
diff --git a/packages/login/webpack/webpack.client.js b/packages/login/webpack/webpack.client.js
index 9e6c98f368..d31eb133c0 100644
--- a/packages/login/webpack/webpack.client.js
+++ b/packages/login/webpack/webpack.client.js
@@ -42,7 +42,9 @@ const clientConfig = {
 
       let folder = result.join("/");
 
-      return `${folder}/[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
+      folder += result.length === 0 ? "" : "/";
+
+      return `${folder}[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
     },
   },
 
diff --git a/packages/login/webpack/webpack.server.js b/packages/login/webpack/webpack.server.js
index b0c5327a2f..391aa43610 100644
--- a/packages/login/webpack/webpack.server.js
+++ b/packages/login/webpack/webpack.server.js
@@ -29,7 +29,9 @@ const serverConfig = {
 
       let folder = result.join("/");
 
-      return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
+      folder += result.length === 0 ? "" : "/";
+
+      return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
     },
   },