diff --git a/apps/docs/content/guides/database/extensions/postgis.mdx b/apps/docs/content/guides/database/extensions/postgis.mdx
index c5588a1b93fac..c338c1ac912b4 100644
--- a/apps/docs/content/guides/database/extensions/postgis.mdx
+++ b/apps/docs/content/guides/database/extensions/postgis.mdx
@@ -436,12 +436,6 @@ val data = supabase.postgrest.rpc(
 
 ## Troubleshooting
 
-<Admonition type="caution">
-
-The [official PostGIS documentation](https://postgis.net/documentation/tips/tip-move-postgis-schema/) for relocating the schema will cause issues for Supabase projects. These issues might not be apparent immediately but will eventually surface. To relocate your schema, use the following steps instead.
-
-</Admonition>
-
 As of PostGIS 2.3 or newer, the PostGIS extension is no longer relocatable from one schema to another. If you need to move it from one schema to another for any reason (e.g. from the public schema to the extensions schema for security reasons), you would normally run a ALTER EXTENSION to relocate the schema. However, you will now to do the following steps:
 
 1. Backup your Database to prevent data loss - You can do this through the [CLI](https://supabase.com/docs/reference/cli/supabase-db-dump) or Postgres backup tools such as [pg_dumpall](https://www.postgresql.org/docs/current/backup-dump.html#BACKUP-DUMP-ALL)
@@ -452,6 +446,28 @@ As of PostGIS 2.3 or newer, the PostGIS extension is no longer relocatable from
 
 4. Restore dropped data via the Backup if necessary from step 1 with your tool of choice.
 
+Alternatively, you can contact the [Supabase Support Team](https://supabase.com/dashboard/support/new) and ask them to run the following SQL on your instance:
+
+```sql
+BEGIN;
+	UPDATE pg_extension
+	  SET extrelocatable = true
+	WHERE extname = 'postgis';
+
+	ALTER EXTENSION postgis
+	  SET SCHEMA extensions;
+
+	ALTER EXTENSION postgis
+	  UPDATE TO "<POSTGIS_VERSION>next";
+
+	ALTER EXTENSION postgis UPDATE;
+
+	UPDATE pg_extension
+	  SET extrelocatable = false
+	WHERE extname = 'postgis';
+COMMIT;
+```
+
 ## Resources
 
 - [Official PostGIS documentation](https://postgis.net/documentation/)
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
index 04386674eeb7f..5e693553554be 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
@@ -1,3 +1,4 @@
+import Link from 'next/link'
 import { useEffect, useState } from 'react'
 import { toast } from 'sonner'
 
@@ -6,24 +7,22 @@ import Table from 'components/to-be-cleaned/Table'
 import AlertError from 'components/ui/AlertError'
 import { useDeleteDestinationMutation } from 'data/replication/delete-destination-mutation'
 import { useReplicationPipelineStatusQuery } from 'data/replication/pipeline-status-query'
-import { ReplicationPipelinesData } from 'data/replication/pipelines-query'
+import { Pipeline } from 'data/replication/pipelines-query'
 import { useStopPipelineMutation } from 'data/replication/stop-pipeline-mutation'
 import {
   PipelineStatusRequestStatus,
   usePipelineRequestStatus,
 } from 'state/replication-pipeline-request-status'
 import { ResponseError } from 'types'
+import { Button } from 'ui'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
 import DeleteDestination from './DeleteDestination'
 import DestinationPanel from './DestinationPanel'
 import { getStatusName, PIPELINE_ERROR_MESSAGES } from './Pipeline.utils'
 import { PipelineStatus, PipelineStatusName } from './PipelineStatus'
+import { STATUS_REFRESH_FREQUENCY_MS } from './Replication.constants'
 import { RowMenu } from './RowMenu'
 
-export type Pipeline = ReplicationPipelinesData['pipelines'][0]
-
-const refreshFrequencyMs: number = 2000
-
 interface DestinationRowProps {
   sourceId: number | undefined
   destinationId: number
@@ -34,7 +33,6 @@ interface DestinationRowProps {
   isLoading: boolean
   isError: boolean
   isSuccess: boolean
-  onSelectPipeline?: (pipelineId: number, destinationName: string) => void
 }
 
 export const DestinationRow = ({
@@ -47,7 +45,6 @@ export const DestinationRow = ({
   isLoading: isPipelineLoading,
   isError: isPipelineError,
   isSuccess: isPipelineSuccess,
-  onSelectPipeline,
 }: DestinationRowProps) => {
   const { ref: projectRef } = useParams()
   const [showDeleteDestinationForm, setShowDeleteDestinationForm] = useState(false)
@@ -64,7 +61,7 @@ export const DestinationRow = ({
       projectRef,
       pipelineId: pipeline?.id,
     },
-    { refetchInterval: refreshFrequencyMs }
+    { refetchInterval: STATUS_REFRESH_FREQUENCY_MS }
   )
   const { getRequestStatus, updatePipelineStatus } = usePipelineRequestStatus()
   const requestStatus = pipeline?.id
@@ -107,12 +104,7 @@ export const DestinationRow = ({
         <AlertError error={pipelineError} subject={PIPELINE_ERROR_MESSAGES.RETRIEVE_PIPELINE} />
       )}
       {isPipelineSuccess && (
-        <Table.tr
-          className="hover:!bg-surface-200 transition"
-          onClick={() => {
-            if (pipeline) onSelectPipeline?.(pipeline.id, destinationName)
-          }}
-        >
+        <Table.tr>
           <Table.td>{isPipelineLoading ? <ShimmeringLoader /> : destinationName}</Table.td>
           <Table.td>{isPipelineLoading ? <ShimmeringLoader /> : type}</Table.td>
           <Table.td>
@@ -138,6 +130,11 @@ export const DestinationRow = ({
           </Table.td>
           <Table.td>
             <div className="flex items-center justify-end gap-x-2">
+              <Button asChild type="default">
+                <Link href={`/project/${projectRef}/database/replication/${pipeline?.id}`}>
+                  View status
+                </Link>
+              </Button>
               <RowMenu
                 pipeline={pipeline}
                 pipelineStatus={pipelineStatusData?.status}
diff --git a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx b/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
index 8d384e7840de9..2a408954c52e3 100644
--- a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
@@ -1,4 +1,3 @@
-import { noop } from 'lodash'
 import { Plus, Search } from 'lucide-react'
 import { useState } from 'react'
 
@@ -14,11 +13,7 @@ import NewDestinationPanel from './DestinationPanel'
 import { DestinationRow } from './DestinationRow'
 import { PIPELINE_ERROR_MESSAGES } from './Pipeline.utils'
 
-interface DestinationsProps {
-  onSelectPipeline?: (pipelineId: number, destinationName: string) => void
-}
-
-export const Destinations = ({ onSelectPipeline = noop }: DestinationsProps) => {
+export const Destinations = () => {
   const [showNewDestinationPanel, setShowNewDestinationPanel] = useState(false)
   const [filterString, setFilterString] = useState<string>('')
   const { ref: projectRef } = useParams()
@@ -122,7 +117,6 @@ export const Destinations = ({ onSelectPipeline = noop }: DestinationsProps) =>
                   isLoading={isPipelinesLoading}
                   isError={isPipelinesError}
                   isSuccess={isPipelinesSuccess}
-                  onSelectPipeline={onSelectPipeline}
                 />
               )
             })}
diff --git a/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts b/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts
new file mode 100644
index 0000000000000..273adac9f5bf6
--- /dev/null
+++ b/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts
@@ -0,0 +1 @@
+export const STATUS_REFRESH_FREQUENCY_MS: number = 5000
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus.tsx b/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus.tsx
index 24d41862f06be..29ccd56c33392 100644
--- a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus.tsx
@@ -20,23 +20,15 @@ import { Badge, Button, cn, copyToClipboard, Input_Shadcn_ } from 'ui'
 import { GenericSkeletonLoader } from 'ui-patterns'
 import { getStatusName, PIPELINE_ERROR_MESSAGES } from './Pipeline.utils'
 import { PipelineStatus } from './PipelineStatus'
+import { STATUS_REFRESH_FREQUENCY_MS } from './Replication.constants'
 import { TableState } from './ReplicationPipelineStatus.types'
 import { getDisabledStateConfig, getStatusConfig } from './ReplicationPipelineStatus.utils'
 
-interface ReplicationPipelineStatusProps {
-  pipelineId: number
-  destinationName?: string
-  onSelectBack: () => void
-}
-
-export const ReplicationPipelineStatus = ({
-  pipelineId,
-  destinationName,
-  onSelectBack,
-}: ReplicationPipelineStatusProps) => {
-  const { ref: projectRef } = useParams()
+export const ReplicationPipelineStatus = () => {
+  const { ref: projectRef, pipelineId: _pipelineId } = useParams()
   const [filterString, setFilterString] = useState<string>('')
 
+  const pipelineId = Number(_pipelineId)
   const { getRequestStatus, updatePipelineStatus, setRequestStatus } = usePipelineRequestStatus()
   const requestStatus = getRequestStatus(pipelineId)
 
@@ -60,7 +52,7 @@ export const ReplicationPipelineStatus = ({
     { projectRef, pipelineId },
     {
       enabled: !!pipelineId,
-      refetchInterval: 2000, // Poll every 2 seconds
+      refetchInterval: STATUS_REFRESH_FREQUENCY_MS,
     }
   )
 
@@ -73,13 +65,14 @@ export const ReplicationPipelineStatus = ({
     { projectRef, pipelineId },
     {
       enabled: !!pipelineId,
-      refetchInterval: 2000, // Poll every 2 seconds
+      refetchInterval: STATUS_REFRESH_FREQUENCY_MS,
     }
   )
 
   const { mutateAsync: startPipeline, isLoading: isStartingPipeline } = useStartPipelineMutation()
   const { mutateAsync: stopPipeline, isLoading: isStoppingPipeline } = useStopPipelineMutation()
 
+  const destinationName = pipeline?.destination_name
   const statusName = getStatusName(pipelineStatusData?.status)
   const config = getDisabledStateConfig({ requestStatus, statusName })
 
@@ -138,36 +131,13 @@ export const ReplicationPipelineStatus = ({
     updatePipelineStatus(pipelineId, statusName)
   }, [pipelineId, statusName, updatePipelineStatus])
 
-  if (isPipelineError) {
-    return (
-      <div className="flex flex-col gap-y-4">
-        <div className="flex items-center justify-between">
-          <div className="flex items-center gap-x-3">
-            <Button
-              type="outline"
-              onClick={onSelectBack}
-              icon={<ChevronLeft />}
-              style={{ padding: '5px' }}
-            />
-            <h3 className="text-xl font-semibold">Pipeline Status</h3>
-          </div>
-        </div>
-        <AlertError error={pipelineError} subject={PIPELINE_ERROR_MESSAGES.RETRIEVE_PIPELINE} />
-      </div>
-    )
-  }
-
   return (
     <div className="space-y-4">
-      {/* Header with back button and filters */}
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-x-3">
-          <Button
-            type="outline"
-            onClick={onSelectBack}
-            icon={<ChevronLeft />}
-            style={{ padding: '5px' }}
-          />
+          <Button asChild type="outline" icon={<ChevronLeft />} style={{ padding: '5px' }}>
+            <Link href={`/project/${projectRef}/database/replication`} />
+          </Button>
           <div>
             <div className="flex items-center gap-x-3">
               <h3 className="text-xl font-semibold">{destinationName || 'Pipeline'}</h3>
@@ -192,13 +162,14 @@ export const ReplicationPipelineStatus = ({
               className="pl-7 h-[26px] text-xs"
               placeholder="Search for tables"
               value={filterString}
+              disabled={isPipelineError}
               onChange={(e) => setFilterString(e.target.value)}
             />
           </div>
           <Button
             type={statusName === 'stopped' ? 'primary' : 'default'}
             onClick={() => onTogglePipeline()}
-            loading={isStartingPipeline || isStoppingPipeline}
+            loading={isPipelineError || isStartingPipeline || isStoppingPipeline}
             disabled={!['failed', 'started', 'stopped'].includes(statusName ?? '')}
           >
             {statusName === 'stopped' ? 'Enable' : 'Disable'} pipeline
@@ -208,6 +179,10 @@ export const ReplicationPipelineStatus = ({
 
       {(isPipelineLoading || isStatusLoading) && <GenericSkeletonLoader />}
 
+      {isPipelineError && (
+        <AlertError error={pipelineError} subject={PIPELINE_ERROR_MESSAGES.RETRIEVE_PIPELINE} />
+      )}
+
       {isStatusError && (
         <AlertError
           error={statusError}
diff --git a/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx b/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
index ccd49c4b520ac..ae5734b2e9c1c 100644
--- a/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
@@ -3,6 +3,7 @@ import { toast } from 'sonner'
 
 import { useParams } from 'common'
 import AlertError from 'components/ui/AlertError'
+import { Pipeline } from 'data/replication/pipelines-query'
 import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
 import { useStopPipelineMutation } from 'data/replication/stop-pipeline-mutation'
 import {
@@ -19,7 +20,6 @@ import {
   DropdownMenuTrigger,
 } from 'ui'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
-import { Pipeline } from './DestinationRow'
 import { PIPELINE_ERROR_MESSAGES } from './Pipeline.utils'
 import { PipelineStatusName } from './PipelineStatus'
 
@@ -103,55 +103,26 @@ export const RowMenu = ({
 
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
-          <Button
-            type="default"
-            className="px-1.5"
-            icon={<MoreVertical />}
-            onClick={(e) => e.stopPropagation()}
-          />
+          <Button type="default" className="px-1.5" icon={<MoreVertical />} />
         </DropdownMenuTrigger>
         <DropdownMenuContent side="bottom" align="end" className="w-52">
           {pipelineEnabled ? (
-            <DropdownMenuItem
-              className="space-x-2"
-              onClick={(e) => {
-                e.stopPropagation()
-                onDisablePipeline()
-              }}
-            >
+            <DropdownMenuItem className="space-x-2" onClick={onDisablePipeline}>
               <Pause size={14} />
               <p>Disable pipeline</p>
             </DropdownMenuItem>
           ) : (
-            <DropdownMenuItem
-              className="space-x-2"
-              onClick={(e) => {
-                e.stopPropagation()
-                onEnablePipeline()
-              }}
-            >
+            <DropdownMenuItem className="space-x-2" onClick={onEnablePipeline}>
               <Play size={14} />
               <p>Enable pipeline</p>
             </DropdownMenuItem>
           )}
           <DropdownMenuSeparator />
-          <DropdownMenuItem
-            className="space-x-2"
-            onClick={(e) => {
-              e.stopPropagation()
-              onEditClick()
-            }}
-          >
+          <DropdownMenuItem className="space-x-2" onClick={onEditClick}>
             <Edit size={14} />
             <p>Edit destination</p>
           </DropdownMenuItem>
-          <DropdownMenuItem
-            className="space-x-2"
-            onClick={(e) => {
-              e.stopPropagation()
-              onDeleteClick()
-            }}
-          >
+          <DropdownMenuItem className="space-x-2" onClick={onDeleteClick}>
             <Trash stroke="red" size={14} />
             <p>Delete destination</p>
           </DropdownMenuItem>
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails.tsx
index 94ada25c2d21e..248f01eed91a0 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails.tsx
@@ -1,6 +1,8 @@
 import { OAuthScope } from '@supabase/shared-types/out/constants'
 import { Check } from 'lucide-react'
 
+import { PERMISSIONS_DESCRIPTIONS } from './OAuthApps.constants'
+
 export interface AuthorizeRequesterDetailsProps {
   icon: string | null
   name: string
@@ -48,7 +50,7 @@ export const ScopeSection = ({
   return null
 }
 
-const AuthorizeRequesterDetails = ({
+export const AuthorizeRequesterDetails = ({
   icon,
   name,
   domain,
@@ -79,57 +81,57 @@ const AuthorizeRequesterDetails = ({
         </p>
         <div className="pt-2">
           <ScopeSection
-            description="access to analytics logs."
+            description={PERMISSIONS_DESCRIPTIONS.ANALYTICS}
             hasReadScope={scopes.includes(OAuthScope.ANALYTICS_READ)}
             hasWriteScope={scopes.includes(OAuthScope.ANALYTICS_WRITE)}
           />
           <ScopeSection
-            description="access to auth configurations and SSO providers."
+            description={PERMISSIONS_DESCRIPTIONS.AUTH}
             hasReadScope={scopes.includes(OAuthScope.AUTH_READ)}
             hasWriteScope={scopes.includes(OAuthScope.AUTH_WRITE)}
           />
           <ScopeSection
-            description="access to Postgres configurations, SQL snippets, SSL enforcement configurations and Typescript schema types."
+            description={PERMISSIONS_DESCRIPTIONS.DATABASE}
             hasReadScope={scopes.includes(OAuthScope.DATABASE_READ)}
             hasWriteScope={scopes.includes(OAuthScope.DATABASE_WRITE)}
           />
           <ScopeSection
-            description="access to custom domains and vanity subdomains."
+            description={PERMISSIONS_DESCRIPTIONS.DOMAINS}
             hasReadScope={scopes.includes(OAuthScope.DOMAINS_READ)}
             hasWriteScope={scopes.includes(OAuthScope.DOMAINS_WRITE)}
           />
           <ScopeSection
-            description="access to edge functions."
+            description={PERMISSIONS_DESCRIPTIONS.EDGE_FUNCTIONS}
             hasReadScope={scopes.includes(OAuthScope.EDGE_FUNCTIONS_READ)}
             hasWriteScope={scopes.includes(OAuthScope.EDGE_FUNCTIONS_WRITE)}
           />
           <ScopeSection
-            description="access to environments/branches."
+            description={PERMISSIONS_DESCRIPTIONS.ENVIRONMENT}
             hasReadScope={scopes.includes(OAuthScope.ENVIRONMENT_READ)}
             hasWriteScope={scopes.includes(OAuthScope.ENVIRONMENT_WRITE)}
           />
           <ScopeSection
-            description="access to the organization and all its members."
+            description={PERMISSIONS_DESCRIPTIONS.ORGANIZATIONS}
             hasReadScope={scopes.includes(OAuthScope.ORGANIZATIONS_READ)}
             hasWriteScope={scopes.includes(OAuthScope.ORGANIZATIONS_WRITE)}
           />
           <ScopeSection
-            description="access to metadata, its upgrade status, network restrictions and network bans."
+            description={PERMISSIONS_DESCRIPTIONS.PROJECTS}
             hasReadScope={scopes.includes(OAuthScope.PROJECTS_READ)}
             hasWriteScope={scopes.includes(OAuthScope.PROJECTS_WRITE)}
           />
           <ScopeSection
-            description="access to PostgREST configurations."
+            description={PERMISSIONS_DESCRIPTIONS.REST}
             hasReadScope={scopes.includes(OAuthScope.REST_READ)}
             hasWriteScope={scopes.includes(OAuthScope.REST_WRITE)}
           />
           <ScopeSection
-            description="access to API keys, secrets and pgsodium configurations."
+            description={PERMISSIONS_DESCRIPTIONS.SECRETS}
             hasReadScope={scopes.includes(OAuthScope.SECRETS_READ)}
             hasWriteScope={scopes.includes(OAuthScope.SECRETS_WRITE)}
           />
           <ScopeSection
-            description="access to storage buckets and files."
+            description={PERMISSIONS_DESCRIPTIONS.STORAGE}
             hasReadScope={scopes.includes(OAuthScope.STORAGE_READ)}
             hasWriteScope={scopes.includes(OAuthScope.STORAGE_WRITE)}
           />
@@ -138,5 +140,3 @@ const AuthorizeRequesterDetails = ({
     </div>
   )
 }
-
-export default AuthorizeRequesterDetails
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.constants.ts b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.constants.ts
new file mode 100644
index 0000000000000..6fdc47c25474d
--- /dev/null
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.constants.ts
@@ -0,0 +1,15 @@
+export const PERMISSIONS_DESCRIPTIONS = {
+  ANALYTICS: 'access to analytics logs.',
+  AUTH: 'access to auth configurations and SSO providers.',
+  DATABASE:
+    'access to Postgres configurations, SQL snippets, SSL enforcement configurations and Typescript schema types.',
+  DOMAINS: 'access to custom domains and vanity subdomains.',
+  EDGE_FUNCTIONS: 'access to edge functions.',
+  ENVIRONMENT: 'access to environments/branches.',
+  ORGANIZATIONS: 'access to the organization and all its members.',
+  PROJECTS:
+    "access to creation and deletion of projects, each project's metadata, upgrade status, network restrictions and network bans.",
+  REST: 'access to PostgREST configurations.',
+  SECRETS: 'access to API keys, secrets and pgsodium configurations.',
+  STORAGE: 'access to storage buckets and files.',
+}
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx
index f17a280cde7d5..20717de9729c3 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx
@@ -74,6 +74,14 @@ export const SecretRow = ({ secret, appId }: SecretRowProps) => {
               <p className="text-sm text-foreground-lighter">
                 Added {isNew ? 'now' : dayjs(secret.created_at).fromNow()} by {generatedByName}
               </p>
+              {secret.last_used_at && (
+                <p className="text-sm text-foreground-lighter">
+                  Last used {dayjs(secret.last_used_at).fromNow()}
+                </p>
+              )}
+              {!secret.last_used_at && !isNew && (
+                <p className="text-sm text-foreground-lighter">Never used</p>
+              )}
             </div>
           </div>
         </div>
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/Scopes.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/Scopes.tsx
index 1dc9e366a5d36..7466baa694db0 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/Scopes.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/Scopes.tsx
@@ -11,6 +11,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from 'ui'
+import { PERMISSIONS_DESCRIPTIONS } from '../OAuthApps.constants'
 
 const ScopeDropdownCheckboxItem = ({
   children,
@@ -66,12 +67,12 @@ const Scope = ({
 
   return (
     <div
-      className="flex flex-row justify-between p-4 border first:rounded-t last:rounded-b"
+      className="flex flex-row justify-between p-4 border first:rounded-t last:rounded-b gap-x-2"
       key={title}
     >
       <div className="flex flex-col">
         <span className="text-foreground text-sm">{title}</span>
-        <span className="text-foreground-light text-xs">{description}</span>
+        <span className="text-foreground-light text-xs capitalize-sentence">{description}</span>
       </div>
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
@@ -109,7 +110,7 @@ export const ScopesPanel = ({
     <div className="-space-y-px">
       <Scope
         title="Analytics"
-        description="Analytics logs."
+        description={PERMISSIONS_DESCRIPTIONS.ANALYTICS}
         readScopeName={OAuthScope.ANALYTICS_READ}
         writeScopeName={OAuthScope.ANALYTICS_WRITE}
         scopes={scopes}
@@ -117,7 +118,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Auth"
-        description="Auth configurations and SSO providers."
+        description={PERMISSIONS_DESCRIPTIONS.AUTH}
         readScopeName={OAuthScope.AUTH_READ}
         writeScopeName={OAuthScope.AUTH_WRITE}
         scopes={scopes}
@@ -125,7 +126,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Database"
-        description="Postgres configurations, SQL snippets, SSL enforcement configurations and Typescript schema types."
+        description={PERMISSIONS_DESCRIPTIONS.DATABASE}
         readScopeName={OAuthScope.DATABASE_READ}
         writeScopeName={OAuthScope.DATABASE_WRITE}
         scopes={scopes}
@@ -133,7 +134,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Domains"
-        description="Custom domains and vanity subdomains."
+        description={PERMISSIONS_DESCRIPTIONS.DOMAINS}
         readScopeName={OAuthScope.DOMAINS_READ}
         writeScopeName={OAuthScope.DOMAINS_WRITE}
         scopes={scopes}
@@ -141,7 +142,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Edge Functions"
-        description="Edge functions."
+        description={PERMISSIONS_DESCRIPTIONS.EDGE_FUNCTIONS}
         readScopeName={OAuthScope.EDGE_FUNCTIONS_READ}
         writeScopeName={OAuthScope.EDGE_FUNCTIONS_WRITE}
         scopes={scopes}
@@ -149,7 +150,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Environment"
-        description="Environments/branches."
+        description={PERMISSIONS_DESCRIPTIONS.ENVIRONMENT}
         readScopeName={OAuthScope.ENVIRONMENT_READ}
         writeScopeName={OAuthScope.ENVIRONMENT_WRITE}
         scopes={scopes}
@@ -157,7 +158,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Organizations"
-        description="Organizations and all its members."
+        description={PERMISSIONS_DESCRIPTIONS.ORGANIZATIONS}
         readScopeName={OAuthScope.ORGANIZATIONS_READ}
         writeScopeName={OAuthScope.ORGANIZATIONS_WRITE}
         scopes={scopes}
@@ -165,7 +166,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Projects"
-        description="Metadata, upgrade status, network restrictions and network bans."
+        description={PERMISSIONS_DESCRIPTIONS.PROJECTS}
         readScopeName={OAuthScope.PROJECTS_READ}
         writeScopeName={OAuthScope.PROJECTS_WRITE}
         scopes={scopes}
@@ -173,7 +174,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="REST"
-        description="PostgREST configurations."
+        description={PERMISSIONS_DESCRIPTIONS.REST}
         readScopeName={OAuthScope.REST_READ}
         writeScopeName={OAuthScope.REST_WRITE}
         scopes={scopes}
@@ -181,7 +182,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Secrets"
-        description="API keys, secrets and pgsodium configurations."
+        description={PERMISSIONS_DESCRIPTIONS.SECRETS}
         readScopeName={OAuthScope.SECRETS_READ}
         writeScopeName={OAuthScope.SECRETS_WRITE}
         scopes={scopes}
@@ -189,7 +190,7 @@ export const ScopesPanel = ({
       />
       <Scope
         title="Storage"
-        description="Storage buckets and files."
+        description={PERMISSIONS_DESCRIPTIONS.STORAGE}
         readScopeName={OAuthScope.STORAGE_READ}
         writeScopeName={OAuthScope.STORAGE_WRITE}
         scopes={scopes}
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx
index 81c278cce61bb..3da2460784681 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx
@@ -26,7 +26,7 @@ import {
   SidePanel,
   cn,
 } from 'ui'
-import AuthorizeRequesterDetails from '../AuthorizeRequesterDetails'
+import { AuthorizeRequesterDetails } from '../AuthorizeRequesterDetails'
 import { OAuthSecrets } from '../OAuthSecrets/OAuthSecrets'
 import { ScopesPanel } from './Scopes'
 
diff --git a/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx b/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx
index 1e4910b0f2695..65afd2049be2f 100644
--- a/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx
+++ b/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx
@@ -1,10 +1,10 @@
 import { OAuthScope } from '@supabase/shared-types/out/constants'
+import { useQueryClient } from '@tanstack/react-query'
 import { CheckCircle2, ChevronRight, ChevronsLeftRight } from 'lucide-react'
 import Image from 'next/image'
 import { useRouter } from 'next/router'
 import { toast } from 'sonner'
 
-import { useQueryClient } from '@tanstack/react-query'
 import { useParams } from 'common'
 import { useApiAuthorizationApproveMutation } from 'data/api-authorization/api-authorization-approve-mutation'
 import { ApiAuthorizationResponse } from 'data/api-authorization/api-authorization-query'
@@ -22,6 +22,7 @@ import {
 } from 'ui'
 import { Admonition } from 'ui-patterns/admonition'
 import { ScopeSection } from '../OAuthApps/AuthorizeRequesterDetails'
+import { PERMISSIONS_DESCRIPTIONS } from '../OAuthApps/OAuthApps.constants'
 import { ProjectClaimLayout } from './layout'
 
 export const ProjectClaimConfirm = ({
@@ -188,57 +189,57 @@ export const ProjectClaimConfirm = ({
               >
                 <div>
                   <ScopeSection
-                    description="access to analytics logs."
+                    description={PERMISSIONS_DESCRIPTIONS.ANALYTICS}
                     hasReadScope={requester.scopes.includes(OAuthScope.ANALYTICS_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.ANALYTICS_WRITE)}
                   />
                   <ScopeSection
-                    description="access to auth configurations and SSO providers."
+                    description={PERMISSIONS_DESCRIPTIONS.AUTH}
                     hasReadScope={requester.scopes.includes(OAuthScope.AUTH_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.AUTH_WRITE)}
                   />
                   <ScopeSection
-                    description="access to Postgres configurations, SQL snippets, SSL enforcement configurations and Typescript schema types."
+                    description={PERMISSIONS_DESCRIPTIONS.DATABASE}
                     hasReadScope={requester.scopes.includes(OAuthScope.DATABASE_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.DATABASE_WRITE)}
                   />
                   <ScopeSection
-                    description="access to custom domains and vanity subdomains."
+                    description={PERMISSIONS_DESCRIPTIONS.DOMAINS}
                     hasReadScope={requester.scopes.includes(OAuthScope.DOMAINS_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.DOMAINS_WRITE)}
                   />
                   <ScopeSection
-                    description="access to edge functions."
+                    description={PERMISSIONS_DESCRIPTIONS.EDGE_FUNCTIONS}
                     hasReadScope={requester.scopes.includes(OAuthScope.EDGE_FUNCTIONS_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.EDGE_FUNCTIONS_WRITE)}
                   />
                   <ScopeSection
-                    description="access to environments/branches."
+                    description={PERMISSIONS_DESCRIPTIONS.ENVIRONMENT}
                     hasReadScope={requester.scopes.includes(OAuthScope.ENVIRONMENT_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.ENVIRONMENT_WRITE)}
                   />
                   <ScopeSection
-                    description="access to the organization and all its members."
+                    description={PERMISSIONS_DESCRIPTIONS.ORGANIZATIONS}
                     hasReadScope={requester.scopes.includes(OAuthScope.ORGANIZATIONS_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.ORGANIZATIONS_WRITE)}
                   />
                   <ScopeSection
-                    description="access to metadata, its upgrade status, network restrictions and network bans."
+                    description={PERMISSIONS_DESCRIPTIONS.PROJECTS}
                     hasReadScope={requester.scopes.includes(OAuthScope.PROJECTS_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.PROJECTS_WRITE)}
                   />
                   <ScopeSection
-                    description="access to PostgREST configurations."
+                    description={PERMISSIONS_DESCRIPTIONS.REST}
                     hasReadScope={requester.scopes.includes(OAuthScope.REST_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.REST_WRITE)}
                   />
                   <ScopeSection
-                    description="access to API keys, secrets and pgsodium configurations."
+                    description={PERMISSIONS_DESCRIPTIONS.SECRETS}
                     hasReadScope={requester.scopes.includes(OAuthScope.SECRETS_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.SECRETS_WRITE)}
                   />
                   <ScopeSection
-                    description="access to storage buckets and files."
+                    description={PERMISSIONS_DESCRIPTIONS.STORAGE}
                     hasReadScope={requester.scopes.includes(OAuthScope.STORAGE_READ)}
                     hasWriteScope={requester.scopes.includes(OAuthScope.STORAGE_WRITE)}
                   />
diff --git a/apps/studio/data/replication/pipelines-query.ts b/apps/studio/data/replication/pipelines-query.ts
index 6e09e1cc409a9..82d0117f080f0 100644
--- a/apps/studio/data/replication/pipelines-query.ts
+++ b/apps/studio/data/replication/pipelines-query.ts
@@ -24,6 +24,7 @@ async function fetchReplicationPipelines(
 }
 
 export type ReplicationPipelinesData = Awaited<ReturnType<typeof fetchReplicationPipelines>>
+export type Pipeline = ReplicationPipelinesData['pipelines'][0]
 
 export const useReplicationPipelinesQuery = <TData = ReplicationPipelinesData>(
   { projectRef }: ReplicationPipelinesParams,
diff --git a/apps/studio/pages/authorize.tsx b/apps/studio/pages/authorize.tsx
index 70ebd6c5e4750..8e56592aadbf3 100644
--- a/apps/studio/pages/authorize.tsx
+++ b/apps/studio/pages/authorize.tsx
@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
-import AuthorizeRequesterDetails from 'components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails'
+import { AuthorizeRequesterDetails } from 'components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails'
 import APIAuthorizationLayout from 'components/layouts/APIAuthorizationLayout'
 import { FormPanel } from 'components/ui/Forms/FormPanel'
 import ShimmeringLoader from 'components/ui/ShimmeringLoader'
diff --git a/apps/studio/pages/project/[ref]/database/replication/[pipelineId].tsx b/apps/studio/pages/project/[ref]/database/replication/[pipelineId].tsx
new file mode 100644
index 0000000000000..2e45d0d18789b
--- /dev/null
+++ b/apps/studio/pages/project/[ref]/database/replication/[pipelineId].tsx
@@ -0,0 +1,50 @@
+import { useRouter } from 'next/router'
+import { useContext, useEffect } from 'react'
+
+import { FeatureFlagContext, useParams } from 'common'
+import { ReplicationPipelineStatus } from 'components/interfaces/Database/Replication/ReplicationPipelineStatus'
+import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'
+import DefaultLayout from 'components/layouts/DefaultLayout'
+import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'
+import { FormHeader } from 'components/ui/Forms/FormHeader'
+import { useFlag } from 'hooks/ui/useFlag'
+import { PipelineRequestStatusProvider } from 'state/replication-pipeline-request-status'
+import type { NextPageWithLayout } from 'types'
+
+const DatabaseReplicationPage: NextPageWithLayout = () => {
+  const router = useRouter()
+  const { ref } = useParams()
+  const { hasLoaded } = useContext(FeatureFlagContext)
+  const enablePgReplicate = useFlag('enablePgReplicate')
+
+  useEffect(() => {
+    if (hasLoaded && !enablePgReplicate) {
+      router.replace(`/project/${ref}/database/replication}`)
+    }
+  }, [router, hasLoaded, ref, enablePgReplicate])
+
+  return (
+    <>
+      {enablePgReplicate && (
+        <PipelineRequestStatusProvider>
+          <ScaffoldContainer>
+            <ScaffoldSection>
+              <div className="col-span-12">
+                <FormHeader title="Replication" />
+                <ReplicationPipelineStatus />
+              </div>
+            </ScaffoldSection>
+          </ScaffoldContainer>
+        </PipelineRequestStatusProvider>
+      )}
+    </>
+  )
+}
+
+DatabaseReplicationPage.getLayout = (page) => (
+  <DefaultLayout>
+    <DatabaseLayout title="Database Replication">{page}</DatabaseLayout>
+  </DefaultLayout>
+)
+
+export default DatabaseReplicationPage
diff --git a/apps/studio/pages/project/[ref]/database/replication/index.tsx b/apps/studio/pages/project/[ref]/database/replication/index.tsx
index bc1a2a5445ac4..9fb8b9a2287df 100644
--- a/apps/studio/pages/project/[ref]/database/replication/index.tsx
+++ b/apps/studio/pages/project/[ref]/database/replication/index.tsx
@@ -1,8 +1,5 @@
-import { useState } from 'react'
-
 import { ReplicationComingSoon } from 'components/interfaces/Database/Replication/ComingSoon'
 import { Destinations } from 'components/interfaces/Database/Replication/Destinations'
-import { ReplicationPipelineStatus } from 'components/interfaces/Database/Replication/ReplicationPipelineStatus'
 import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'
@@ -13,22 +10,6 @@ import type { NextPageWithLayout } from 'types'
 
 const DatabaseReplicationPage: NextPageWithLayout = () => {
   const enablePgReplicate = useFlag('enablePgReplicate')
-  const [selectedPipelineId, setSelectedPipelineId] = useState<number>()
-  const [selectedDestinationName, setSelectedDestinationName] = useState<string>()
-
-  // [Joshen] Ideally selecting a pipeline should be a route on its own with pipelineId as the param
-  // e.g /project/ref/database/replication/[pipelineId]
-  // Can destinationName be derived from pipeline ID or something?
-
-  const handleSelectPipeline = (pipelineId: number, destinationName: string) => {
-    setSelectedPipelineId(pipelineId)
-    setSelectedDestinationName(destinationName)
-  }
-
-  const handleSelectBack = () => {
-    setSelectedPipelineId(undefined)
-    setSelectedDestinationName(undefined)
-  }
 
   return (
     <>
@@ -38,15 +19,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
             <ScaffoldSection>
               <div className="col-span-12">
                 <FormHeader title="Replication" />
-                {selectedPipelineId === undefined ? (
-                  <Destinations onSelectPipeline={handleSelectPipeline} />
-                ) : (
-                  <ReplicationPipelineStatus
-                    pipelineId={selectedPipelineId}
-                    destinationName={selectedDestinationName}
-                    onSelectBack={handleSelectBack}
-                  />
-                )}
+                <Destinations />
               </div>
             </ScaffoldSection>
           </ScaffoldContainer>