diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 88d62b6aa..c367ea5e0 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -334,6 +334,7 @@ export class Server extends AbstractServer {
 
 			// Route all UI urls to index.html to support history-api
 			const nonUIRoutes: Readonly<string[]> = [
+				'favicon.ico',
 				'assets',
 				'static',
 				'types',
diff --git a/packages/editor-ui/public/google-auth/disabled.dark.png b/packages/editor-ui/public/static/google-auth/disabled.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/disabled.dark.png
rename to packages/editor-ui/public/static/google-auth/disabled.dark.png
diff --git a/packages/editor-ui/public/google-auth/disabled.png b/packages/editor-ui/public/static/google-auth/disabled.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/disabled.png
rename to packages/editor-ui/public/static/google-auth/disabled.png
diff --git a/packages/editor-ui/public/google-auth/focus.dark.png b/packages/editor-ui/public/static/google-auth/focus.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/focus.dark.png
rename to packages/editor-ui/public/static/google-auth/focus.dark.png
diff --git a/packages/editor-ui/public/google-auth/focus.png b/packages/editor-ui/public/static/google-auth/focus.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/focus.png
rename to packages/editor-ui/public/static/google-auth/focus.png
diff --git a/packages/editor-ui/public/google-auth/normal.dark.png b/packages/editor-ui/public/static/google-auth/normal.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/normal.dark.png
rename to packages/editor-ui/public/static/google-auth/normal.dark.png
diff --git a/packages/editor-ui/public/google-auth/normal.png b/packages/editor-ui/public/static/google-auth/normal.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/normal.png
rename to packages/editor-ui/public/static/google-auth/normal.png
diff --git a/packages/editor-ui/public/google-auth/pressed.dark.png b/packages/editor-ui/public/static/google-auth/pressed.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/pressed.dark.png
rename to packages/editor-ui/public/static/google-auth/pressed.dark.png
diff --git a/packages/editor-ui/public/google-auth/pressed.png b/packages/editor-ui/public/static/google-auth/pressed.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/pressed.png
rename to packages/editor-ui/public/static/google-auth/pressed.png
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
index 083deabaf..c2c73bc9c 100644
--- a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
@@ -13,10 +13,10 @@ import { useRootStore } from '@/stores/root.store';
 const { baseUrl } = useRootStore();
 const type = useUIStore().appliedTheme === 'dark' ? '.dark.png' : '.png';
 const googleAuthButtons = {
-	'--google-auth-btn-normal': `url(${baseUrl}google-auth/normal${type}`,
-	'--google-auth-btn-focus': `url(${baseUrl}google-auth/focus${type}`,
-	'--google-auth-btn-pressed': `url(${baseUrl}google-auth/pressed${type}`,
-	'--google-auth-btn-disabled': `url(${baseUrl}google-auth/disabled${type}`,
+	'--google-auth-btn-normal': `url(${baseUrl}static/google-auth/normal${type}`,
+	'--google-auth-btn-focus': `url(${baseUrl}static/google-auth/focus${type}`,
+	'--google-auth-btn-pressed': `url(${baseUrl}static/google-auth/pressed${type}`,
+	'--google-auth-btn-disabled': `url(${baseUrl}static/google-auth/disabled${type}`,
 };
 </script>