diff --git a/apps/studio/pages/_app.tsx b/apps/studio/pages/_app.tsx
index 48677f1b122..4ca8f2fd8d7 100644
--- a/apps/studio/pages/_app.tsx
+++ b/apps/studio/pages/_app.tsx
@@ -1,10 +1,9 @@
-import 'react-data-grid/lib/styles.css'
 import '@/styles/code.css'
 import '@/styles/editor.css'
 import '@/styles/focus.css'
+import '@/styles/globals.css'
 import '@/styles/graphiql-base.css'
 import '@/styles/grid.css'
-import '@/styles/globals.css'
 import '@/styles/markdown-preview.css'
 import '@/styles/monaco.css'
 import '@/styles/react-data-grid-logs.css'
@@ -12,6 +11,7 @@ import '@/styles/reactflow.css'
 import '@/styles/storage.css'
 import '@/styles/stripe.css'
 import '@/styles/ui.css'
+import 'react-data-grid/lib/styles.css'
 import 'ui-patterns/ShimmeringLoader/index.css'
 
 import { loader } from '@monaco-editor/react'
@@ -36,7 +36,7 @@ import { DevToolbar, DevToolbarProvider, DevToolbarTrigger, type ExtraTab } from
 import dynamic from 'next/dynamic'
 import Head from 'next/head'
 import { NuqsAdapter } from 'nuqs/adapters/next/pages'
-import { ErrorInfo, useCallback, type ComponentProps } from 'react'
+import { ErrorInfo, useCallback, useEffect, useState, type ComponentProps } from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
 import { TooltipProvider } from 'ui'
 import { TimestampInfoProvider } from 'ui-patterns'
@@ -52,6 +52,7 @@ import { MainScrollContainerProvider } from '@/components/layouts/MainScrollCont
 import { BannerStackProvider } from '@/components/ui/BannerStack/BannerStackProvider'
 import { GlobalErrorBoundaryState } from '@/components/ui/ErrorBoundary/GlobalErrorBoundaryState'
 import { GlobalShortcuts } from '@/components/ui/GlobalShortcuts/GlobalShortcuts'
+import { getCLIReleaseVersion } from '@/data/misc/cli-release-version-query'
 import { useRootQueryClient } from '@/data/query-client'
 import { customFont, sourceCodePro } from '@/fonts'
 import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
