diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
index 360fd1676bb3b..45b38e49c1008 100644
--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -493,7 +493,12 @@ export const TableList = ({
                             {!isSchemaLocked && (
                               <DropdownMenu>
                                 <DropdownMenuTrigger asChild>
-                                  <Button type="default" className="px-1" icon={<MoreVertical />} />
+                                  <Button
+                                    type="default"
+                                    className="px-1"
+                                    icon={<MoreVertical />}
+                                    aria-label={`Table ${x.name} actions`}
+                                  />
                                 </DropdownMenuTrigger>
                                 <DropdownMenuContent side="bottom" align="end" className="w-40">
                                   <DropdownMenuItem
diff --git a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
index 0d13f17615d40..82d1a407f7f4c 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
@@ -1,4 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
 import { FeatureFlagContext, IS_PLATFORM } from 'common'
 import { fullImageUrl } from 'common/marketplace-client'
 import { Boxes } from 'lucide-react'
@@ -9,10 +8,36 @@ import { cn } from 'ui'
 
 import { INTEGRATIONS, Loading, type IntegrationDefinition } from './Integrations.constants'
 import { useIsMarketplaceEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
-import { marketplaceIntegrationsQueryOptions } from '@/data/marketplace/integrations-query'
+import {
+  useMarketplaceIntegrationsQuery,
+  type MarketplaceIntegration,
+} from '@/data/marketplace/integrations-query'
 import { useCLIReleaseVersionQuery } from '@/data/misc/cli-release-version-query'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 
+const renderMarketplaceLogo = (listingLogo?: string | null) => {
+  const MarketplaceLogo = ({ className, ...props }: { className?: string } = {}) => (
+    <div className="relative w-full h-full">
+      {listingLogo ? (
+        <Image
+          fill
+          src={fullImageUrl(listingLogo)}
+          alt=""
+          className={cn('p-2', className)}
+          {...props}
+        />
+      ) : (
+        <Boxes className={cn('inset-0 p-2 text-black w-full h-full', className)} {...props} />
+      )}
+    </div>
+  )
+  return MarketplaceLogo
+}
+
+function isForeignDataWrapper(integration: MarketplaceIntegration) {
+  return integration.categories.some((c) => c?.slug === 'foreign-data-wrapper')
+}
+
 /**
  * [Joshen] Returns a combination of
  * - Marketplace integrations retrieved remotely (Only if feature flag enabled)
@@ -26,118 +51,108 @@ export const useAvailableIntegrations = () => {
   const { data: cliData } = useCLIReleaseVersionQuery()
   const isCLI = !!cliData?.current
 
-  const { data, error } = useQuery({
-    ...marketplaceIntegrationsQueryOptions(),
-    enabled: isMarketplaceEnabled,
-  })
+  const { data, error } = useMarketplaceIntegrationsQuery({ enabled: isMarketplaceEnabled })
   const isPending = IS_PLATFORM && (!hasLoaded || (isMarketplaceEnabled && !data && !error))
   const isSuccess = !IS_PLATFORM || (hasLoaded && (!isMarketplaceEnabled || (!!data && !error)))
   const isError = IS_PLATFORM && isMarketplaceEnabled && !!error
 
   // [Joshen] Format marketplace integrations into existing ones for now
   // Likely that we might need to change, but can look into separately
+  // Wrappers from marketplace are excluded here — they are merged into the
+  // hardcoded studio wrappers below as content overrides.
   const marketplaceIntegrations: IntegrationDefinition[] = useMemo(
     () =>
-      (data ?? [])?.map((integration) => {
-        const {
-          id: listingId,
-          slug,
-          categories,
-          featured,
-          title,
-          description,
-          documentation_url: docsUrl,
-          website_url: siteUrl,
-          installation_url: installUrl,
-          installation_url_type: installUrlType,
-          installation_identification_method: installMethod,
-          secret_key_prefix: secretKeyPrefix,
-          edge_function_secret_name: edgeFunctionSecretName,
-          images,
-          content,
-          partner_name: authorName,
-          listing_logo: listingLogo,
-        } = integration
-
-        const status = undefined
-        const author = { name: authorName ?? '', websiteUrl: '' }
-
-        return {
-          id: slug ?? '',
-          name: title ?? '',
-          status,
-          featured: !!featured,
-          type: 'oauth' as const, // Currently marketplace only supports oauth apps
-          source: 'Partner' as const,
-          categories: Array.isArray(categories)
-            ? (categories as Array<{ slug: string }>).map((x) => x.slug)
-            : [],
-          content,
-          files: images?.map((image) => fullImageUrl(image)),
-          description,
-          docsUrl,
-          siteUrl,
-          installUrl,
-          installUrlType: installUrlType ?? undefined,
-          installIdentificationMethod: installMethod ?? undefined,
-          secretKeyPrefix: secretKeyPrefix ?? undefined,
-          edgeFunctionSecretName: edgeFunctionSecretName ?? undefined,
-          listingId: listingId ?? undefined,
-          author,
-          requiredExtensions: [],
-          icon: ({ className, ...props } = {}) => (
-            <div className="relative w-full h-full">
-              {listingLogo ? (
-                <Image
-                  fill
-                  src={fullImageUrl(listingLogo)}
-                  alt=""
-                  className={cn('p-2', className)}
-                  {...props}
-                />
-              ) : (
-                <Boxes
-                  className={cn('inset-0 p-2 text-black w-full h-full', className)}
-                  {...props}
-                />
-              )}
-            </div>
-          ),
-          navigation: [
-            {
-              route: 'overview',
-              label: 'Overview',
+      (data ?? [])
+        ?.filter((integration) => !isForeignDataWrapper(integration))
+        .map((integration) => {
+          const {
+            id: listingId,
+            slug,
+            categories,
+            featured,
+            title,
+            description,
+            documentation_url: docsUrl,
+            website_url: siteUrl,
+            installation_url: installUrl,
+            installation_url_type: installUrlType,
+            installation_identification_method: installMethod,
+            secret_key_prefix: secretKeyPrefix,
+            edge_function_secret_name: edgeFunctionSecretName,
+            images,
+            content,
+            partner_name: authorName,
+            listing_logo: listingLogo,
+          } = integration
+
+          const status = undefined
+          const author = { name: authorName ?? '', websiteUrl: '' }
+
+          return {
+            id: slug ?? '',
+            name: title ?? '',
+            status,
+            featured: !!featured,
+            type: 'oauth' as const, // Currently marketplace only supports oauth apps
+            source: 'Partner' as const,
+            categories: categories.map((x) => x.slug),
+            content,
+            files: images?.map((image) => fullImageUrl(image)),
+            description,
+            docsUrl,
+            siteUrl,
+            installUrl,
+            installUrlType: installUrlType ?? undefined,
+            installIdentificationMethod: installMethod ?? undefined,
+            secretKeyPrefix: secretKeyPrefix ?? undefined,
+            edgeFunctionSecretName: edgeFunctionSecretName ?? undefined,
+            listingId: listingId ?? undefined,
+            author,
+            requiredExtensions: [],
+            icon: renderMarketplaceLogo(listingLogo),
+            navigation: [
+              {
+                route: 'overview',
+                label: 'Overview',
+              },
+            ],
+            navigate: ({ pageId = 'overview' }) => {
+              switch (pageId) {
+                case 'overview':
+                  return dynamic(
+                    () =>
+                      import('@/components/interfaces/Integrations/Integration/MarketplaceIntegrationOverviewTab').then(
+                        (mod) => mod.MarketplaceIntegrationOverviewTab
+                      ),
+                    {
+                      loading: Loading,
+                    }
+                  )
+              }
+              return null
             },
-          ],
-          navigate: ({ pageId = 'overview' }) => {
-            switch (pageId) {
-              case 'overview':
-                return dynamic(
-                  () =>
-                    import('@/components/interfaces/Integrations/Integration/MarketplaceIntegrationOverviewTab').then(
-                      (mod) => mod.MarketplaceIntegrationOverviewTab
-                    ),
-                  {
-                    loading: Loading,
-                  }
-                )
-            }
-            return null
-          },
-        }
-      }),
+          }
+        }),
     [data]
   )
 
+  // Marketplace wrapper listings keyed by their studio-equivalent id
+  // (marketplace uses dash-separated slugs, studio uses underscore-separated ids).
+  const marketplaceWrappers = useMemo(() => {
+    const map: Record<string, MarketplaceIntegration> = {}
+    ;(data ?? []).forEach((integration) => {
+      if (!isForeignDataWrapper(integration)) return
+      map[integration.slug.replaceAll('-', '_')] = integration
+    })
+    return map
+  }, [data])
+
   // [Joshen] Existing integrations that are defined within studio
   // Available integrations are all integrations that can be installed. If an integration can't be installed (needed
   // extensions are not available on this DB image), the UI will provide a tooltip explaining why.
   const allIntegrations = useMemo(() => {
     return INTEGRATIONS.filter((integration) => {
-      if (
-        !integrationsWrappers &&
-        (integration.type === 'wrapper' || integration.id.endsWith('_wrapper'))
-      ) {
+      if (!integrationsWrappers && integration.type === 'wrapper') {
         return false
       }
 
@@ -146,8 +161,41 @@ export const useAvailableIntegrations = () => {
       }
 
       return true
+    }).map((integration) => {
+      const isWrapper = integration.type === 'wrapper'
+      if (!isWrapper) return integration
+
+      const marketplaceWrapper = marketplaceWrappers[integration.id]
+      if (!marketplaceWrapper) return integration
+
+      const {
+        title,
+        description,
+        content,
+        documentation_url: docsUrl,
+        website_url: siteUrl,
+        images,
+        partner_name: authorName,
+        listing_logo: listingLogo,
+      } = marketplaceWrapper
+
+      const overrides = {
+        name: title,
+        description,
+        content,
+        docsUrl,
+        siteUrl,
+        author: authorName ? { name: authorName, websiteUrl: '' } : undefined,
+        files: images?.map((image) => fullImageUrl(image)),
+        icon: listingLogo ? renderMarketplaceLogo(listingLogo) : undefined,
+      }
+
+      return {
+        ...integration,
+        ...Object.fromEntries(Object.entries(overrides).filter(([, v]) => v != null)),
+      }
     })
-  }, [integrationsWrappers, isCLI])
+  }, [integrationsWrappers, isCLI, marketplaceWrappers])
 
   const dataWithMarketplace = useMemo(() => {
     return [...marketplaceIntegrations, ...allIntegrations].sort((a, b) =>
diff --git a/apps/studio/components/interfaces/Integrations/Marketplace/MarketplaceIndex.tsx b/apps/studio/components/interfaces/Integrations/Marketplace/MarketplaceIndex.tsx
index d129289772e90..dbfb503b907dc 100644
--- a/apps/studio/components/interfaces/Integrations/Marketplace/MarketplaceIndex.tsx
+++ b/apps/studio/components/interfaces/Integrations/Marketplace/MarketplaceIndex.tsx
@@ -1,4 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
 import { parseAsString, parseAsStringEnum, useQueryState } from 'nuqs'
 import { useMemo, useRef } from 'react'
 import { Button, Card, ShadowScrollArea, Table, TableBody, TableHeader } from 'ui'
@@ -33,7 +32,7 @@ import { useInstalledIntegrations } from '@/components/interfaces/Integrations/L
 import { useIntegrationFilteringAndSort } from '@/components/interfaces/Integrations/Landing/useIntegrationFilteringAndSort'
 import { AlertError } from '@/components/ui/AlertError'
 import { DocsButton } from '@/components/ui/DocsButton'
-import { marketplaceCategoriesQueryOptions } from '@/data/marketplace/integration-categories-query'
+import { useMarketplaceCategoriesQuery } from '@/data/marketplace/integration-categories-query'
 import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
 import { DOCS_URL } from '@/lib/constants'
 import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -89,7 +88,7 @@ export const MarketplaceIndex = () => {
   const isLoading = isLoadingAvailable || isLoadingInstalled
   const isSuccess = isSuccessAvailable && isSuccessInstalled
 
-  const { data: marketplaceCategories = [] } = useQuery(marketplaceCategoriesQueryOptions())
+  const { data: marketplaceCategories = [] } = useMarketplaceCategoriesQuery()
 
   const categoryOptions = useMemo(() => {
     // Start with marketplace DB categories
diff --git a/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx b/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx
index 5a4a798f0f6c9..244b489bdba26 100644
--- a/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx
+++ b/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx
@@ -1,4 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
 import { IS_PLATFORM, useFeatureFlags, useParams } from 'common'
 import { useRouter } from 'next/router'
 import { PropsWithChildren } from 'react'
@@ -10,8 +9,8 @@ import { useInstalledIntegrations } from '@/components/interfaces/Integrations/L
 import { ProjectLayout } from '@/components/layouts/ProjectLayout'
 import AlertError from '@/components/ui/AlertError'
 import { ProductMenu } from '@/components/ui/ProductMenu'
-import { marketplaceCategoriesQueryOptions } from '@/data/marketplace/integration-categories-query'
-import { marketplaceIntegrationsQueryOptions } from '@/data/marketplace/integrations-query'
+import { useMarketplaceCategoriesQuery } from '@/data/marketplace/integration-categories-query'
+import { useMarketplaceIntegrationsQuery } from '@/data/marketplace/integrations-query'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { withAuth } from '@/hooks/misc/withAuth'
 
@@ -54,19 +53,15 @@ const IntegrationCategoriesMenu = ({ page }: { page: string }) => {
   const pageKey = categoryParam || page
 
   const { integrationsWrappers: showWrappers } = useIsFeatureEnabled(['integrations:wrappers'])
-  const { data: categories = [], isPending: isPendingCategories } = useQuery(
-    marketplaceCategoriesQueryOptions({ enabled: isMarketplaceEnabled })
-  )
-  const { data: listings = [], isPending: isPendingListings } = useQuery(
-    marketplaceIntegrationsQueryOptions({ enabled: isMarketplaceEnabled })
-  )
+  const { data: categories = [], isPending: isPendingCategories } = useMarketplaceCategoriesQuery({
+    enabled: isMarketplaceEnabled,
+  })
+  const { data: listings = [], isPending: isPendingListings } = useMarketplaceIntegrationsQuery({
+    enabled: isMarketplaceEnabled,
+  })
 
   const populatedCategoryIds = new Set(
-    listings.flatMap((listing) =>
-      Array.isArray(listing.categories)
-        ? (listing.categories as Array<{ id: string }>).map((c) => c.id)
-        : []
-    )
+    listings.flatMap((listing) => listing.categories.map((c) => c.id))
   )
   const nonEmptyCategories = categories.filter(
     (category) => category.id && populatedCategoryIds.has(category.id)
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableMenuEmptyState.tsx b/apps/studio/components/layouts/TableEditorLayout/TableMenuEmptyState.tsx
index 916b8a207bfcb..3cf482e491e34 100644
--- a/apps/studio/components/layouts/TableEditorLayout/TableMenuEmptyState.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/TableMenuEmptyState.tsx
@@ -11,8 +11,8 @@ export const TableMenuEmptyState = () => {
       description="Any tables or views you create will be listed here."
       className="mx-4"
     >
-      <div className="top-0 left-6 flex flex-col opacity-50 cursor-not-allowed bg-dash-sidebar h-content -mb-7 pointer-events-none scale-75">
-        <div className="relative h-content">
+      <div className="top-0 left-6 flex flex-col opacity-50 cursor-not-allowed bg-dash-sidebar -mb-7 pointer-events-none scale-75">
+        <div className="relative">
           <div className="absolute inset-0 pointer-events-none z-10">
             <div className="absolute inset-0 bg-linear-to-t from-transparent from-80% to-100% to-background-surface-100 dark:to-background-surface-75" />
             <div className="absolute inset-0 bg-linear-to-r from-transparent from-50% to-100% to-background-surface-100 dark:to-background-surface-75" />
diff --git a/apps/studio/data/marketplace/integration-categories-query.ts b/apps/studio/data/marketplace/integration-categories-query.ts
index 06a452874548e..f9f5ca83a0f22 100644
--- a/apps/studio/data/marketplace/integration-categories-query.ts
+++ b/apps/studio/data/marketplace/integration-categories-query.ts
@@ -1,23 +1,32 @@
-import { queryOptions } from '@tanstack/react-query'
-import { createMarketplaceClient } from 'common/marketplace-client'
+import { useQuery } from '@tanstack/react-query'
+import { createMarketplaceClient, type Category } from 'common/marketplace-client'
 
 import { marketplaceIntegrationsKeys } from './keys'
 import { handleError } from '@/data/fetchers'
+import type { ResponseError, UseCustomQueryOptions } from '@/types'
 
-async function getMarketplaceCategories() {
+export type MarketplaceCategory = Category
+
+export async function getMarketplaceCategories(signal?: AbortSignal) {
   const marketplaceClient = createMarketplaceClient()
-  const { data, error } = await marketplaceClient.from('categories').select('*')
+  let query = marketplaceClient.from('categories').select('*')
+  if (signal) query = query.abortSignal(signal)
+  const { data, error } = await query
 
   if (error) handleError(error)
   return data ?? []
 }
 
-export const marketplaceCategoriesQueryOptions = ({
+export type MarketplaceCategoriesData = Awaited<ReturnType<typeof getMarketplaceCategories>>
+export type MarketplaceCategoriesError = ResponseError
+
+export const useMarketplaceCategoriesQuery = <TData = MarketplaceCategoriesData>({
   enabled = true,
-}: { enabled?: boolean } = {}) => {
-  return queryOptions({
+  ...options
+}: UseCustomQueryOptions<MarketplaceCategoriesData, MarketplaceCategoriesError, TData> = {}) =>
+  useQuery<MarketplaceCategoriesData, MarketplaceCategoriesError, TData>({
     queryKey: marketplaceIntegrationsKeys.categories(),
-    queryFn: () => getMarketplaceCategories(),
+    queryFn: ({ signal }) => getMarketplaceCategories(signal),
     enabled,
+    ...options,
   })
-}
diff --git a/apps/studio/data/marketplace/integrations-query.ts b/apps/studio/data/marketplace/integrations-query.ts
index 12b28f5ebfe59..199adae42bec2 100644
--- a/apps/studio/data/marketplace/integrations-query.ts
+++ b/apps/studio/data/marketplace/integrations-query.ts
@@ -1,26 +1,32 @@
-import { queryOptions } from '@tanstack/react-query'
-import { createMarketplaceClient } from 'common/marketplace-client'
+import { useQuery } from '@tanstack/react-query'
+import { createMarketplaceClient, type Listing } from 'common/marketplace-client'
 
 import { marketplaceIntegrationsKeys } from './keys'
 import { handleError } from '@/data/fetchers'
+import type { ResponseError, UseCustomQueryOptions } from '@/types'
 
-async function getMarketplaceIntegrations() {
+export type MarketplaceIntegration = Listing
+
+export async function getMarketplaceIntegrations(signal?: AbortSignal) {
   const marketplaceClient = createMarketplaceClient()
-  const { data, error } = await marketplaceClient
-    .from('listings')
-    .select('*')
-    .is('publish_dashboard', true)
+  let query = marketplaceClient.from('listings').select('*').is('publish_dashboard', true)
+  if (signal) query = query.abortSignal(signal)
+  const { data, error } = await query
 
   if (error) handleError(error)
   return data ?? []
 }
 
-export const marketplaceIntegrationsQueryOptions = ({
+export type MarketplaceIntegrationsData = Awaited<ReturnType<typeof getMarketplaceIntegrations>>
+export type MarketplaceIntegrationsError = ResponseError
+
+export const useMarketplaceIntegrationsQuery = <TData = MarketplaceIntegrationsData>({
   enabled = true,
-}: { enabled?: boolean } = {}) => {
-  return queryOptions({
+  ...options
+}: UseCustomQueryOptions<MarketplaceIntegrationsData, MarketplaceIntegrationsError, TData> = {}) =>
+  useQuery<MarketplaceIntegrationsData, MarketplaceIntegrationsError, TData>({
     queryKey: marketplaceIntegrationsKeys.list(),
-    queryFn: () => getMarketplaceIntegrations(),
+    queryFn: ({ signal }) => getMarketplaceIntegrations(signal),
     enabled,
+    ...options,
   })
-}
diff --git a/apps/studio/pages/project/[ref]/integrations/index.tsx b/apps/studio/pages/project/[ref]/integrations/index.tsx
index ee48c9d7a3d70..61ad4429f6999 100644
--- a/apps/studio/pages/project/[ref]/integrations/index.tsx
+++ b/apps/studio/pages/project/[ref]/integrations/index.tsx
@@ -1,4 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
 import { IS_PLATFORM, useFeatureFlags } from 'common'
 import { Database } from 'common/marketplace.types'
 import { Search } from 'lucide-react'
@@ -33,7 +32,7 @@ import { ProjectIntegrationsLayoutDispatch } from '@/components/layouts/ProjectI
 import { AlertError } from '@/components/ui/AlertError'
 import { DocsButton } from '@/components/ui/DocsButton'
 import { NoSearchResults } from '@/components/ui/NoSearchResults'
-import { marketplaceCategoriesQueryOptions } from '@/data/marketplace/integration-categories-query'
+import { useMarketplaceCategoriesQuery } from '@/data/marketplace/integration-categories-query'
 import { BASE_PATH, DOCS_URL } from '@/lib/constants'
 import type { NextPageWithLayout } from '@/types'
 
@@ -183,9 +182,9 @@ const LegacyIntegrationsPage = () => {
 
   const selectedCategory = useFilterCategory()
 
-  const { data: categories = [], isPending: isPendingCategories } = useQuery(
-    marketplaceCategoriesQueryOptions({ enabled: isMarketplaceEnabled })
-  )
+  const { data: categories = [], isPending: isPendingCategories } = useMarketplaceCategoriesQuery({
+    enabled: isMarketplaceEnabled,
+  })
 
   const isLoadingSelectedCategory =
     selectedCategory !== 'all' &&
diff --git a/e2e/studio/features/cron-jobs.spec.ts b/e2e/studio/features/cron-jobs.spec.ts
index 49838e2c79b7c..ec52d25d47fea 100644
--- a/e2e/studio/features/cron-jobs.spec.ts
+++ b/e2e/studio/features/cron-jobs.spec.ts
@@ -400,8 +400,10 @@ test.describe('Cron Jobs', () => {
       // The test job should still be visible in the grid (minimal mode shows jobs without last run)
       await expect(page.getByRole('row', { name: new RegExp(testJobName) })).toBeVisible()
 
-      // The "Learn more" button should be visible
-      await expect(page.getByRole('button', { name: 'Learn more' })).toBeVisible()
+      // An alert about high query costs should be visible and contain a "Learn more" button
+      await expect(
+        page.getByRole('alert').getByRole('button', { name: 'Learn more' })
+      ).toBeVisible()
 
       // Remove the route mock for subsequent tests
       await page.unroute('**/pg-meta/*/query**')
@@ -441,8 +443,8 @@ test.describe('Cron Jobs', () => {
         timeout: 15000,
       })
 
-      // Click the "Learn more" button to open the dialog
-      await page.getByRole('button', { name: 'Learn more' }).click()
+      // Click the "Learn more" button in the alert to open the dialog
+      await page.getByRole('alert').getByRole('button', { name: 'Learn more' }).click()
 
       // The dialog should open with the explanation
       await expect(
@@ -504,7 +506,7 @@ test.describe('Cron Jobs', () => {
       ).toBeVisible({
         timeout: 15000,
       })
-      await page.getByRole('button', { name: 'Learn more' }).click()
+      await page.getByRole('alert').getByRole('button', { name: 'Learn more' }).click()
 
       // Wait for dialog to open
       await expect(
diff --git a/e2e/studio/features/database.spec.ts b/e2e/studio/features/database.spec.ts
index 82acce805c164..9b48dd84d4e92 100644
--- a/e2e/studio/features/database.spec.ts
+++ b/e2e/studio/features/database.spec.ts
@@ -301,6 +301,7 @@ test.describe('Database', () => {
 
       // create a new table
       await page.getByRole('button', { name: 'New table' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
       await page.getByLabel('Name', { exact: true }).fill(databaseTableNameNew)
       const createTableWait = createApiResponseWaiter(
         page,
@@ -313,12 +314,23 @@ test.describe('Database', () => {
       // validate table creation
       await createTableWait
       await waitForDatabaseToLoad(page, ref)
+      await expect(page.getByRole('dialog')).not.toBeVisible()
+
       await expect(page.getByText(databaseTableNameNew, { exact: true })).toBeVisible()
+      await expect(page.getByText('Table pw_database_table_crud_new is good to go!')).toBeVisible()
+      await page.getByRole('button', { name: 'Close toast' }).click()
 
       // edit a new table
-      await page.getByRole('row', { name: databaseTableNameNew }).getByRole('button').last().click()
+      await page
+        .getByRole('row', { name: databaseTableNameNew })
+        .getByRole('button', { name: `Table ${databaseTableNameNew} actions` })
+        .click()
       await page.getByRole('menuitem', { name: 'Edit table' }).click()
-      await page.getByTestId('table-name-input').fill(databaseTableNameUpdated)
+      await expect(page.getByRole('dialog')).toBeVisible()
+      await expect(page.getByText(`Update table ${databaseTableNameNew}`)).toBeVisible()
+      // Ensure table data is loaded
+      await expect(page.getByLabel('Name', { exact: true })).toHaveValue(databaseTableNameNew)
+      await page.getByLabel('Name', { exact: true }).fill(databaseTableNameUpdated)
       const updateTableWait = createApiResponseWaiter(
         page,
         'pg-meta',
@@ -331,14 +343,19 @@ test.describe('Database', () => {
       await updateTableWait
       await waitForDatabaseToLoad(page, ref)
       await expect(page.getByText(databaseTableNameUpdated, { exact: true })).toBeVisible()
+      await expect(
+        page.getByText(`Successfully updated ${databaseTableNameUpdated}!`)
+      ).toBeVisible()
+      await page.getByRole('button', { name: 'Close toast' }).click()
+      await expect(page.getByRole('dialog')).not.toBeVisible()
 
       // duplicate table
       await page
         .getByRole('row', { name: databaseTableNameUpdated })
-        .getByRole('button')
-        .last()
+        .getByRole('button', { name: `Table ${databaseTableNameUpdated} actions` })
         .click()
       await page.getByRole('menuitem', { name: 'Duplicate Table' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
       await page.getByLabel('Name').fill(databaseTableNameDuplicate)
       await page.getByLabel('Description').fill('')
       const duplicateTableWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=')
@@ -348,14 +365,21 @@ test.describe('Database', () => {
       await duplicateTableWait
       await waitForDatabaseToLoad(page, ref)
       await expect(page.getByText(databaseTableNameDuplicate, { exact: true })).toBeVisible()
+      await expect(
+        page.getByText(
+          `Table ${databaseTableNameUpdated} has been successfully duplicated into ${databaseTableNameDuplicate}!`
+        )
+      ).toBeVisible()
+      await page.getByRole('button', { name: 'Close toast' }).click()
+      await expect(page.getByRole('dialog')).not.toBeVisible()
 
       // delete tables
       await page
-        .getByRole('row', { name: `${databaseTableNameDuplicate}` })
-        .getByRole('button')
-        .last()
+        .getByRole('row', { name: databaseTableNameUpdated })
+        .getByRole('button', { name: `Table ${databaseTableNameUpdated} actions` })
         .click()
       await page.getByRole('menuitem', { name: 'Delete table' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
       await page.getByRole('checkbox', { name: 'Drop table with cascade?' }).check()
       const deleteDuplicateWait = createApiResponseWaiter(
         page,
@@ -365,13 +389,14 @@ test.describe('Database', () => {
       )
       await page.getByRole('button', { name: 'Delete' }).click()
       await deleteDuplicateWait
+      await expect(page.getByRole('dialog')).not.toBeVisible()
 
       await page
-        .getByRole('row', { name: `${databaseTableNameUpdated}` })
-        .getByRole('button')
-        .last()
+        .getByRole('row', { name: databaseTableNameDuplicate })
+        .getByRole('button', { name: `Table ${databaseTableNameDuplicate} actions` })
         .click()
       await page.getByRole('menuitem', { name: 'Delete table' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
       await page.getByRole('checkbox', { name: 'Drop table with cascade?' }).check()
       const deleteUpdatedWait = createApiResponseWaiter(
         page,
@@ -381,6 +406,7 @@ test.describe('Database', () => {
       )
       await page.getByRole('button', { name: 'Delete' }).click()
       await deleteUpdatedWait
+      await expect(page.getByRole('dialog')).not.toBeVisible()
 
       // validate navigating to table editor from database table page
       await page.getByRole('row', { name: databaseTableName }).getByRole('button').last().click()
@@ -449,12 +475,15 @@ test.describe('Database', () => {
       // wait for response + validate
       await columnCreateWait
       await columnCreateRefreshWait
+      await expect(page.getByRole('dialog')).not.toBeVisible()
+
       const columnDatabase2Row = page.getByRole('row', { name: databaseColumnName2 })
       await expect(columnDatabase2Row).toContainText(databaseColumnName2)
       await expect(columnDatabase2Row).toContainText('numeric')
 
       // update table column
       await columnDatabase2Row.getByRole('button', { name: 'Edit' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
       await page.getByLabel('name').fill(databaseColumnName3)
       const columnUpdateWait = createApiResponseWaiter(
         page,
@@ -473,6 +502,7 @@ test.describe('Database', () => {
       // wait for response + validate
       await columnUpdateWait
       await columnUpdateRefreshWait
+      await expect(page.getByRole('dialog')).not.toBeVisible()
 
       // delete table column
       const columnDatabase3Row = page.getByRole('row', { name: databaseColumnName3 })
diff --git a/e2e/studio/features/realtime-inspector.spec.ts b/e2e/studio/features/realtime-inspector.spec.ts
index 32a9a535aa877..1bb3d385189e6 100644
--- a/e2e/studio/features/realtime-inspector.spec.ts
+++ b/e2e/studio/features/realtime-inspector.spec.ts
@@ -15,6 +15,7 @@ import { test } from '../utils/test.js'
 test.describe('Realtime Inspector', () => {
   test.beforeEach(async ({ page, ref }) => {
     await navigateToRealtimeInspector(page, ref)
+    await page.waitForResponse(new RegExp(`/platform/projects/${ref}/settings`))
   })
 
   test.describe('Basic Inspector UI', () => {
diff --git a/e2e/studio/features/rls-policies.spec.ts b/e2e/studio/features/rls-policies.spec.ts
index 7b96a968f5886..172871895c5c8 100644
--- a/e2e/studio/features/rls-policies.spec.ts
+++ b/e2e/studio/features/rls-policies.spec.ts
@@ -3,7 +3,7 @@ import { expect, Page } from '@playwright/test'
 import { createTableWithRLS, dropTable } from '../utils/db/queries.js'
 import { test, withSetupCleanup } from '../utils/test.js'
 import { toUrl } from '../utils/to-url.js'
-import { createApiResponseWaiter, waitForApiResponse } from '../utils/wait-for-response.js'
+import { createApiResponseWaiter } from '../utils/wait-for-response.js'
 
 /**
  * Helper function to navigate to policies page and wait for it to load
@@ -15,39 +15,6 @@ const navigateToPoliciesPage = async (page: Page, ref: string) => {
   await page.waitForTimeout(500)
 }
 
-/**
- * Helper function to delete a policy if it exists
- */
-const deletePolicyIfExists = async (page: Page, ref: string, policyNameToDelete: string) => {
-  // Look for the policy in the table
-  const policyButton = page.getByRole('button', { name: policyNameToDelete })
-  const policyExists = (await policyButton.count()) > 0
-
-  if (policyExists) {
-    // Click the policy row actions button
-    await page.getByTestId(`policy-${policyNameToDelete}-actions-button`).click()
-    await page.waitForTimeout(200)
-
-    // Click delete
-    await page.getByText('Delete', { exact: true }).click()
-    await page.waitForTimeout(200)
-
-    const waitForDeletion = waitForApiResponse(page, 'pg-meta', ref, 'query?key=')
-    // Confirm deletion
-    await page.getByRole('button', { name: 'Delete' }).click()
-
-    // Wait for deletion to complete
-    await waitForDeletion
-
-    await expect(
-      page.getByText('Successfully removed policy'),
-      'Policy deletion confirmation should be visible'
-    ).toBeVisible({ timeout: 50000 })
-
-    await page.waitForTimeout(500)
-  }
-}
-
 test.describe('RLS Policies', () => {
   test.describe('Policies Page', () => {
     test('should display policies page correctly', async ({ page, ref }) => {
diff --git a/e2e/studio/utils/test.ts b/e2e/studio/utils/test.ts
index 0526336789741..3f1e75de231c1 100644
--- a/e2e/studio/utils/test.ts
+++ b/e2e/studio/utils/test.ts
@@ -26,6 +26,7 @@ export const test = base.extend<TestOptions>({
         `table-editor-queue-operations-banner-dismissed-${ref}`,
         JSON.stringify(true)
       )
+      localStorage.setItem(`terms-of-service-update-2026-06-06`, JSON.stringify(true))
     }, ref)
     await use(page)
   },