diff --git a/apps/desktop/src/calendar/components/oauth/provider-content.tsx b/apps/desktop/src/calendar/components/oauth/provider-content.tsx
index d94c907953..34bc5d07ce 100644
--- a/apps/desktop/src/calendar/components/oauth/provider-content.tsx
+++ b/apps/desktop/src/calendar/components/oauth/provider-content.tsx
@@ -17,12 +17,14 @@ import { useAuth } from "~/auth";
 import { useBillingAccess } from "~/auth/billing";
 import { useConnections } from "~/auth/useConnections";
 import type { CalendarProvider } from "~/calendar/components/shared";
-import { openIntegrationUrl } from "~/shared/integration";
+import { useOAuthFlow } from "~/shared/hooks/useOAuthFlow";
+import { buildIntegrationUrl } from "~/shared/integration";
 
 export function OAuthProviderContent({ config }: { config: CalendarProvider }) {
   const auth = useAuth();
   const { isPro, upgradeToPro } = useBillingAccess();
   const { data: connections, isError } = useConnections(isPro);
+  const { start: startOAuthFlow } = useOAuthFlow();
   const providerConnections = useMemo(
     () =>
       connections?.filter(
@@ -31,16 +33,20 @@ export function OAuthProviderContent({ config }: { config: CalendarProvider }) {
     [connections, config.nangoIntegrationId],
   );
 
-  const handleAddAccount = useCallback(
-    () =>
-      openIntegrationUrl(
-        config.nangoIntegrationId,
-        undefined,
-        "connect",
-        "calendar",
-      ),
-    [config.nangoIntegrationId],
-  );
+  const handleAddAccount = useCallback(async () => {
+    const url = await buildIntegrationUrl(
+      config.nangoIntegrationId,
+      undefined,
+      "connect",
+      "calendar",
+    );
+    if (!url) return;
+    await startOAuthFlow({
+      url,
+      title: `Connect ${config.displayName} Calendar`,
+      description: `Complete the connection in your browser, then return to Char.`,
+    });
+  }, [config.nangoIntegrationId, config.displayName, startOAuthFlow]);
 
   if (!auth.session) {
     return (
@@ -86,22 +92,34 @@ export function OAuthProviderContent({ config }: { config: CalendarProvider }) {
           <ReconnectRequiredContent
             key={connection.connection_id}
             config={config}
-            onReconnect={() =>
-              openIntegrationUrl(
+            onReconnect={async () => {
+              const url = await buildIntegrationUrl(
                 config.nangoIntegrationId,
                 connection.connection_id,
                 "reconnect",
                 "calendar",
-              )
-            }
-            onDisconnect={() =>
-              openIntegrationUrl(
+              );
+              if (!url) return;
+              await startOAuthFlow({
+                url,
+                title: `Reconnect ${config.displayName} Calendar`,
+                description: `Complete the reconnection in your browser, then return to Char.`,
+              });
+            }}
+            onDisconnect={async () => {
+              const url = await buildIntegrationUrl(
                 config.nangoIntegrationId,
                 connection.connection_id,
                 "disconnect",
                 "calendar",
-              )
-            }
+              );
+              if (!url) return;
+              await startOAuthFlow({
+                url,
+                title: `Disconnect ${config.displayName} Calendar`,
+                description: `Complete the disconnection in your browser, then return to Char.`,
+              });
+            }}
             errorDescription={connection.last_error_description ?? null}
           />
         ))}
@@ -183,6 +201,7 @@ function ConnectedContent({
 }) {
   const { groups, connectionSourceMap, handleToggle, isLoading } =
     useOAuthCalendarSelection(config);
+  const { start: startOAuthFlow } = useOAuthFlow();
 
   const groupsWithMenus = useMemo(
     () =>
@@ -201,29 +220,50 @@ function ConnectedContent({
             {
               id: `reconnect-${connection.connection_id}`,
               text: "Reconnect",
-              action: () =>
-                void openIntegrationUrl(
+              action: async () => {
+                const url = await buildIntegrationUrl(
                   config.nangoIntegrationId,
                   connection.connection_id,
                   "reconnect",
                   "calendar",
-                ),
+                );
+                if (!url) return;
+                await startOAuthFlow({
+                  url,
+                  title: `Reconnect ${config.displayName} Calendar`,
+                  description: `Complete the reconnection in your browser, then return to Char.`,
+                });
+              },
             },
             {
               id: `disconnect-${connection.connection_id}`,
               text: "Disconnect",
-              action: () =>
-                void openIntegrationUrl(
+              action: async () => {
+                const url = await buildIntegrationUrl(
                   config.nangoIntegrationId,
                   connection.connection_id,
                   "disconnect",
                   "calendar",
-                ),
+                );
+                if (!url) return;
+                await startOAuthFlow({
+                  url,
+                  title: `Disconnect ${config.displayName} Calendar`,
+                  description: `Complete the disconnection in your browser, then return to Char.`,
+                });
+              },
             },
           ],
         };
       }),
-    [config.nangoIntegrationId, connectionSourceMap, connections, groups],
+    [
+      config.nangoIntegrationId,
+      config.displayName,
+      connectionSourceMap,
+      connections,
+      groups,
+      startOAuthFlow,
+    ],
   );
 
   return (
diff --git a/apps/desktop/src/routeTree.gen.ts b/apps/desktop/src/routeTree.gen.ts
index 39396d3608..7b816dfd22 100644
--- a/apps/desktop/src/routeTree.gen.ts
+++ b/apps/desktop/src/routeTree.gen.ts
@@ -12,6 +12,7 @@ import { Route as rootRouteImport } from './routes/__root'
 import { Route as AppRouteRouteImport } from './routes/app/route'
 import { Route as AuthCallbackRouteImport } from './routes/auth/callback'
 import { Route as AppControlRouteImport } from './routes/app/control'
+import { Route as AppBrowserPendingRouteImport } from './routes/app/browser-pending'
 import { Route as AppMainLayoutRouteImport } from './routes/app/main/_layout'
 import { Route as AppMainLayoutIndexRouteImport } from './routes/app/main/_layout.index'
 
@@ -30,6 +31,11 @@ const AppControlRoute = AppControlRouteImport.update({
   path: '/control',
   getParentRoute: () => AppRouteRoute,
 } as any)
+const AppBrowserPendingRoute = AppBrowserPendingRouteImport.update({
+  id: '/browser-pending',
+  path: '/browser-pending',
+  getParentRoute: () => AppRouteRoute,
+} as any)
 const AppMainLayoutRoute = AppMainLayoutRouteImport.update({
   id: '/main/_layout',
   path: '/main',
@@ -43,6 +49,7 @@ const AppMainLayoutIndexRoute = AppMainLayoutIndexRouteImport.update({
 
 export interface FileRoutesByFullPath {
   '/app': typeof AppRouteRouteWithChildren
+  '/app/browser-pending': typeof AppBrowserPendingRoute
   '/app/control': typeof AppControlRoute
   '/auth/callback': typeof AuthCallbackRoute
   '/app/main': typeof AppMainLayoutRouteWithChildren
@@ -50,6 +57,7 @@ export interface FileRoutesByFullPath {
 }
 export interface FileRoutesByTo {
   '/app': typeof AppRouteRouteWithChildren
+  '/app/browser-pending': typeof AppBrowserPendingRoute
   '/app/control': typeof AppControlRoute
   '/auth/callback': typeof AuthCallbackRoute
   '/app/main': typeof AppMainLayoutIndexRoute
@@ -57,6 +65,7 @@ export interface FileRoutesByTo {
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
   '/app': typeof AppRouteRouteWithChildren
+  '/app/browser-pending': typeof AppBrowserPendingRoute
   '/app/control': typeof AppControlRoute
   '/auth/callback': typeof AuthCallbackRoute
   '/app/main/_layout': typeof AppMainLayoutRouteWithChildren
@@ -66,15 +75,22 @@ export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
   fullPaths:
     | '/app'
+    | '/app/browser-pending'
     | '/app/control'
     | '/auth/callback'
     | '/app/main'
     | '/app/main/'
   fileRoutesByTo: FileRoutesByTo
-  to: '/app' | '/app/control' | '/auth/callback' | '/app/main'
+  to:
+    | '/app'
+    | '/app/browser-pending'
+    | '/app/control'
+    | '/auth/callback'
+    | '/app/main'
   id:
     | '__root__'
     | '/app'
+    | '/app/browser-pending'
     | '/app/control'
     | '/auth/callback'
     | '/app/main/_layout'
@@ -109,6 +125,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AppControlRouteImport
       parentRoute: typeof AppRouteRoute
     }
+    '/app/browser-pending': {
+      id: '/app/browser-pending'
+      path: '/browser-pending'
+      fullPath: '/app/browser-pending'
+      preLoaderRoute: typeof AppBrowserPendingRouteImport
+      parentRoute: typeof AppRouteRoute
+    }
     '/app/main/_layout': {
       id: '/app/main/_layout'
       path: '/main'
@@ -139,11 +162,13 @@ const AppMainLayoutRouteWithChildren = AppMainLayoutRoute._addFileChildren(
 )
 
 interface AppRouteRouteChildren {
+  AppBrowserPendingRoute: typeof AppBrowserPendingRoute
   AppControlRoute: typeof AppControlRoute
   AppMainLayoutRoute: typeof AppMainLayoutRouteWithChildren
 }
 
 const AppRouteRouteChildren: AppRouteRouteChildren = {
+  AppBrowserPendingRoute: AppBrowserPendingRoute,
   AppControlRoute: AppControlRoute,
   AppMainLayoutRoute: AppMainLayoutRouteWithChildren,
 }
diff --git a/apps/desktop/src/routes/app/browser-pending.tsx b/apps/desktop/src/routes/app/browser-pending.tsx
new file mode 100644
index 0000000000..00d638e989
--- /dev/null
+++ b/apps/desktop/src/routes/app/browser-pending.tsx
@@ -0,0 +1,54 @@
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { useCallback } from "react";
+
+import { commands as windowsCommands } from "@hypr/plugin-windows";
+
+export const Route = createFileRoute("/app/browser-pending")({
+  validateSearch: (search): { title: string; description: string } => ({
+    title: String((search as { title?: string }).title ?? ""),
+    description: String((search as { description?: string }).description ?? ""),
+  }),
+  component: BrowserPendingRoute,
+});
+
+function BrowserPendingRoute() {
+  const { title, description } = Route.useSearch();
+  const navigate = useNavigate();
+
+  const handleCancel = useCallback(async () => {
+    await windowsCommands.windowRestoreFrameAnimated({ type: "main" });
+    await navigate({ to: "/app/main" });
+  }, [navigate]);
+
+  return (
+    <div
+      data-tauri-drag-region
+      className="flex h-full flex-col items-center justify-center gap-6 p-8 select-none"
+    >
+      <img
+        src="/assets/char-logo-icon-black.svg"
+        alt=""
+        className="h-10 w-10"
+      />
+
+      <div className="flex flex-col items-center gap-2 text-center">
+        <h2 className="font-serif text-lg font-semibold">{title}</h2>
+        <p className="text-sm text-neutral-500">{description}</p>
+      </div>
+
+      <div className="flex items-center gap-2">
+        <div className="h-1.5 w-1.5 animate-bounce rounded-full bg-neutral-400 [animation-delay:-0.3s]" />
+        <div className="h-1.5 w-1.5 animate-bounce rounded-full bg-neutral-400 [animation-delay:-0.15s]" />
+        <div className="h-1.5 w-1.5 animate-bounce rounded-full bg-neutral-400" />
+      </div>
+
+      <button
+        type="button"
+        onClick={() => void handleCancel()}
+        className="text-xs text-neutral-400 underline-offset-2 transition-colors hover:text-neutral-600 hover:underline"
+      >
+        Cancel
+      </button>
+    </div>
+  );
+}
diff --git a/apps/desktop/src/settings/general/account.tsx b/apps/desktop/src/settings/general/account.tsx
index 96eef56495..3971e7a5ec 100644
--- a/apps/desktop/src/settings/general/account.tsx
+++ b/apps/desktop/src/settings/general/account.tsx
@@ -18,6 +18,7 @@ import {
 
 import {
   canStartTrial as canStartTrialApi,
+  deleteAccount as deleteAccountApi,
   startTrial,
 } from "@hypr/api-client";
 import { createClient } from "@hypr/api-client/client";
@@ -30,16 +31,15 @@ import {
   type TierAction,
 } from "@hypr/pricing";
 import { Button } from "@hypr/ui/components/ui/button";
-import { Input } from "@hypr/ui/components/ui/input";
 import { cn } from "@hypr/utils";
 
 import { useAuth } from "~/auth";
 import { useBillingAccess } from "~/auth/billing";
 import { env } from "~/env";
 import { configureProSettings } from "~/shared/config/configure-pro-settings";
+import { useOAuthFlow } from "~/shared/hooks/useOAuthFlow";
+import { buildWebAppUrl } from "~/shared/utils";
 import * as settings from "~/store/tinybase/store/settings";
-
-const WEB_APP_BASE_URL = env.VITE_APP_URL ?? "http://localhost:3000";
 const ACCOUNT_FEATURES = [
   {
     label: "Cloud Services",
@@ -66,25 +66,18 @@ export function SettingsAccount() {
   const auth = useAuth();
   const { plan, isPaid, isPro, isTrialing, trialDaysRemaining } =
     useBillingAccess();
+  const { start: startOAuthFlow } = useOAuthFlow();
 
   const isAuthenticated = !!auth?.session;
-  const [isPending, setIsPending] = useState(false);
-  const [callbackUrl, setCallbackUrl] = useState("");
-
-  useEffect(() => {
-    if (isAuthenticated) {
-      setIsPending(false);
-    }
-  }, [isAuthenticated]);
 
   const handleSignIn = useCallback(async () => {
-    setIsPending(true);
-    try {
-      await auth?.signIn();
-    } catch {
-      setIsPending(false);
-    }
-  }, [auth]);
+    const url = await buildWebAppUrl("/auth");
+    await startOAuthFlow({
+      url,
+      title: "Sign in to Char",
+      description: "Complete sign-in in your browser, then return to Char.",
+    });
+  }, [startOAuthFlow]);
 
   const signOutMutation = useMutation({
     mutationFn: async () => {
@@ -102,46 +95,6 @@ export function SettingsAccount() {
   });
 
   if (!isAuthenticated) {
-    if (isPending) {
-      return (
-        <div className="flex flex-col gap-8">
-          <div>
-            <h2 className="mb-4 font-serif text-lg font-semibold">Account</h2>
-            <Container
-              title="Finish sign-in"
-              description="Complete the sign-in flow in your browser, then come back here if Char does not reconnect automatically."
-              action={
-                <Button onClick={handleSignIn} variant="outline">
-                  Reopen sign-in page
-                </Button>
-              }
-            >
-              <div className="flex flex-col gap-3">
-                <p className="text-xs text-neutral-500">
-                  Having trouble? Paste the callback URL manually.
-                </p>
-                <div className="flex flex-col gap-2 sm:flex-row">
-                  <Input
-                    type="text"
-                    className="flex-1 font-mono text-xs"
-                    placeholder="hyprnote://deeplink/auth?access_token=..."
-                    value={callbackUrl}
-                    onChange={(e) => setCallbackUrl(e.target.value)}
-                  />
-                  <Button
-                    onClick={() => auth?.handleAuthCallback(callbackUrl)}
-                    disabled={!callbackUrl}
-                  >
-                    Submit
-                  </Button>
-                </div>
-              </div>
-            </Container>
-          </div>
-        </div>
-      );
-    }
-
     return (
       <div className="flex flex-col gap-8">
         <section className="pb-4">
@@ -203,6 +156,64 @@ export function SettingsAccount() {
         isPaid={isPaid}
         isPro={isPro}
       />
+
+      <DeleteAccountSection />
+    </div>
+  );
+}
+
+function DeleteAccountSection() {
+  const auth = useAuth();
+  const [confirmed, setConfirmed] = useState(false);
+
+  const deleteAccountMutation = useMutation({
+    mutationFn: async () => {
+      const headers = auth?.getHeaders();
+      if (!headers) {
+        throw new Error("Not authenticated");
+      }
+      const client = createClient({ baseUrl: env.VITE_API_URL, headers });
+      const { error } = await deleteAccountApi({ client });
+      if (error) {
+        throw error;
+      }
+      await auth?.signOut();
+    },
+  });
+
+  return (
+    <div>
+      <h2 className="mb-4 font-serif text-lg font-semibold">Danger Zone</h2>
+      <Container
+        title="Delete Account"
+        description="Permanently delete your account and all cloud data. Local data remains on your device."
+        action={
+          confirmed ? (
+            <Button
+              variant="outline"
+              onClick={() => deleteAccountMutation.mutate()}
+              disabled={deleteAccountMutation.isPending}
+              className={cn([
+                "border-red-300 bg-red-50 text-red-700 hover:border-red-400 hover:bg-red-100 hover:text-red-800",
+              ])}
+            >
+              {deleteAccountMutation.isPending
+                ? "Deleting..."
+                : "Confirm delete"}
+            </Button>
+          ) : (
+            <Button
+              variant="outline"
+              onClick={() => setConfirmed(true)}
+              className={cn([
+                "border-neutral-200 text-neutral-600 hover:border-red-200 hover:text-red-700",
+              ])}
+            >
+              Delete account
+            </Button>
+          )
+        }
+      />
     </div>
   );
 }
@@ -299,7 +310,7 @@ function PlanBillingSection({
 
     const isUpgrade = action.style === "upgrade";
 
-    const handleClick = () => {
+    const handleClick = async () => {
       if (action.label === "Start free trial") {
         startTrialMutation.mutate();
         return;
@@ -312,13 +323,17 @@ function PlanBillingSection({
       });
 
       if (isPaid && action.targetPlan) {
-        openUrl(
-          `${WEB_APP_BASE_URL}/app/switch-plan?targetPlan=${action.targetPlan}&targetPeriod=monthly`,
-        );
+        const url = await buildWebAppUrl("/app/switch-plan", {
+          targetPlan: action.targetPlan,
+          targetPeriod: "monthly",
+        });
+        openUrl(url);
       } else {
-        openUrl(
-          `${WEB_APP_BASE_URL}/app/checkout?plan=${action.targetPlan}&period=monthly`,
-        );
+        const url = await buildWebAppUrl("/app/checkout", {
+          plan: action.targetPlan,
+          period: "monthly",
+        });
+        openUrl(url);
       }
     };
 
@@ -375,7 +390,10 @@ function PlanBillingSection({
         {isPaid && (
           <button
             type="button"
-            onClick={() => openUrl(`${WEB_APP_BASE_URL}/app/account`)}
+            onClick={async () => {
+              const url = await buildWebAppUrl("/app/portal");
+              openUrl(url);
+            }}
             className="text-xs text-neutral-500 transition-colors hover:text-neutral-700"
           >
             Manage billing
@@ -448,7 +466,7 @@ function PlanTierList({
                     {tier.name}
                   </span>
                   {isCurrent && (
-                    <span className="rounded-full bg-stone-600 px-2 py-0.5 text-[10px] font-medium tracking-wide text-white uppercase">
+                    <span className="rounded-full bg-stone-800 px-2 py-0.5 text-[10px] font-medium tracking-wide text-white uppercase">
                       {isTrialing ? "Trial" : "Current"}
                     </span>
                   )}
@@ -546,7 +564,7 @@ function PlanTierList({
                     {tier.period}
                   </span>
                   {isCurrent && (
-                    <span className="rounded-full bg-stone-600 px-1.5 py-px text-[10px] font-medium tracking-wide text-white uppercase">
+                    <span className="rounded-full bg-stone-800 px-1.5 py-px text-[10px] font-medium tracking-wide text-white uppercase">
                       {isTrialing ? "Trial" : "Current"}
                     </span>
                   )}
diff --git a/apps/desktop/src/shared/hooks/useDeeplinkHandler.ts b/apps/desktop/src/shared/hooks/useDeeplinkHandler.ts
index 9b47055ba8..6c9b112ba4 100644
--- a/apps/desktop/src/shared/hooks/useDeeplinkHandler.ts
+++ b/apps/desktop/src/shared/hooks/useDeeplinkHandler.ts
@@ -1,9 +1,11 @@
 import { useQueryClient } from "@tanstack/react-query";
+import { useNavigate } from "@tanstack/react-router";
 import { isTauri } from "@tauri-apps/api/core";
 import { useEffect } from "react";
 import { useScheduleTaskRunCallback } from "tinytick/ui-react";
 
 import { events as deeplink2Events } from "@hypr/plugin-deeplink2";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
 
 import { useAuth } from "~/auth";
 import { CALENDAR_SYNC_TASK_ID } from "~/services/calendar";
@@ -11,6 +13,7 @@ import { useTabs } from "~/store/zustand/tabs";
 
 export function useDeeplinkHandler() {
   const auth = useAuth();
+  const navigate = useNavigate();
   const queryClient = useQueryClient();
   const openNew = useTabs((state) => state.openNew);
   const scheduleCalendarSync = useScheduleTaskRunCallback(
@@ -38,12 +41,16 @@ export function useDeeplinkHandler() {
         if (access_token && refresh_token && auth) {
           void auth.setSessionFromTokens(access_token, refresh_token);
         }
+        void windowsCommands.windowRestoreFrameAnimated({ type: "main" });
+        void navigate({ to: "/app/main" });
       } else if (payload.to === "/billing/refresh") {
         if (auth) {
           void auth.refreshSession();
         }
       } else if (payload.to === "/integration/callback") {
         const { integration_id, status, return_to } = payload.search;
+        void windowsCommands.windowRestoreFrameAnimated({ type: "main" });
+        void navigate({ to: "/app/main" });
         if (status === "success") {
           console.log(`[deeplink] integration updated: ${integration_id}`);
           refreshIntegrationState();
diff --git a/apps/desktop/src/shared/hooks/useOAuthFlow.ts b/apps/desktop/src/shared/hooks/useOAuthFlow.ts
new file mode 100644
index 0000000000..e515f6ad36
--- /dev/null
+++ b/apps/desktop/src/shared/hooks/useOAuthFlow.ts
@@ -0,0 +1,29 @@
+import { useNavigate } from "@tanstack/react-router";
+import { useCallback } from "react";
+
+import { commands as openerCommands } from "@hypr/plugin-opener2";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
+
+export function useOAuthFlow() {
+  const navigate = useNavigate();
+
+  const start = useCallback(
+    async (opts: { url: string; title: string; description: string }) => {
+      await windowsCommands.windowSaveFrame({ type: "main" });
+      await windowsCommands.windowSetFrameAnimated(
+        { type: "main" },
+        "TopRight",
+        340,
+        500,
+      );
+      await navigate({
+        to: "/app/browser-pending",
+        search: { title: opts.title, description: opts.description },
+      });
+      await openerCommands.openUrl(opts.url, null);
+    },
+    [navigate],
+  );
+
+  return { start };
+}
diff --git a/apps/desktop/src/shared/integration.ts b/apps/desktop/src/shared/integration.ts
index baf1ea2c2e..d532bae91e 100644
--- a/apps/desktop/src/shared/integration.ts
+++ b/apps/desktop/src/shared/integration.ts
@@ -2,13 +2,13 @@ import { commands as openerCommands } from "@hypr/plugin-opener2";
 
 import { buildWebAppUrl } from "~/shared/utils";
 
-export async function openIntegrationUrl(
+export async function buildIntegrationUrl(
   nangoIntegrationId: string | undefined,
   connectionId: string | undefined,
   action: "connect" | "reconnect" | "disconnect",
   returnTo?: string,
-) {
-  if (!nangoIntegrationId) return;
+): Promise<string | undefined> {
+  if (!nangoIntegrationId) return undefined;
   const params: Record<string, string> = {
     action,
     integration_id: nangoIntegrationId,
@@ -19,6 +19,21 @@ export async function openIntegrationUrl(
   if (connectionId) {
     params.connection_id = connectionId;
   }
-  const url = await buildWebAppUrl("/app/integration", params);
+  return buildWebAppUrl("/app/integration", params);
+}
+
+export async function openIntegrationUrl(
+  nangoIntegrationId: string | undefined,
+  connectionId: string | undefined,
+  action: "connect" | "reconnect" | "disconnect",
+  returnTo?: string,
+) {
+  const url = await buildIntegrationUrl(
+    nangoIntegrationId,
+    connectionId,
+    action,
+    returnTo,
+  );
+  if (!url) return;
   await openerCommands.openUrl(url, null);
 }
diff --git a/apps/desktop/src/shared/utils.ts b/apps/desktop/src/shared/utils.ts
index a8757f6bec..3977f3b55f 100644
--- a/apps/desktop/src/shared/utils.ts
+++ b/apps/desktop/src/shared/utils.ts
@@ -23,7 +23,8 @@ type DesktopFlowPath =
   | "/auth"
   | "/app/integration"
   | "/app/checkout"
-  | "/app/switch-plan";
+  | "/app/switch-plan"
+  | "/app/portal";
 
 export const buildWebAppUrl = async (
   path: DesktopFlowPath,
diff --git a/apps/web/src/functions/admin.ts b/apps/web/src/functions/admin.ts
index fade3ad1e8..99981d2f5e 100644
--- a/apps/web/src/functions/admin.ts
+++ b/apps/web/src/functions/admin.ts
@@ -1,7 +1,19 @@
 import { createServerFn } from "@tanstack/react-start";
 
 import { getSupabaseServerClient } from "@/functions/supabase";
-import { ADMIN_EMAILS } from "@/lib/team";
+
+const ADMIN_EMAILS = [
+  "yujonglee@hyprnote.com",
+  "yujonglee.dev@gmail.com",
+  "john@hyprnote.com",
+  "marketing@hyprnote.com",
+  "harshika.alagh@gmail.com",
+  "yunhyungjo@yonsei.ac.kr",
+  "goranmoomin@daum.net",
+  "artem@hyprnote.com",
+  "stua@fastmail.com",
+  "thestua@gmail.com",
+];
 
 export const isAdminEmail = (email: string): boolean => {
   return ADMIN_EMAILS.includes(email.toLowerCase());
diff --git a/apps/web/src/functions/billing.ts b/apps/web/src/functions/billing.ts
index cc6408c832..e4526f5722 100644
--- a/apps/web/src/functions/billing.ts
+++ b/apps/web/src/functions/billing.ts
@@ -94,9 +94,12 @@ export const createCheckoutSession = createServerFn({ method: "POST" })
       );
 
       if (activeSubscription) {
+        const returnUrl = data.scheme
+          ? `${env.VITE_APP_URL}/callback/billing?scheme=${data.scheme}`
+          : `${env.VITE_APP_URL}/`;
         const portalSession = await stripe.billingPortal.sessions.create({
           customer: stripeCustomerId,
-          return_url: `${env.VITE_APP_URL}/app/account`,
+          return_url: returnUrl,
         });
         return { url: portalSession.url };
       }
@@ -135,15 +138,14 @@ export const createCheckoutSession = createServerFn({ method: "POST" })
           ? requireEnv(env.STRIPE_YEARLY_PRICE_ID, "STRIPE_YEARLY_PRICE_ID")
           : requireEnv(env.STRIPE_MONTHLY_PRICE_ID, "STRIPE_MONTHLY_PRICE_ID");
 
-    const successParams = new URLSearchParams({ success: "true" });
-    if (data.scheme) {
-      successParams.set("scheme", data.scheme);
-    }
+    const successUrl = data.scheme
+      ? `${env.VITE_APP_URL}/callback/billing?scheme=${data.scheme}`
+      : `${env.VITE_APP_URL}/`;
 
     const checkout = await stripe.checkout.sessions.create({
       customer: stripeCustomerId,
-      success_url: `${env.VITE_APP_URL}/app/account?${successParams.toString()}`,
-      cancel_url: `${env.VITE_APP_URL}/app/account`,
+      success_url: successUrl,
+      cancel_url: `${env.VITE_APP_URL}/`,
       line_items: [
         {
           price: priceId,
@@ -212,8 +214,8 @@ export const createPlanSwitchSession = createServerFn({ method: "POST" })
           : requireEnv(env.STRIPE_MONTHLY_PRICE_ID, "STRIPE_MONTHLY_PRICE_ID");
 
     const returnUrl = data.scheme
-      ? `${env.VITE_APP_URL}/app/account?scheme=${data.scheme}`
-      : `${env.VITE_APP_URL}/app/account`;
+      ? `${env.VITE_APP_URL}/callback/billing?scheme=${data.scheme}`
+      : `${env.VITE_APP_URL}/`;
 
     const portalSession = await stripe.billingPortal.sessions.create({
       customer: stripeCustomerId,
@@ -239,8 +241,13 @@ export const createPlanSwitchSession = createServerFn({ method: "POST" })
     return { url: portalSession.url };
   });
 
-export const createPortalSession = createServerFn({ method: "POST" }).handler(
-  async () => {
+const createPortalSessionInput = z.object({
+  scheme: desktopSchemeSchema.optional(),
+});
+
+export const createPortalSession = createServerFn({ method: "POST" })
+  .inputValidator(createPortalSessionInput)
+  .handler(async ({ data }) => {
     const supabase = getSupabaseServerClient();
     const {
       data: { user },
@@ -261,14 +268,17 @@ export const createPortalSession = createServerFn({ method: "POST" }).handler(
 
     const stripe = getStripeClient();
 
+    const returnUrl = data.scheme
+      ? `${env.VITE_APP_URL}/callback/billing?scheme=${data.scheme}`
+      : `${env.VITE_APP_URL}/`;
+
     const portalSession = await stripe.billingPortal.sessions.create({
       customer: stripeCustomerId,
-      return_url: `${env.VITE_APP_URL}/app/account`,
+      return_url: returnUrl,
     });
 
     return { url: portalSession.url };
-  },
-);
+  });
 
 export const syncAfterSuccess = createServerFn({ method: "POST" }).handler(
   async () => {
diff --git a/apps/web/src/lib/team.ts b/apps/web/src/lib/team.ts
index 6609442836..7f9a3a191c 100644
--- a/apps/web/src/lib/team.ts
+++ b/apps/web/src/lib/team.ts
@@ -47,19 +47,6 @@ export const AUTHORS = Object.values(TEAM_MEMBERS).map((m) => ({
   avatar: m.avatar,
 }));
 
-export const ADMIN_EMAILS = [
-  "yujonglee@hyprnote.com",
-  "yujonglee.dev@gmail.com",
-  "john@hyprnote.com",
-  "marketing@hyprnote.com",
-  "harshika.alagh@gmail.com",
-  "yunhyungjo@yonsei.ac.kr",
-  "goranmoomin@daum.net",
-  "artem@hyprnote.com",
-  "stua@fastmail.com",
-  "thestua@gmail.com",
-];
-
 export const TEAM_PHOTOS = [
   { id: "john-1", name: "john-1.jpg", url: "/api/images/team/john-1.jpg" },
   { id: "john-2", name: "john-2.jpg", url: "/api/images/team/john-2.jpg" },
diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts
index 6cf780fca1..b192bbff83 100644
--- a/apps/web/src/routeTree.gen.ts
+++ b/apps/web/src/routeTree.gen.ts
@@ -112,9 +112,11 @@ import { Route as ViewCompanyHandbookSplatRouteImport } from './routes/_view/com
 import { Route as ViewChangelogSlugRouteImport } from './routes/_view/changelog/$slug'
 import { Route as ViewCallbackSignoutRouteImport } from './routes/_view/callback/signout'
 import { Route as ViewCallbackIntegrationRouteImport } from './routes/_view/callback/integration'
+import { Route as ViewCallbackBillingRouteImport } from './routes/_view/callback/billing'
 import { Route as ViewCallbackAuthRouteImport } from './routes/_view/callback/auth'
 import { Route as ViewBlogSlugRouteImport } from './routes/_view/blog/$slug'
 import { Route as ViewAppSwitchPlanRouteImport } from './routes/_view/app/switch-plan'
+import { Route as ViewAppPortalRouteImport } from './routes/_view/app/portal'
 import { Route as ViewAppIntegrationRouteImport } from './routes/_view/app/integration'
 import { Route as ViewAppCheckoutRouteImport } from './routes/_view/app/checkout'
 import { Route as ViewAppAccountRouteImport } from './routes/_view/app/account'
@@ -680,6 +682,11 @@ const ViewCallbackIntegrationRoute = ViewCallbackIntegrationRouteImport.update({
   path: '/callback/integration',
   getParentRoute: () => ViewRouteRoute,
 } as any)
+const ViewCallbackBillingRoute = ViewCallbackBillingRouteImport.update({
+  id: '/callback/billing',
+  path: '/callback/billing',
+  getParentRoute: () => ViewRouteRoute,
+} as any)
 const ViewCallbackAuthRoute = ViewCallbackAuthRouteImport.update({
   id: '/callback/auth',
   path: '/callback/auth',
@@ -695,6 +702,11 @@ const ViewAppSwitchPlanRoute = ViewAppSwitchPlanRouteImport.update({
   path: '/switch-plan',
   getParentRoute: () => ViewAppRouteRoute,
 } as any)
+const ViewAppPortalRoute = ViewAppPortalRouteImport.update({
+  id: '/portal',
+  path: '/portal',
+  getParentRoute: () => ViewAppRouteRoute,
+} as any)
 const ViewAppIntegrationRoute = ViewAppIntegrationRouteImport.update({
   id: '/integration',
   path: '/integration',
@@ -946,9 +958,11 @@ export interface FileRoutesByFullPath {
   '/app/account': typeof ViewAppAccountRoute
   '/app/checkout': typeof ViewAppCheckoutRoute
   '/app/integration': typeof ViewAppIntegrationRoute
+  '/app/portal': typeof ViewAppPortalRoute
   '/app/switch-plan': typeof ViewAppSwitchPlanRoute
   '/blog/$slug': typeof ViewBlogSlugRoute
   '/callback/auth': typeof ViewCallbackAuthRoute
+  '/callback/billing': typeof ViewCallbackBillingRoute
   '/callback/integration': typeof ViewCallbackIntegrationRoute
   '/callback/signout': typeof ViewCallbackSignoutRoute
   '/changelog/$slug': typeof ViewChangelogSlugRoute
@@ -1089,9 +1103,11 @@ export interface FileRoutesByTo {
   '/app/account': typeof ViewAppAccountRoute
   '/app/checkout': typeof ViewAppCheckoutRoute
   '/app/integration': typeof ViewAppIntegrationRoute
+  '/app/portal': typeof ViewAppPortalRoute
   '/app/switch-plan': typeof ViewAppSwitchPlanRoute
   '/blog/$slug': typeof ViewBlogSlugRoute
   '/callback/auth': typeof ViewCallbackAuthRoute
+  '/callback/billing': typeof ViewCallbackBillingRoute
   '/callback/integration': typeof ViewCallbackIntegrationRoute
   '/callback/signout': typeof ViewCallbackSignoutRoute
   '/changelog/$slug': typeof ViewChangelogSlugRoute
@@ -1238,9 +1254,11 @@ export interface FileRoutesById {
   '/_view/app/account': typeof ViewAppAccountRoute
   '/_view/app/checkout': typeof ViewAppCheckoutRoute
   '/_view/app/integration': typeof ViewAppIntegrationRoute
+  '/_view/app/portal': typeof ViewAppPortalRoute
   '/_view/app/switch-plan': typeof ViewAppSwitchPlanRoute
   '/_view/blog/$slug': typeof ViewBlogSlugRoute
   '/_view/callback/auth': typeof ViewCallbackAuthRoute
+  '/_view/callback/billing': typeof ViewCallbackBillingRoute
   '/_view/callback/integration': typeof ViewCallbackIntegrationRoute
   '/_view/callback/signout': typeof ViewCallbackSignoutRoute
   '/_view/changelog/$slug': typeof ViewChangelogSlugRoute
@@ -1387,9 +1405,11 @@ export interface FileRouteTypes {
     | '/app/account'
     | '/app/checkout'
     | '/app/integration'
+    | '/app/portal'
     | '/app/switch-plan'
     | '/blog/$slug'
     | '/callback/auth'
+    | '/callback/billing'
     | '/callback/integration'
     | '/callback/signout'
     | '/changelog/$slug'
@@ -1530,9 +1550,11 @@ export interface FileRouteTypes {
     | '/app/account'
     | '/app/checkout'
     | '/app/integration'
+    | '/app/portal'
     | '/app/switch-plan'
     | '/blog/$slug'
     | '/callback/auth'
+    | '/callback/billing'
     | '/callback/integration'
     | '/callback/signout'
     | '/changelog/$slug'
@@ -1678,9 +1700,11 @@ export interface FileRouteTypes {
     | '/_view/app/account'
     | '/_view/app/checkout'
     | '/_view/app/integration'
+    | '/_view/app/portal'
     | '/_view/app/switch-plan'
     | '/_view/blog/$slug'
     | '/_view/callback/auth'
+    | '/_view/callback/billing'
     | '/_view/callback/integration'
     | '/_view/callback/signout'
     | '/_view/changelog/$slug'
@@ -2564,6 +2588,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ViewCallbackIntegrationRouteImport
       parentRoute: typeof ViewRouteRoute
     }
+    '/_view/callback/billing': {
+      id: '/_view/callback/billing'
+      path: '/callback/billing'
+      fullPath: '/callback/billing'
+      preLoaderRoute: typeof ViewCallbackBillingRouteImport
+      parentRoute: typeof ViewRouteRoute
+    }
     '/_view/callback/auth': {
       id: '/_view/callback/auth'
       path: '/callback/auth'
@@ -2585,6 +2616,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ViewAppSwitchPlanRouteImport
       parentRoute: typeof ViewAppRouteRoute
     }
+    '/_view/app/portal': {
+      id: '/_view/app/portal'
+      path: '/portal'
+      fullPath: '/app/portal'
+      preLoaderRoute: typeof ViewAppPortalRouteImport
+      parentRoute: typeof ViewAppRouteRoute
+    }
     '/_view/app/integration': {
       id: '/_view/app/integration'
       path: '/integration'
@@ -2872,6 +2910,7 @@ interface ViewAppRouteRouteChildren {
   ViewAppAccountRoute: typeof ViewAppAccountRoute
   ViewAppCheckoutRoute: typeof ViewAppCheckoutRoute
   ViewAppIntegrationRoute: typeof ViewAppIntegrationRoute
+  ViewAppPortalRoute: typeof ViewAppPortalRoute
   ViewAppSwitchPlanRoute: typeof ViewAppSwitchPlanRoute
   ViewAppIndexRoute: typeof ViewAppIndexRoute
 }
@@ -2880,6 +2919,7 @@ const ViewAppRouteRouteChildren: ViewAppRouteRouteChildren = {
   ViewAppAccountRoute: ViewAppAccountRoute,
   ViewAppCheckoutRoute: ViewAppCheckoutRoute,
   ViewAppIntegrationRoute: ViewAppIntegrationRoute,
+  ViewAppPortalRoute: ViewAppPortalRoute,
   ViewAppSwitchPlanRoute: ViewAppSwitchPlanRoute,
   ViewAppIndexRoute: ViewAppIndexRoute,
 }
@@ -2936,6 +2976,7 @@ interface ViewRouteRouteChildren {
   ViewIndexRoute: typeof ViewIndexRoute
   ViewBlogSlugRoute: typeof ViewBlogSlugRoute
   ViewCallbackAuthRoute: typeof ViewCallbackAuthRoute
+  ViewCallbackBillingRoute: typeof ViewCallbackBillingRoute
   ViewCallbackIntegrationRoute: typeof ViewCallbackIntegrationRoute
   ViewCallbackSignoutRoute: typeof ViewCallbackSignoutRoute
   ViewChangelogSlugRoute: typeof ViewChangelogSlugRoute
@@ -3021,6 +3062,7 @@ const ViewRouteRouteChildren: ViewRouteRouteChildren = {
   ViewIndexRoute: ViewIndexRoute,
   ViewBlogSlugRoute: ViewBlogSlugRoute,
   ViewCallbackAuthRoute: ViewCallbackAuthRoute,
+  ViewCallbackBillingRoute: ViewCallbackBillingRoute,
   ViewCallbackIntegrationRoute: ViewCallbackIntegrationRoute,
   ViewCallbackSignoutRoute: ViewCallbackSignoutRoute,
   ViewChangelogSlugRoute: ViewChangelogSlugRoute,
diff --git a/apps/web/src/routes/_view/app/-account-access.tsx b/apps/web/src/routes/_view/app/-account-access.tsx
deleted file mode 100644
index 86a4ea1658..0000000000
--- a/apps/web/src/routes/_view/app/-account-access.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { useMutation } from "@tanstack/react-query";
-import { useNavigate } from "@tanstack/react-router";
-import { useState } from "react";
-
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from "@hypr/ui/components/ui/accordion";
-
-import { signOutFn } from "@/functions/auth";
-import { deleteAccount } from "@/functions/billing";
-
-export function AccountAccessSection() {
-  const navigate = useNavigate();
-  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
-
-  const signOut = useMutation({
-    mutationFn: async () => {
-      const res = await signOutFn();
-      if (res.success) {
-        return true;
-      }
-
-      throw new Error(res.message);
-    },
-    onSuccess: () => {
-      navigate({ to: "/" });
-    },
-    onError: (error) => {
-      console.error(error);
-      navigate({ to: "/" });
-    },
-  });
-
-  const deleteAccountMutation = useMutation({
-    mutationFn: () => deleteAccount(),
-    onSuccess: () => {
-      navigate({ to: "/" });
-    },
-  });
-
-  return (
-    <div className="rounded-xs border border-neutral-100">
-      <div className="p-4">
-        <h3 className="mb-2 font-serif text-lg font-semibold">Access</h3>
-        <p className="text-sm text-neutral-600">
-          Session controls and destructive account actions
-        </p>
-      </div>
-
-      <div className="flex flex-col gap-4 border-t border-neutral-100 p-4 sm:flex-row sm:items-center sm:justify-between">
-        <div>
-          <div className="text-sm font-medium text-neutral-900">Sign out</div>
-          <p className="text-sm text-neutral-600">
-            End your current session on this device
-          </p>
-        </div>
-
-        <button
-          onClick={() => signOut.mutate()}
-          disabled={signOut.isPending}
-          className="flex h-8 cursor-pointer items-center justify-center rounded-full border border-neutral-300 bg-linear-to-b from-white to-stone-50 px-4 text-sm text-neutral-700 shadow-xs transition-all hover:scale-[102%] hover:shadow-md active:scale-[98%] disabled:opacity-50 disabled:hover:scale-100"
-        >
-          {signOut.isPending ? "Signing out..." : "Sign out"}
-        </button>
-      </div>
-
-      <div className="border-t border-neutral-100 px-4">
-        <Accordion
-          type="single"
-          collapsible
-          onValueChange={(value) => {
-            if (!value) {
-              setShowDeleteConfirm(false);
-              deleteAccountMutation.reset();
-            }
-          }}
-        >
-          <AccordionItem value="delete-account" className="border-none">
-            <AccordionTrigger className="py-4 text-sm font-medium text-red-700 hover:text-red-800 hover:no-underline">
-              Delete account
-            </AccordionTrigger>
-            <AccordionContent className="pb-4">
-              <div className="rounded-md border border-red-200 bg-red-50 p-4">
-                <p className="text-sm text-red-900">
-                  Char is a local-first app. Your notes, transcripts, and
-                  meeting data stay on your device. Deleting your account only
-                  removes cloud-stored data.
-                </p>
-
-                {showDeleteConfirm ? (
-                  <div className="mt-4 space-y-3">
-                    <p className="text-sm text-red-800">
-                      This permanently deletes your account and cloud data.
-                    </p>
-
-                    {deleteAccountMutation.isError && (
-                      <p className="text-sm text-red-600">
-                        {deleteAccountMutation.error?.message ||
-                          "Failed to delete account"}
-                      </p>
-                    )}
-
-                    <div className="flex flex-wrap gap-2">
-                      <button
-                        onClick={() => deleteAccountMutation.mutate()}
-                        disabled={deleteAccountMutation.isPending}
-                        className="flex h-8 items-center rounded-full bg-red-600 px-4 text-sm text-white shadow-md transition-all hover:scale-[102%] hover:shadow-lg active:scale-[98%] disabled:opacity-50 disabled:hover:scale-100"
-                      >
-                        {deleteAccountMutation.isPending
-                          ? "Deleting..."
-                          : "Yes, delete my account"}
-                      </button>
-                      <button
-                        onClick={() => {
-                          setShowDeleteConfirm(false);
-                          deleteAccountMutation.reset();
-                        }}
-                        disabled={deleteAccountMutation.isPending}
-                        className="flex h-8 items-center rounded-full border border-red-200 bg-white px-4 text-sm text-red-700 transition-all hover:border-red-300 hover:text-red-800 disabled:opacity-50"
-                      >
-                        Cancel
-                      </button>
-                    </div>
-                  </div>
-                ) : (
-                  <button
-                    onClick={() => setShowDeleteConfirm(true)}
-                    className="mt-4 flex h-8 cursor-pointer items-center rounded-full border border-red-200 bg-white px-4 text-sm text-red-700 transition-all hover:border-red-300 hover:text-red-800"
-                  >
-                    Continue
-                  </button>
-                )}
-              </div>
-            </AccordionContent>
-          </AccordionItem>
-        </Accordion>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/routes/_view/app/-account-integrations.tsx b/apps/web/src/routes/_view/app/-account-integrations.tsx
deleted file mode 100644
index 8d29efa65c..0000000000
--- a/apps/web/src/routes/_view/app/-account-integrations.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import { Link, useNavigate } from "@tanstack/react-router";
-import { ChevronDown, PlusIcon } from "lucide-react";
-
-import type { ConnectionItem, WhoAmIItem } from "@hypr/api-client";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@hypr/ui/components/ui/dropdown-menu";
-
-import { useBilling } from "@/hooks/use-billing";
-import { useConnections } from "@/hooks/use-connections";
-import { useWhoAmI } from "@/hooks/use-whoami";
-
-const INTEGRATIONS = [
-  { id: "google-calendar", name: "Google Calendar" },
-  { id: "outlook", name: "Outlook Calendar" },
-] as const;
-
-export function IntegrationsSettingsCard() {
-  const navigate = useNavigate();
-  const { isPaid } = useBilling();
-  const { data: connections, isLoading } = useConnections(isPaid);
-  const { data: accounts } = useWhoAmI(isPaid);
-
-  const getProviderConnections = (integrationId: string) => {
-    return connections?.filter((c) => c.integration_id === integrationId) ?? [];
-  };
-
-  const getAccountInfo = (connectionId: string) => {
-    return accounts?.find((a) => a.connection_id === connectionId);
-  };
-
-  return (
-    <div className="rounded-xs border border-neutral-100">
-      <div className="p-4">
-        <h3 className="mb-2 font-serif text-lg font-semibold">Integrations</h3>
-        <p className="text-sm text-neutral-600">
-          Connect third-party services to enhance your experience
-        </p>
-      </div>
-
-      {INTEGRATIONS.map((integration) => {
-        const providerConnections = getProviderConnections(integration.id);
-
-        return (
-          <div key={integration.id} className="border-t border-neutral-100 p-4">
-            <div className="flex items-center justify-between">
-              <div className="flex items-center gap-3">
-                <div className="text-sm font-medium">{integration.name}</div>
-              </div>
-
-              {!isPaid ? (
-                <Link
-                  to="/pricing/"
-                  className="flex h-8 items-center rounded-full bg-linear-to-t from-stone-600 to-stone-500 px-4 text-sm text-white shadow-md transition-all hover:scale-[102%] hover:shadow-lg active:scale-[98%]"
-                >
-                  Upgrade
-                </Link>
-              ) : isLoading ? (
-                <button
-                  disabled
-                  className="flex h-8 items-center rounded-full border border-neutral-300 bg-linear-to-b from-white to-stone-50 px-4 text-sm text-neutral-500 shadow-xs"
-                >
-                  Loading...
-                </button>
-              ) : (
-                <button
-                  onClick={() =>
-                    navigate({
-                      to: "/app/integration/",
-                      search: {
-                        flow: "web",
-                        integration_id: integration.id,
-                        action: "connect",
-                      },
-                    })
-                  }
-                  className="flex h-8 cursor-pointer items-center gap-1 rounded-full bg-linear-to-t from-stone-600 to-stone-500 px-4 text-sm text-white shadow-md transition-all hover:scale-[102%] hover:shadow-lg active:scale-[98%]"
-                >
-                  <PlusIcon size={14} />
-                  {providerConnections.length > 0 ? "Add account" : "Connect"}
-                </button>
-              )}
-            </div>
-
-            {providerConnections.length > 0 && (
-              <div className="mt-3 flex flex-col gap-2">
-                {providerConnections.map((connection) => (
-                  <ConnectionRow
-                    key={connection.connection_id}
-                    connection={connection}
-                    integrationId={integration.id}
-                    account={getAccountInfo(connection.connection_id)}
-                  />
-                ))}
-              </div>
-            )}
-          </div>
-        );
-      })}
-    </div>
-  );
-}
-
-function ConnectionRow({
-  connection,
-  integrationId,
-  account,
-}: {
-  connection: ConnectionItem;
-  integrationId: string;
-  account?: WhoAmIItem;
-}) {
-  const navigate = useNavigate();
-  const isReconnectRequired = connection.status === "reconnect_required";
-  const displayLabel =
-    account?.email ?? account?.display_name ?? connection.connection_id;
-
-  return (
-    <div className="flex items-center justify-between rounded-md border border-neutral-100 px-3 py-2">
-      <div className="flex items-center gap-2">
-        <span
-          className={[
-            "size-2 rounded-full",
-            isReconnectRequired ? "bg-amber-500" : "bg-green-500",
-          ].join(" ")}
-        />
-        <span className="text-xs text-neutral-700">{displayLabel}</span>
-        {isReconnectRequired && (
-          <span className="text-xs text-amber-600">Reconnect required</span>
-        )}
-      </div>
-
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <button className="flex h-7 cursor-pointer items-center gap-1 rounded-full border border-neutral-200 bg-linear-to-b from-white to-stone-50 px-3 text-xs text-neutral-600 shadow-xs transition-all hover:scale-[102%] hover:shadow-md active:scale-[98%]">
-            {isReconnectRequired ? "Reconnect" : "Manage"}
-            <ChevronDown size={12} />
-          </button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" className="w-40">
-          <DropdownMenuItem
-            onClick={() =>
-              navigate({
-                to: "/app/integration/",
-                search: {
-                  flow: "web",
-                  integration_id: integrationId,
-                  action: "reconnect",
-                  connection_id: connection.connection_id,
-                },
-              })
-            }
-          >
-            Reconnect
-          </DropdownMenuItem>
-          <DropdownMenuItem
-            onClick={() =>
-              navigate({
-                to: "/app/integration/",
-                search: {
-                  flow: "web",
-                  action: "disconnect",
-                  integration_id: integrationId,
-                  connection_id: connection.connection_id,
-                },
-              })
-            }
-            className="text-red-600 focus:text-red-600"
-          >
-            Disconnect
-          </DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-  );
-}
diff --git a/apps/web/src/routes/_view/app/-account-profile-info.tsx b/apps/web/src/routes/_view/app/-account-profile-info.tsx
deleted file mode 100644
index 13d65f33cf..0000000000
--- a/apps/web/src/routes/_view/app/-account-profile-info.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { useMutation } from "@tanstack/react-query";
-import { useState } from "react";
-
-import { updateUserEmail } from "@/functions/auth";
-
-export function ProfileInfoSection({ email }: { email?: string }) {
-  const [isEditing, setIsEditing] = useState(false);
-  const [newEmail, setNewEmail] = useState("");
-  const [successMessage, setSuccessMessage] = useState<string | null>(null);
-
-  const updateEmailMutation = useMutation({
-    mutationFn: async (email: string) => {
-      const res = await updateUserEmail({ data: { email } });
-      if ("error" in res && res.error) {
-        throw new Error(res.error);
-      }
-      return res;
-    },
-    onSuccess: (data) => {
-      if ("message" in data && data.message) {
-        setSuccessMessage(data.message);
-      }
-      setIsEditing(false);
-      setNewEmail("");
-    },
-  });
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    if (newEmail && newEmail !== email) {
-      updateEmailMutation.mutate(newEmail);
-    }
-  };
-
-  const handleCancel = () => {
-    setIsEditing(false);
-    setNewEmail("");
-    updateEmailMutation.reset();
-  };
-
-  return (
-    <div className="rounded-xs border border-neutral-100">
-      <div className="p-4">
-        <h3 className="mb-2 font-serif text-lg font-semibold">Profile</h3>
-        <p className="text-sm text-neutral-600">Your personal information</p>
-      </div>
-
-      <div className="flex flex-col gap-4 border-t border-neutral-100 p-4">
-        <div>
-          <div className="mb-1 text-sm text-neutral-500">Email</div>
-          {isEditing ? (
-            <form onSubmit={handleSubmit} className="flex flex-col gap-3">
-              <div className="flex gap-2">
-                <input
-                  type="email"
-                  value={newEmail}
-                  onChange={(e) => setNewEmail(e.target.value)}
-                  placeholder={email || "Enter new email"}
-                  className="flex-1 rounded-md border border-neutral-200 px-3 py-2 text-sm focus:border-transparent focus:ring-2 focus:ring-stone-500 focus:outline-none"
-                  autoFocus
-                />
-              </div>
-              {updateEmailMutation.isError && (
-                <p className="text-sm text-red-600">
-                  {updateEmailMutation.error?.message ||
-                    "Failed to update email"}
-                </p>
-              )}
-              <div className="flex gap-2">
-                <button
-                  type="submit"
-                  disabled={
-                    updateEmailMutation.isPending ||
-                    !newEmail ||
-                    newEmail === email
-                  }
-                  className="flex h-8 items-center rounded-full bg-linear-to-t from-stone-600 to-stone-500 px-4 text-sm text-white shadow-md transition-all hover:scale-[102%] hover:shadow-lg active:scale-[98%] disabled:opacity-50 disabled:hover:scale-100"
-                >
-                  {updateEmailMutation.isPending ? "Saving..." : "Save"}
-                </button>
-                <button
-                  type="button"
-                  onClick={handleCancel}
-                  disabled={updateEmailMutation.isPending}
-                  className="flex h-8 items-center rounded-full border border-neutral-300 bg-linear-to-b from-white to-stone-50 px-4 text-sm text-neutral-700 shadow-xs transition-all hover:scale-[102%] hover:shadow-md active:scale-[98%] disabled:opacity-50"
-                >
-                  Cancel
-                </button>
-              </div>
-            </form>
-          ) : (
-            <div className="flex items-center gap-3">
-              <div className="text-base">{email || "Not available"}</div>
-              <button
-                onClick={() => {
-                  setIsEditing(true);
-                  setSuccessMessage(null);
-                }}
-                className="flex h-7 items-center rounded-full border border-neutral-300 bg-linear-to-b from-white to-stone-50 px-3 text-xs text-neutral-700 shadow-xs transition-all hover:scale-[102%] hover:shadow-md active:scale-[98%]"
-              >
-                Change
-              </button>
-            </div>
-          )}
-        </div>
-
-        {successMessage && (
-          <div className="rounded-md border border-green-200 bg-green-50 p-3">
-            <p className="text-sm text-green-800">{successMessage}</p>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/routes/_view/app/-account-settings.tsx b/apps/web/src/routes/_view/app/-account-settings.tsx
deleted file mode 100644
index b79521bd01..0000000000
--- a/apps/web/src/routes/_view/app/-account-settings.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import { useMutation, useQuery } from "@tanstack/react-query";
-import { Link } from "@tanstack/react-router";
-
-import type { PlanTierData, TierAction } from "@hypr/pricing";
-import { PlanGrid } from "@hypr/pricing/ui";
-import { cn } from "@hypr/utils";
-
-import {
-  canStartTrial,
-  createPlanSwitchSession,
-  createPortalSession,
-  startTrial,
-} from "@/functions/billing";
-import { useBilling } from "@/hooks/use-billing";
-
-export function AccountSettingsCard() {
-  const billing = useBilling();
-
-  const currentTier = billing.plan === "trial" ? "pro" : billing.plan;
-
-  const canTrialQuery = useQuery({
-    queryKey: ["canStartTrial"],
-    queryFn: () => canStartTrial(),
-    enabled: billing.isReady && billing.plan === "free",
-  });
-
-  const manageBillingMutation = useMutation({
-    mutationFn: async () => {
-      const { url } = await createPortalSession();
-      if (url) {
-        window.location.href = url;
-      }
-    },
-  });
-
-  const switchPlanMutation = useMutation({
-    mutationFn: async (targetPlan: "lite" | "pro") => {
-      const { url } = await createPlanSwitchSession({
-        data: { targetPlan, targetPeriod: "monthly" },
-      });
-      if (url) {
-        window.location.href = url;
-      }
-    },
-  });
-
-  const startTrialMutation = useMutation({
-    mutationFn: () => startTrial(),
-    onSuccess: () => {
-      billing.refreshBilling();
-      canTrialQuery.refetch();
-    },
-  });
-
-  const isLoading =
-    !billing.isReady || (billing.plan === "free" && canTrialQuery.isLoading);
-
-  if (isLoading) {
-    return (
-      <div className="rounded-xs border border-neutral-100 p-4">
-        <h3 className="mb-2 font-serif text-lg font-semibold">
-          Plan & Billing
-        </h3>
-        <p className="text-sm text-neutral-400">Loading...</p>
-      </div>
-    );
-  }
-
-  return (
-    <PlanGrid
-      currentPlan={currentTier}
-      isTrialing={billing.isTrialing}
-      trialDaysRemaining={billing.trialDaysRemaining}
-      canStartTrial={canTrialQuery.data ?? false}
-      isPaid={billing.isPaid}
-      renderManageBilling={() => (
-        <button
-          onClick={() => manageBillingMutation.mutate()}
-          disabled={manageBillingMutation.isPending}
-          className="flex h-8 cursor-pointer items-center rounded-full border border-neutral-300 bg-linear-to-b from-white to-stone-50 px-4 text-sm text-neutral-700 shadow-xs transition-all hover:scale-[102%] hover:shadow-md active:scale-[98%] disabled:opacity-50 disabled:hover:scale-100"
-        >
-          {manageBillingMutation.isPending ? "Loading..." : "Manage billing"}
-        </button>
-      )}
-      renderAction={(_tier: PlanTierData, action: TierAction) => {
-        if (action == null) return null;
-
-        if (action.style === "current") {
-          return (
-            <div className="flex h-8 items-center justify-center rounded-full border border-neutral-200 bg-neutral-50 text-xs text-neutral-500">
-              {action.label}
-            </div>
-          );
-        }
-
-        const buttonClass = cn([
-          "flex h-8 w-full items-center justify-center rounded-full text-xs font-medium transition-all hover:scale-[102%] active:scale-[98%]",
-          action.style === "upgrade"
-            ? "bg-linear-to-t from-stone-600 to-stone-500 text-white shadow-md hover:shadow-lg"
-            : "border border-neutral-300 bg-linear-to-b from-white to-stone-50 text-neutral-700 shadow-xs hover:shadow-md",
-        ]);
-
-        if (action.targetPlan && currentTier === "free") {
-          if (action.label === "Start free trial") {
-            return (
-              <button
-                onClick={() => startTrialMutation.mutate()}
-                disabled={startTrialMutation.isPending}
-                className={cn([
-                  buttonClass,
-                  "cursor-pointer disabled:opacity-50 disabled:hover:scale-100",
-                ])}
-              >
-                {startTrialMutation.isPending ? "Loading..." : action.label}
-              </button>
-            );
-          }
-          return (
-            <Link
-              to="/app/checkout/"
-              search={{ plan: action.targetPlan, period: "monthly" }}
-              className={buttonClass}
-            >
-              {action.label}
-            </Link>
-          );
-        }
-
-        return (
-          <button
-            onClick={() => {
-              if (action.targetPlan) {
-                switchPlanMutation.mutate(action.targetPlan);
-              }
-            }}
-            disabled={switchPlanMutation.isPending}
-            className={cn([
-              buttonClass,
-              "cursor-pointer disabled:opacity-50 disabled:hover:scale-100",
-            ])}
-          >
-            {switchPlanMutation.isPending ? "Loading..." : action.label}
-          </button>
-        );
-      }}
-    />
-  );
-}
diff --git a/apps/web/src/routes/_view/app/-integrations-upgrade-prompt.tsx b/apps/web/src/routes/_view/app/-integrations-upgrade-prompt.tsx
index 1d712edeb2..8129536965 100644
--- a/apps/web/src/routes/_view/app/-integrations-upgrade-prompt.tsx
+++ b/apps/web/src/routes/_view/app/-integrations-upgrade-prompt.tsx
@@ -49,10 +49,10 @@ export function UpgradePrompt({
           </button>
         ) : (
           <Link
-            to="/app/account/"
+            to="/"
             className="text-sm text-neutral-500 transition-colors hover:text-neutral-700"
           >
-            Back to account
+            Back
           </Link>
         )}
       </div>
diff --git a/apps/web/src/routes/_view/app/account.tsx b/apps/web/src/routes/_view/app/account.tsx
index f6dba122f9..9b4c2448c0 100644
--- a/apps/web/src/routes/_view/app/account.tsx
+++ b/apps/web/src/routes/_view/app/account.tsx
@@ -1,91 +1,5 @@
 import { createFileRoute } from "@tanstack/react-router";
-import { useEffect } from "react";
-import { z } from "zod";
-
-import { desktopSchemeSchema } from "@/functions/desktop-flow";
-
-import { AccountAccessSection } from "./-account-access";
-import { IntegrationsSettingsCard } from "./-account-integrations";
-import { ProfileInfoSection } from "./-account-profile-info";
-import { AccountSettingsCard } from "./-account-settings";
-
-const validateSearch = z
-  .object({
-    success: z.coerce.boolean(),
-    trial: z.enum(["started"]),
-    scheme: desktopSchemeSchema,
-  })
-  .partial();
 
 export const Route = createFileRoute("/_view/app/account")({
-  validateSearch,
-  component: Component,
-  loader: async ({ context }) => ({ user: context.user }),
+  component: () => null,
 });
-
-function Component() {
-  const { user } = Route.useLoaderData();
-  const search = Route.useSearch();
-
-  useEffect(() => {
-    if ((search.success || search.trial === "started") && search.scheme) {
-      window.location.href = `${search.scheme}://billing/refresh`;
-    }
-  }, [search.success, search.trial, search.scheme]);
-
-  return (
-    <div>
-      <div className="mx-auto min-h-[calc(100vh-200px)] max-w-6xl border-x border-neutral-100">
-        <div className="flex items-center justify-center border-b border-neutral-100 bg-linear-to-b from-stone-50/30 to-stone-100/30 py-20">
-          <h1 className="text-center font-serif text-3xl font-medium">
-            Welcome back {user?.email?.split("@")[0] || "Guest"}
-          </h1>
-        </div>
-
-        <div className="mx-auto mt-8 flex max-w-4xl flex-col gap-10 px-4 pb-20">
-          <section className="space-y-4">
-            <div className="space-y-2 px-1">
-              <p className="text-xs font-medium tracking-[0.18em] text-neutral-400 uppercase">
-                Account
-              </p>
-              <div>
-                <h2 className="font-serif text-2xl font-medium text-stone-950">
-                  Profile, billing, and connected services
-                </h2>
-                <p className="text-sm text-neutral-600">
-                  Update the essentials without burying routine settings behind
-                  destructive actions.
-                </p>
-              </div>
-            </div>
-
-            <div className="space-y-6">
-              <ProfileInfoSection email={user?.email} />
-              <AccountSettingsCard />
-              <IntegrationsSettingsCard />
-            </div>
-          </section>
-
-          <section className="space-y-4">
-            <div className="space-y-2 px-1">
-              <p className="text-xs font-medium tracking-[0.18em] text-neutral-400 uppercase">
-                Access
-              </p>
-              <div>
-                <h2 className="font-serif text-2xl font-medium text-stone-950">
-                  Session controls
-                </h2>
-                <p className="text-sm text-neutral-600">
-                  Sign out quickly, while keeping account deletion tucked behind
-                  an extra deliberate step.
-                </p>
-              </div>
-            </div>
-
-            <AccountAccessSection />
-          </section>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/routes/_view/app/checkout.tsx b/apps/web/src/routes/_view/app/checkout.tsx
index 2357820422..44b40b9aec 100644
--- a/apps/web/src/routes/_view/app/checkout.tsx
+++ b/apps/web/src/routes/_view/app/checkout.tsx
@@ -13,6 +13,10 @@ const validateSearch = z.object({
 export const Route = createFileRoute("/_view/app/checkout")({
   validateSearch,
   beforeLoad: async ({ search }) => {
+    if (!search.scheme) {
+      throw redirect({ to: "/download/" });
+    }
+
     const { url } = await createCheckoutSession({
       data: { period: search.period, plan: search.plan, scheme: search.scheme },
     });
@@ -21,6 +25,6 @@ export const Route = createFileRoute("/_view/app/checkout")({
       throw redirect({ href: url } as any);
     }
 
-    throw redirect({ to: "/app/account/" });
+    throw redirect({ to: "/" });
   },
 });
diff --git a/apps/web/src/routes/_view/app/index.tsx b/apps/web/src/routes/_view/app/index.tsx
index 4c9323529e..1e4c52409a 100644
--- a/apps/web/src/routes/_view/app/index.tsx
+++ b/apps/web/src/routes/_view/app/index.tsx
@@ -3,7 +3,7 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
 export const Route = createFileRoute("/_view/app/")({
   beforeLoad: async () => {
     throw redirect({
-      to: "/app/account/",
+      to: "/",
     });
   },
 });
diff --git a/apps/web/src/routes/_view/app/portal.tsx b/apps/web/src/routes/_view/app/portal.tsx
new file mode 100644
index 0000000000..448b1a4461
--- /dev/null
+++ b/apps/web/src/routes/_view/app/portal.tsx
@@ -0,0 +1,28 @@
+import { createFileRoute, redirect } from "@tanstack/react-router";
+import { z } from "zod";
+
+import { createPortalSession } from "@/functions/billing";
+import { desktopSchemeSchema } from "@/functions/desktop-flow";
+
+const validateSearch = z.object({
+  scheme: desktopSchemeSchema.optional(),
+});
+
+export const Route = createFileRoute("/_view/app/portal")({
+  validateSearch,
+  beforeLoad: async ({ search }) => {
+    if (!search.scheme) {
+      throw redirect({ to: "/download/" });
+    }
+
+    const { url } = await createPortalSession({
+      data: { scheme: search.scheme },
+    });
+
+    if (url) {
+      throw redirect({ href: url } as any);
+    }
+
+    throw redirect({ to: "/" });
+  },
+});
diff --git a/apps/web/src/routes/_view/app/switch-plan.tsx b/apps/web/src/routes/_view/app/switch-plan.tsx
index 0d566f5d8d..b8c04f164e 100644
--- a/apps/web/src/routes/_view/app/switch-plan.tsx
+++ b/apps/web/src/routes/_view/app/switch-plan.tsx
@@ -13,6 +13,10 @@ const validateSearch = z.object({
 export const Route = createFileRoute("/_view/app/switch-plan")({
   validateSearch,
   beforeLoad: async ({ search }) => {
+    if (!search.scheme) {
+      throw redirect({ to: "/download/" });
+    }
+
     const { url } = await createPlanSwitchSession({
       data: {
         targetPlan: search.targetPlan,
@@ -25,6 +29,6 @@ export const Route = createFileRoute("/_view/app/switch-plan")({
       throw redirect({ href: url } as any);
     }
 
-    throw redirect({ to: "/app/account/" });
+    throw redirect({ to: "/" });
   },
 });
diff --git a/apps/web/src/routes/_view/callback/auth.tsx b/apps/web/src/routes/_view/callback/auth.tsx
index 438e1388e7..cb8259f4e1 100644
--- a/apps/web/src/routes/_view/callback/auth.tsx
+++ b/apps/web/src/routes/_view/callback/auth.tsx
@@ -49,11 +49,19 @@ export const Route = createFileRoute("/_view/callback/auth")({
           throw redirect({ to: "/update-password/", search: {} });
         }
         throw redirect({
-          to: search.redirect || "/app/account/",
+          to: search.redirect || "/",
           search: {},
         });
       } else {
-        console.error(result.error);
+        throw redirect({
+          to: "/callback/auth/",
+          search: {
+            flow: "web",
+            scheme: search.scheme,
+            error: "exchange_failed",
+            error_description: result.error ?? undefined,
+          },
+        });
       }
     }
 
@@ -73,7 +81,15 @@ export const Route = createFileRoute("/_view/callback/auth")({
           },
         });
       } else {
-        console.error(result.error);
+        throw redirect({
+          to: "/callback/auth/",
+          search: {
+            flow: "desktop",
+            scheme: search.scheme,
+            error: "exchange_failed",
+            error_description: result.error ?? undefined,
+          },
+        });
       }
     }
 
@@ -90,7 +106,15 @@ export const Route = createFileRoute("/_view/callback/auth")({
         if (result.success) {
           throw redirect({ to: "/update-password/", search: {} });
         } else {
-          console.error(result.error);
+          throw redirect({
+            to: "/callback/auth/",
+            search: {
+              flow: search.flow,
+              scheme: search.scheme,
+              error: "exchange_failed",
+              error_description: result.error ?? undefined,
+            },
+          });
         }
       } else {
         const result = await exchangeOtpToken({
@@ -104,7 +128,7 @@ export const Route = createFileRoute("/_view/callback/auth")({
         if (result.success) {
           if (search.flow === "web") {
             throw redirect({
-              to: search.redirect || "/app/account/",
+              to: search.redirect || "/",
               search: {},
             });
           }
@@ -121,7 +145,15 @@ export const Route = createFileRoute("/_view/callback/auth")({
             });
           }
         } else {
-          console.error(result.error);
+          throw redirect({
+            to: "/callback/auth/",
+            search: {
+              flow: search.flow,
+              scheme: search.scheme,
+              error: "exchange_failed",
+              error_description: result.error ?? undefined,
+            },
+          });
         }
       }
     }
@@ -184,7 +216,7 @@ function Component() {
   useEffect(() => {
     if (search.flow === "web" && !search.error) {
       navigate({
-        to: search.redirect || "/app/account/",
+        to: search.redirect || "/",
         search: {},
         replace: true,
       });
diff --git a/apps/web/src/routes/_view/callback/billing.tsx b/apps/web/src/routes/_view/callback/billing.tsx
new file mode 100644
index 0000000000..ab084a9c4b
--- /dev/null
+++ b/apps/web/src/routes/_view/callback/billing.tsx
@@ -0,0 +1,102 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { CheckIcon, CopyIcon } from "lucide-react";
+import { useEffect, useState } from "react";
+import { z } from "zod";
+
+import { cn } from "@hypr/utils";
+
+import { desktopSchemeSchema } from "@/functions/desktop-flow";
+
+const validateSearch = z.object({
+  scheme: desktopSchemeSchema.optional(),
+});
+
+export const Route = createFileRoute("/_view/callback/billing")({
+  validateSearch,
+  component: Component,
+  head: () => ({
+    meta: [{ name: "robots", content: "noindex, nofollow" }],
+  }),
+});
+
+function Component() {
+  const search = Route.useSearch();
+  const scheme = search.scheme ?? "hyprnote";
+  const [copied, setCopied] = useState(false);
+
+  const deeplink = `${scheme}://billing/refresh`;
+
+  const handleDeeplink = () => {
+    window.location.href = deeplink;
+  };
+
+  const handleCopy = async () => {
+    await navigator.clipboard.writeText(deeplink);
+    setCopied(true);
+    setTimeout(() => setCopied(false), 2000);
+  };
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      window.location.href = deeplink;
+    }, 250);
+    return () => clearTimeout(timer);
+  }, [deeplink]);
+
+  return (
+    <div className="flex min-h-screen items-center justify-center bg-linear-to-b from-white via-stone-50/20 to-white p-6">
+      <div className="flex w-full max-w-md flex-col gap-8 text-center">
+        <div className="flex flex-col gap-3">
+          <h1 className="font-serif text-3xl tracking-tight text-stone-700">
+            Returning to Char
+          </h1>
+          <p className="text-neutral-600">
+            Click the button below if the app does not open automatically
+          </p>
+        </div>
+
+        <div className="flex flex-col gap-4">
+          <button
+            onClick={handleDeeplink}
+            className={cn([
+              "flex h-12 w-full cursor-pointer items-center justify-center text-base font-medium transition-all",
+              "rounded-full bg-linear-to-t from-stone-600 to-stone-500 text-white shadow-md hover:scale-[102%] hover:shadow-lg active:scale-[98%]",
+            ])}
+          >
+            Open Char
+          </button>
+
+          <button
+            onClick={handleCopy}
+            className={cn([
+              "flex w-full cursor-pointer flex-col items-center gap-3 p-4 text-left transition-all",
+              "rounded-lg border border-stone-100 bg-stone-50 hover:bg-stone-100 active:scale-[99%]",
+            ])}
+          >
+            <p className="text-sm text-stone-500">
+              Button not working? Copy the link instead
+            </p>
+            <span
+              className={cn([
+                "flex h-10 w-full items-center justify-center gap-2 text-sm font-medium",
+                "rounded-full bg-linear-to-t from-neutral-200 to-neutral-100 text-neutral-900 shadow-xs",
+              ])}
+            >
+              {copied ? (
+                <>
+                  <CheckIcon className="size-4" />
+                  Copied!
+                </>
+              ) : (
+                <>
+                  <CopyIcon className="size-4" />
+                  Copy URL
+                </>
+              )}
+            </span>
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/routes/_view/callback/integration.tsx b/apps/web/src/routes/_view/callback/integration.tsx
index 5283b0d0c2..4128c5aa39 100644
--- a/apps/web/src/routes/_view/callback/integration.tsx
+++ b/apps/web/src/routes/_view/callback/integration.tsx
@@ -82,7 +82,7 @@ function Component() {
       void queryClient.invalidateQueries({
         predicate: (query) => query.queryKey[0] === "integration-status",
       });
-      void navigate({ to: "/app/account/" });
+      void navigate({ to: "/" });
     }
   }, [search.flow, navigate, queryClient]);
 
diff --git a/apps/web/src/routes/_view/pricing.tsx b/apps/web/src/routes/_view/pricing.tsx
index 95f9056d8c..3d652cd52f 100644
--- a/apps/web/src/routes/_view/pricing.tsx
+++ b/apps/web/src/routes/_view/pricing.tsx
@@ -259,33 +259,17 @@ function PricingCard({ plan }: { plan: PricingPlan }) {
         </div>
 
         <div className="mt-auto pt-8">
-          {plan.price ? (
-            <Link
-              to="/app/checkout/"
-              search={{
-                plan: plan.name.toLowerCase() as "lite" | "pro",
-                period: "monthly",
-              }}
-              className={cn([
-                "flex h-10 w-full cursor-pointer items-center justify-center text-sm font-medium transition-all",
-                plan.popular
-                  ? "rounded-full bg-linear-to-t from-stone-600 to-stone-500 text-white shadow-md hover:scale-[102%] hover:shadow-lg active:scale-[98%]"
-                  : "rounded-full bg-linear-to-t from-neutral-200 to-neutral-100 text-neutral-900 shadow-xs hover:scale-[102%] hover:shadow-md active:scale-[98%]",
-              ])}
-            >
-              Get Started
-            </Link>
-          ) : (
-            <Link
-              to="/download/"
-              className={cn([
-                "flex h-10 w-full cursor-pointer items-center justify-center text-sm font-medium transition-all",
-                "rounded-full bg-linear-to-t from-neutral-200 to-neutral-100 text-neutral-900 shadow-xs hover:scale-[102%] hover:shadow-md active:scale-[98%]",
-              ])}
-            >
-              Download for free
-            </Link>
-          )}
+          <Link
+            to="/download/"
+            className={cn([
+              "flex h-10 w-full cursor-pointer items-center justify-center text-sm font-medium transition-all",
+              plan.popular
+                ? "rounded-full bg-linear-to-t from-stone-600 to-stone-500 text-white shadow-md hover:scale-[102%] hover:shadow-lg active:scale-[98%]"
+                : "rounded-full bg-linear-to-t from-neutral-200 to-neutral-100 text-neutral-900 shadow-xs hover:scale-[102%] hover:shadow-md active:scale-[98%]",
+            ])}
+          >
+            {plan.price ? "Get Started" : "Download for free"}
+          </Link>
         </div>
       </div>
     </div>
diff --git a/apps/web/src/routes/auth.tsx b/apps/web/src/routes/auth.tsx
index 8ee38bf9ac..f0df8cf186 100644
--- a/apps/web/src/routes/auth.tsx
+++ b/apps/web/src/routes/auth.tsx
@@ -40,7 +40,7 @@ export const Route = createFileRoute("/auth")({
         search.flow === "web" && !!search.provider;
 
       if (search.flow === "web" && !shouldReauthWithProvider) {
-        throw redirect({ to: search.redirect || "/app/account/" } as any);
+        throw redirect({ to: search.redirect || "/" } as any);
       }
 
       if (search.flow === "desktop") {
@@ -557,7 +557,7 @@ function handlePasswordSuccess(
     params.set("refresh_token", refreshToken);
     window.location.href = `/callback/auth?${params.toString()}`;
   } else {
-    window.location.href = redirectPath || "/app/account/";
+    window.location.href = redirectPath || "/";
   }
 }
 
diff --git a/packages/pricing/src/plan-grid.tsx b/packages/pricing/src/plan-grid.tsx
index 64ae8d769e..7c9f341acf 100644
--- a/packages/pricing/src/plan-grid.tsx
+++ b/packages/pricing/src/plan-grid.tsx
@@ -1,4 +1,4 @@
-import { CheckCircle2, Construction, XCircle } from "lucide-react";
+import { CheckCircle2, Construction, RefreshCw, XCircle } from "lucide-react";
 import type { ReactNode } from "react";
 
 import { cn } from "@hypr/utils";
@@ -19,6 +19,7 @@ export function PlanGrid({
   isPaid,
   renderAction,
   renderManageBilling,
+  onRefresh,
 }: {
   currentPlan: PlanTier;
   isTrialing: boolean;
@@ -27,6 +28,7 @@ export function PlanGrid({
   isPaid: boolean;
   renderAction: (tier: PlanTierData, action: TierAction) => ReactNode;
   renderManageBilling?: () => ReactNode;
+  onRefresh?: () => void;
 }) {
   const statusText = isTrialing
     ? `Pro trial${trialDaysRemaining != null ? ` \u2014 ${trialDaysRemaining} day${trialDaysRemaining === 1 ? "" : "s"} left` : ""}`
@@ -39,7 +41,19 @@ export function PlanGrid({
           <h3 className="mb-2 font-serif text-lg font-semibold">
             Plan & Billing
           </h3>
-          <p className="text-sm text-neutral-600">{statusText}</p>
+          <div className="flex items-center gap-2">
+            <p className="text-sm text-neutral-600">{statusText}</p>
+            {onRefresh && (
+              <button
+                type="button"
+                onClick={onRefresh}
+                className="text-neutral-400 transition-colors hover:text-neutral-600"
+                aria-label="Refresh billing status"
+              >
+                <RefreshCw className="size-3" />
+              </button>
+            )}
+          </div>
         </div>
         {isPaid && renderManageBilling?.()}
       </div>