@@ -124,6 +125,7 @@ loader.config({
 function CustomApp({ Component, pageProps }: AppPropsWithLayout) {
   const queryClient = useRootQueryClient()
   const { appTitle } = useCustomContent(['app:title'])
+  const [isCLI, setIsCLI] = useState(false)
 
   const getLayout = Component.getLayout ?? ((page) => page)
 
@@ -144,6 +146,9 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) {
 
   const isTestEnv = process.env.NEXT_PUBLIC_NODE_ENV === 'test'
 
+  // [Joshen] Should target hosted staging, local dev, and local CLI only
+  const isNonProdEnv = (IS_PLATFORM && process.env.NEXT_PUBLIC_ENVIRONMENT !== 'prod') || isCLI
+
   const cloudProvider = useDefaultProvider()
 
   const getConfigCatFlags = useCallback(
@@ -154,6 +159,15 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) {
     [cloudProvider]
   )
 
+  const checkCliEnvironment = async () => {
+    const data = await getCLIReleaseVersion()
+    if (!!data.current) setIsCLI(true)
+  }
+
+  useEffect(() => {
+    if (!IS_PLATFORM) checkCliEnvironment()
+  }, [])
+
   return (
     <ErrorBoundary FallbackComponent={GlobalErrorBoundaryState} onError={errorBoundaryHandler}>
       <QueryClientProvider client={queryClient}>
@@ -188,7 +202,11 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) {
                           />
                         )}
                       </Head>
-                      <MetaFaviconsPagesRouter applicationName="Supabase Studio" includeManifest />
+                      <MetaFaviconsPagesRouter
+                        includeManifest
+                        applicationName="Supabase Studio"
+                        route={isNonProdEnv ? '/favicon/staging' : '/favicon'}
+                      />
                       <TooltipProvider delayDuration={0}>
                         <RouteValidationWrapper>
                           <ThemeProvider>
diff --git a/apps/studio/public/favicon/staging/android-icon-144x144.png b/apps/studio/public/favicon/staging/android-icon-144x144.png
new file mode 100644
index 00000000000..b8d9f9edce1
Binary files /dev/null and b/apps/studio/public/favicon/staging/android-icon-144x144.png differ
diff --git a/apps/studio/public/favicon/staging/android-icon-192x192.png b/apps/studio/public/favicon/staging/android-icon-192x192.png
new file mode 100644
index 00000000000..41c1032fe51
Binary files /dev/null and b/apps/studio/public/favicon/staging/android-icon-192x192.png differ
diff --git a/apps/studio/public/favicon/staging/android-icon-36x36.png b/apps/studio/public/favicon/staging/android-icon-36x36.png
new file mode 100644
index 00000000000..63f2638edaf
Binary files /dev/null and b/apps/studio/public/favicon/staging/android-icon-36x36.png differ
diff --git a/apps/studio/public/favicon/staging/android-icon-48x48.png b/apps/studio/public/favicon/staging/android-icon-48x48.png
new file mode 100644
index 00000000000..78f73e3c031
Binary files /dev/null and b/apps/studio/public/favicon/staging/android-icon-48x48.png differ
diff --git a/apps/studio/public/favicon/staging/android-icon-72x72.png b/apps/studio/public/favicon/staging/android-icon-72x72.png
new file mode 100644
index 00000000000..3a78a1f2967
Binary files /dev/null and b/apps/studio/public/favicon/staging/android-icon-72x72.png differ
diff --git a/apps/studio/public/favicon/staging/android-icon-96x96.png b/apps/studio/public/favicon/staging/android-icon-96x96.png
new file mode 100644
index 00000000000..393a4804567
Binary files /dev/null and b/apps/studio/public/favicon/staging/android-icon-96x96.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-114x114.png b/apps/studio/public/favicon/staging/apple-icon-114x114.png
new file mode 100644
index 00000000000..c996b228178
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-114x114.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-120x120.png b/apps/studio/public/favicon/staging/apple-icon-120x120.png
new file mode 100644
index 00000000000..d58bc70f4ed
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-120x120.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-144x144.png b/apps/studio/public/favicon/staging/apple-icon-144x144.png
new file mode 100644
index 00000000000..b8d9f9edce1
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-144x144.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-152x152.png b/apps/studio/public/favicon/staging/apple-icon-152x152.png
new file mode 100644
index 00000000000..c2eed3a64ca
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-152x152.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-180x180.png b/apps/studio/public/favicon/staging/apple-icon-180x180.png
new file mode 100644
index 00000000000..64aea3e1ce1
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-180x180.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-57x57.png b/apps/studio/public/favicon/staging/apple-icon-57x57.png
new file mode 100644
index 00000000000..4e18d78c686
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-57x57.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-60x60.png b/apps/studio/public/favicon/staging/apple-icon-60x60.png
new file mode 100644
index 00000000000..8304a36c47b
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-60x60.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-72x72.png b/apps/studio/public/favicon/staging/apple-icon-72x72.png
new file mode 100644
index 00000000000..3a78a1f2967
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-72x72.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-76x76.png b/apps/studio/public/favicon/staging/apple-icon-76x76.png
new file mode 100644
index 00000000000..2618df0ecf5
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-76x76.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon-precomposed.png b/apps/studio/public/favicon/staging/apple-icon-precomposed.png
new file mode 100644
index 00000000000..41c1032fe51
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon-precomposed.png differ
diff --git a/apps/studio/public/favicon/staging/apple-icon.png b/apps/studio/public/favicon/staging/apple-icon.png
new file mode 100644
index 00000000000..41c1032fe51
Binary files /dev/null and b/apps/studio/public/favicon/staging/apple-icon.png differ
diff --git a/apps/studio/public/favicon/staging/browserconfig.xml b/apps/studio/public/favicon/staging/browserconfig.xml
new file mode 100644
index 00000000000..f79ee558b2a
--- /dev/null
+++ b/apps/studio/public/favicon/staging/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/favicon/staging/ms-icon-70x70.png"/><square150x150logo src="/favicon/staging/ms-icon-150x150.png"/><square310x310logo src="/favicon/staging/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
diff --git a/apps/studio/public/favicon/staging/favicon-128.png b/apps/studio/public/favicon/staging/favicon-128.png
new file mode 100644
index 00000000000..a7e8f5ad279
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-128.png differ
diff --git a/apps/studio/public/favicon/staging/favicon-16x16.png b/apps/studio/public/favicon/staging/favicon-16x16.png
new file mode 100644
index 00000000000..031862f4c9d
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-16x16.png differ
diff --git a/apps/studio/public/favicon/staging/favicon-180x180.png b/apps/studio/public/favicon/staging/favicon-180x180.png
new file mode 100644
index 00000000000..64aea3e1ce1
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-180x180.png differ
diff --git a/apps/studio/public/favicon/staging/favicon-196x196.png b/apps/studio/public/favicon/staging/favicon-196x196.png
new file mode 100644
index 00000000000..c1de9ea7edd
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-196x196.png differ
diff --git a/apps/studio/public/favicon/staging/favicon-32x32.png b/apps/studio/public/favicon/staging/favicon-32x32.png
new file mode 100644
index 00000000000..def6aefb7bb
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-32x32.png differ
diff --git a/apps/studio/public/favicon/staging/favicon-48x48.png b/apps/studio/public/favicon/staging/favicon-48x48.png
new file mode 100644
index 00000000000..78f73e3c031
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-48x48.png differ
diff --git a/apps/studio/public/favicon/staging/favicon-96x96.png b/apps/studio/public/favicon/staging/favicon-96x96.png
new file mode 100644
index 00000000000..393a4804567
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon-96x96.png differ
diff --git a/apps/studio/public/favicon/staging/favicon.ico b/apps/studio/public/favicon/staging/favicon.ico
new file mode 100644
index 00000000000..031862f4c9d
Binary files /dev/null and b/apps/studio/public/favicon/staging/favicon.ico differ
diff --git a/apps/studio/public/favicon/staging/manifest.json b/apps/studio/public/favicon/staging/manifest.json
new file mode 100644
index 00000000000..ebb21483c8a
--- /dev/null
+++ b/apps/studio/public/favicon/staging/manifest.json
@@ -0,0 +1,49 @@
+{
+  "name": "Supabase Studio",
+  "short_name": "Supabase",
+  "description": "The Postgres Development Platform.",
+  "display_override": ["minimal-ui"],
+  "display": "standalone",
+  "theme_color": "#1C1C1C",
+  "background_color": "#1C1C1C",
+  "scope": "/",
+  "start_url": "/",
+  "icons": [
+    {
+      "src": "/favicon/staging/android-icon-36x36.png",
+      "sizes": "36x36",
+      "type": "image/png",
+      "density": "0.75"
+    },
+    {
+      "src": "/favicon/staging/android-icon-48x48.png",
+      "sizes": "48x48",
+      "type": "image/png",
+      "density": "1.0"
+    },
+    {
+      "src": "/favicon/staging/android-icon-72x72.png",
+      "sizes": "72x72",
+      "type": "image/png",
+      "density": "1.5"
+    },
+    {
+      "src": "/favicon/staging/android-icon-96x96.png",
+      "sizes": "96x96",
+      "type": "image/png",
+      "density": "2.0"
+    },
+    {
+      "src": "/favicon/staging/android-icon-144x144.png",
+      "sizes": "144x144",
+      "type": "image/png",
+      "density": "3.0"
+    },
+    {
+      "src": "/favicon/staging/android-icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "density": "4.0"
+    }
+  ]
+}
diff --git a/apps/studio/public/favicon/staging/ms-icon-144x144.png b/apps/studio/public/favicon/staging/ms-icon-144x144.png
new file mode 100644
index 00000000000..b8d9f9edce1
Binary files /dev/null and b/apps/studio/public/favicon/staging/ms-icon-144x144.png differ
diff --git a/apps/studio/public/favicon/staging/ms-icon-150x150.png b/apps/studio/public/favicon/staging/ms-icon-150x150.png
new file mode 100644
index 00000000000..86d79411419
Binary files /dev/null and b/apps/studio/public/favicon/staging/ms-icon-150x150.png differ
diff --git a/apps/studio/public/favicon/staging/ms-icon-310x310.png b/apps/studio/public/favicon/staging/ms-icon-310x310.png
new file mode 100644
index 00000000000..bca22a10db5
Binary files /dev/null and b/apps/studio/public/favicon/staging/ms-icon-310x310.png differ
diff --git a/apps/studio/public/favicon/staging/ms-icon-70x70.png b/apps/studio/public/favicon/staging/ms-icon-70x70.png
new file mode 100644
index 00000000000..2fa3ad98bb9
Binary files /dev/null and b/apps/studio/public/favicon/staging/ms-icon-70x70.png differ