diff --git a/apps/code/src/renderer/features/inbox/components/DataSourceSetup.tsx b/apps/code/src/renderer/features/inbox/components/DataSourceSetup.tsx
index 406781f68..3f7dfeb9e 100644
--- a/apps/code/src/renderer/features/inbox/components/DataSourceSetup.tsx
+++ b/apps/code/src/renderer/features/inbox/components/DataSourceSetup.tsx
@@ -9,7 +9,8 @@ import {
   useGithubRepositories,
   useRepositoryIntegration,
 } from "@hooks/useIntegrations";
-import { Box, Button, Flex, Text, TextField } from "@radix-ui/themes";
+import { Button } from "@posthog/quill";
+import { Box, Flex, Text, TextField } from "@radix-ui/themes";
 import { trpcClient } from "@renderer/trpc";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
@@ -185,11 +186,18 @@ function GitHubSetup({ onComplete, onCancel }: SetupFormProps) {
             {statusMessage}
           </Text>
           <Flex gap="2" justify="end">
-            <Button size="2" variant="soft" onClick={onCancel}>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={onCancel}
+            >
               Cancel
             </Button>
             <Button
-              size="2"
+              type="button"
+              variant="primary"
+              size="sm"
               onClick={() => void handleConnectGitHub()}
               disabled={connecting}
             >
@@ -228,11 +236,19 @@ function GitHubSetup({ onComplete, onCancel }: SetupFormProps) {
         />
 
         <Flex gap="2" justify="end">
-          <Button size="2" variant="soft" onClick={onCancel} disabled={loading}>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={onCancel}
+            disabled={loading}
+          >
             Cancel
           </Button>
           <Button
-            size="2"
+            type="button"
+            variant="primary"
+            size="sm"
             onClick={handleSubmit}
             disabled={!repo || !selectedIntegrationId || loading}
           >
@@ -345,8 +361,9 @@ function LinearSetup({ onComplete }: SetupFormProps) {
     <SetupFormContainer title="Connect Linear">
       <Flex direction="column" gap="3">
         <Button
-          size="2"
-          variant="soft"
+          type="button"
+          variant="primary"
+          size="sm"
           onClick={handleOAuthConnect}
           disabled={loading || oauthConnected}
         >
@@ -363,7 +380,9 @@ function LinearSetup({ onComplete }: SetupFormProps) {
 
         <Flex gap="2" justify="end">
           <Button
-            size="2"
+            type="button"
+            variant="primary"
+            size="sm"
             onClick={handleSubmit}
             disabled={!oauthConnected || loading}
           >
@@ -436,11 +455,19 @@ function ZendeskSetup({ onComplete, onCancel }: SetupFormProps) {
         />
 
         <Flex gap="2" justify="end">
-          <Button size="2" variant="soft" onClick={onCancel} disabled={loading}>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={onCancel}
+            disabled={loading}
+          >
             Cancel
           </Button>
           <Button
-            size="2"
+            type="button"
+            variant="primary"
+            size="sm"
             onClick={handleSubmit}
             disabled={!canSubmit || loading}
           >
@@ -505,11 +532,19 @@ function PgAnalyzeSetup({ onComplete, onCancel }: SetupFormProps) {
         />
 
         <Flex gap="2" justify="end">
-          <Button size="2" variant="soft" onClick={onCancel} disabled={loading}>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={onCancel}
+            disabled={loading}
+          >
             Cancel
           </Button>
           <Button
-            size="2"
+            type="button"
+            variant="primary"
+            size="sm"
             onClick={handleSubmit}
             disabled={!canSubmit || loading}
           >
diff --git a/apps/code/src/renderer/features/inbox/components/InboxEmptyStates.tsx b/apps/code/src/renderer/features/inbox/components/InboxEmptyStates.tsx
index 66d1d572f..b4685a7e7 100644
--- a/apps/code/src/renderer/features/inbox/components/InboxEmptyStates.tsx
+++ b/apps/code/src/renderer/features/inbox/components/InboxEmptyStates.tsx
@@ -1,10 +1,9 @@
 import { AnimatedEllipsis } from "@features/inbox/components/utils/AnimatedEllipsis";
 import { SOURCE_PRODUCT_META } from "@features/inbox/components/utils/source-product-icons";
-import { ArrowDownIcon, CheckCircleIcon } from "@phosphor-icons/react";
+import { CheckCircleIcon } from "@phosphor-icons/react";
 import { Box, Button, Flex, Text, Tooltip } from "@radix-ui/themes";
 import builderHog from "@renderer/assets/images/hedgehogs/builder-hog-03.png";
 import explorerHog from "@renderer/assets/images/hedgehogs/explorer-hog.png";
-import graphsHog from "@renderer/assets/images/hedgehogs/graphs-hog.png";
 import mailHog from "@renderer/assets/images/mail-hog.png";
 import { ANALYTICS_EVENTS } from "@shared/types/analytics";
 import { track } from "@utils/analytics";
@@ -12,67 +11,6 @@ import { useState } from "react";
 
 // ── Full-width empty states ─────────────────────────────────────────────────
 
-export function WelcomePane({ onEnableInbox }: { onEnableInbox: () => void }) {
-  return (
-    <Flex
-      direction="column"
-      align="center"
-      justify="center"
-      height="100%"
-      px="5"
-    >
-      <Flex direction="column" align="center" className="max-w-[420px]">
-        <img src={graphsHog} alt="" className="mb-[16px] w-[120px]" />
-
-        <Text
-          align="center"
-          className="font-bold text-(--gray-12) text-lg leading-6.5"
-        >
-          Welcome to your Inbox
-        </Text>
-
-        <Flex
-          direction="column"
-          align="center"
-          gap="3"
-          mt="3"
-          className="max-w-[340px]"
-        >
-          <Text
-            align="center"
-            className="text-(--gray-11) text-[13px] leading-[1.35]"
-          >
-            <Text className="font-medium text-(--gray-12)">
-              Background analysis of your data — while you sleep.
-            </Text>
-            <br />
-            Session recordings watched automatically. Issues, tickets, and evals
-            analyzed around the clock.
-          </Text>
-
-          <ArrowDownIcon size={14} className="text-(--gray-8)" />
-
-          <Text
-            align="center"
-            className="text-(--gray-11) text-[13px] leading-[1.35]"
-          >
-            <Text className="font-medium text-(--gray-12)">
-              Ready-to-run fixes for real user problems.
-            </Text>
-            <br />
-            Each report includes evidence and impact numbers — just execute the
-            prompt in your agent.
-          </Text>
-        </Flex>
-
-        <Button size="2" onClick={onEnableInbox} className="mt-[20px]">
-          Enable Inbox
-        </Button>
-      </Flex>
-    </Flex>
-  );
-}
-
 export function WarmingUpPane({
   onConfigureSources,
   enabledProducts,
diff --git a/apps/code/src/renderer/features/inbox/components/InboxSetupPane.tsx b/apps/code/src/renderer/features/inbox/components/InboxSetupPane.tsx
new file mode 100644
index 000000000..aee373636
--- /dev/null
+++ b/apps/code/src/renderer/features/inbox/components/InboxSetupPane.tsx
@@ -0,0 +1,66 @@
+import { SignalSourcesSettings } from "@features/settings/components/sections/SignalSourcesSettings";
+import { ArrowRightIcon } from "@phosphor-icons/react";
+import { Button } from "@posthog/quill";
+import { Flex, Text, Tooltip } from "@radix-ui/themes";
+import { motion } from "framer-motion";
+
+interface InboxSetupPaneProps {
+  hasSignalSources: boolean;
+  onProceedToInbox: () => void;
+}
+
+export function InboxSetupPane({
+  hasSignalSources,
+  onProceedToInbox,
+}: InboxSetupPaneProps) {
+  return (
+    <Flex align="center" justify="center" height="100%" width="100%" px="6">
+      <Flex
+        direction="column"
+        gap="2"
+        className="w-full max-w-[720px] py-[24px]"
+      >
+        <motion.div
+          initial={{ opacity: 0, y: 8 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.3 }}
+        >
+          <Text className="font-bold text-(--gray-12) text-2xl">
+            Set up self-driving for your product
+          </Text>
+        </motion.div>
+
+        <motion.div
+          initial={{ opacity: 0, y: 8 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.3, delay: 0.05 }}
+        >
+          <SignalSourcesSettings />
+        </motion.div>
+
+        <Flex justify="end" mt="2">
+          {hasSignalSources ? (
+            <Button
+              type="button"
+              variant="primary"
+              size="sm"
+              onClick={onProceedToInbox}
+            >
+              Proceed to Inbox
+              <ArrowRightIcon size={14} />
+            </Button>
+          ) : (
+            <Tooltip content="Enable at least one source first">
+              <span className="inline-flex cursor-not-allowed">
+                <Button type="button" variant="primary" size="sm" disabled>
+                  Proceed to Inbox
+                  <ArrowRightIcon size={14} />
+                </Button>
+              </span>
+            </Tooltip>
+          )}
+        </Flex>
+      </Flex>
+    </Flex>
+  );
+}
diff --git a/apps/code/src/renderer/features/inbox/components/InboxSignalsTab.tsx b/apps/code/src/renderer/features/inbox/components/InboxSignalsTab.tsx
index 480377488..57f2e8094 100644
--- a/apps/code/src/renderer/features/inbox/components/InboxSignalsTab.tsx
+++ b/apps/code/src/renderer/features/inbox/components/InboxSignalsTab.tsx
@@ -4,8 +4,8 @@ import {
   SelectReportPane,
   SkeletonBackdrop,
   WarmingUpPane,
-  WelcomePane,
 } from "@features/inbox/components/InboxEmptyStates";
+import { InboxSetupPane } from "@features/inbox/components/InboxSetupPane";
 import { InboxSourcesDialog } from "@features/inbox/components/InboxSourcesDialog";
 import {
   inboxBulkSnoozeDisabledReason,
@@ -475,11 +475,25 @@ export function InboxSignalsTab() {
     sourceProductFilter.length > 0 ||
     suggestedReviewerFilter.length > 0 ||
     statusFilter.length < 5;
+  // Onboarding wins over two-pane even if the user has suggested setup tasks —
+  // discovered tasks alone shouldn't push a source-less user past the inline setup.
+  const onboardingShouldShow = !hasReports && !hasSignalSources;
+  // Sticky within an inbox visit: once we've entered onboarding, keep showing
+  // it even after the user toggles a source on, until either they explicitly
+  // click "Proceed to Inbox" or navigate away (unmount resets the ref).
+  const enteredOnboardingRef = useRef(false);
+  if (onboardingShouldShow) {
+    enteredOnboardingRef.current = true;
+  }
+  const [userExitedOnboarding, setUserExitedOnboarding] = useState(false);
+  const showInboxOnboarding =
+    enteredOnboardingRef.current && !userExitedOnboarding;
   const shouldShowTwoPane =
-    hasReports ||
-    !!searchQuery.trim() ||
-    hasActiveFilters ||
-    hasDiscoveredTasks;
+    !showInboxOnboarding &&
+    (hasReports ||
+      !!searchQuery.trim() ||
+      hasActiveFilters ||
+      hasDiscoveredTasks);
 
   // Sticky: once we enter two-pane mode, stay there even if a refetch
   // momentarily empties the list (e.g. when sort order changes).
@@ -686,7 +700,19 @@ export function InboxSignalsTab() {
 
   return (
     <>
-      {showTwoPaneLayout ? (
+      {showInboxOnboarding ? (
+        // Inline setup pane for users with no sources configured.
+        // The toolbar (report counter, search, bulk actions) is suppressed
+        // entirely — none of it is meaningful before any source is configured.
+        // Sticky within the visit: stays until the user clicks "Proceed to
+        // Inbox" inside the pane or navigates away.
+        <ScrollArea className="h-full">
+          <InboxSetupPane
+            hasSignalSources={hasSignalSources}
+            onProceedToInbox={() => setUserExitedOnboarding(true)}
+          />
+        </ScrollArea>
+      ) : showTwoPaneLayout ? (
         <Flex ref={containerRef} height="100%" className="min-h-0">
           {/* ── Left pane: report list ───────────────────────────────── */}
           <Box
@@ -831,7 +857,7 @@ export function InboxSignalsTab() {
           </Flex>
         </Flex>
       ) : (
-        /* ── Full-width empty state with skeleton backdrop ──────── */
+        // Full-width warming-up state with skeleton backdrop
         <Box className="relative h-full">
           <Flex direction="column">
             <SignalsToolbar
@@ -853,14 +879,10 @@ export function InboxSignalsTab() {
             className="pointer-events-none absolute inset-0 flex items-center justify-center"
           >
             <Box className="pointer-events-auto">
-              {!hasSignalSources || !hasGithubIntegration ? (
-                <WelcomePane onEnableInbox={() => setSourcesDialogOpen(true)} />
-              ) : (
-                <WarmingUpPane
-                  onConfigureSources={() => setSourcesDialogOpen(true)}
-                  enabledProducts={enabledProducts}
-                />
-              )}
+              <WarmingUpPane
+                onConfigureSources={() => setSourcesDialogOpen(true)}
+                enabledProducts={enabledProducts}
+              />
             </Box>
           </Box>
         </Box>
diff --git a/apps/code/src/renderer/features/inbox/components/SignalSourceToggles.tsx b/apps/code/src/renderer/features/inbox/components/SignalSourceToggles.tsx
index f727f2308..f295ed602 100644
--- a/apps/code/src/renderer/features/inbox/components/SignalSourceToggles.tsx
+++ b/apps/code/src/renderer/features/inbox/components/SignalSourceToggles.tsx
@@ -11,15 +11,8 @@ import {
   TicketIcon,
   VideoIcon,
 } from "@phosphor-icons/react";
-import {
-  Box,
-  Button,
-  Flex,
-  Spinner,
-  Switch,
-  Text,
-  Tooltip,
-} from "@radix-ui/themes";
+import { Button } from "@posthog/quill";
+import { Box, Flex, Spinner, Switch, Text, Tooltip } from "@radix-ui/themes";
 import type { SignalSourceConfig } from "@renderer/api/posthogClient";
 import { memo, useCallback } from "react";
 
@@ -140,7 +133,9 @@ const SignalSourceToggleCard = memo(function SignalSourceToggleCard({
           <Spinner size="2" />
         ) : requiresSetup ? (
           <Button
-            size="1"
+            type="button"
+            variant="primary"
+            size="sm"
             onClick={(e) => {
               e.stopPropagation();
               onSetup?.();
@@ -215,7 +210,9 @@ export const EvaluationsSection = memo(function EvaluationsSection({
           </Flex>
         </Flex>
         <Button
-          size="1"
+          type="button"
+          variant="primary"
+          size="sm"
           onClick={(e) => {
             e.stopPropagation();
             window.open(evaluationsUrl, "_blank", "noopener");
diff --git a/apps/code/src/renderer/features/settings/components/sections/GitHubIntegrationSection.tsx b/apps/code/src/renderer/features/settings/components/sections/GitHubIntegrationSection.tsx
index 4786b8037..7944f0e49 100644
--- a/apps/code/src/renderer/features/settings/components/sections/GitHubIntegrationSection.tsx
+++ b/apps/code/src/renderer/features/settings/components/sections/GitHubIntegrationSection.tsx
@@ -10,7 +10,8 @@ import {
   GitBranchIcon,
   InfoIcon,
 } from "@phosphor-icons/react";
-import { Box, Button, Flex, Spinner, Text, Tooltip } from "@radix-ui/themes";
+import { Button } from "@posthog/quill";
+import { Box, Flex, Spinner, Text, Tooltip } from "@radix-ui/themes";
 import { useMemo } from "react";
 
 /**
@@ -131,23 +132,29 @@ export function GitHubIntegrationSection({
       </Flex>
       {connecting ? (
         <Spinner size="2" />
-      ) : hasGithubIntegration ? (
+      ) : (
         <Flex align="center" gap="2">
-          <CheckCircleIcon
-            size={16}
-            weight="fill"
-            className="text-(--green-9)"
-          />
-          <Button size="1" variant="soft" onClick={() => void handleConnect()}>
-            Update in GitHub
+          {hasGithubIntegration ? (
+            <CheckCircleIcon
+              size={16}
+              weight="fill"
+              className="text-(--green-9)"
+            />
+          ) : null}
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => void handleConnect()}
+          >
+            {hasGithubIntegration
+              ? "Update in GitHub"
+              : hasConnectError || timedOut
+                ? "Try again"
+                : "Connect GitHub"}
             <ArrowSquareOutIcon size={12} />
           </Button>
         </Flex>
-      ) : (
-        <Button size="1" onClick={() => void handleConnect()}>
-          {hasConnectError || timedOut ? "Try again" : "Connect GitHub"}
-          <ArrowSquareOutIcon size={12} />
-        </Button>
       )}
     </Flex>
   );
diff --git a/apps/code/src/renderer/features/settings/components/sections/SignalSlackNotificationsSettings.tsx b/apps/code/src/renderer/features/settings/components/sections/SignalSlackNotificationsSettings.tsx
index 99d66e784..7b0c6f297 100644
--- a/apps/code/src/renderer/features/settings/components/sections/SignalSlackNotificationsSettings.tsx
+++ b/apps/code/src/renderer/features/settings/components/sections/SignalSlackNotificationsSettings.tsx
@@ -7,6 +7,7 @@ import { SettingsOptionSelect } from "@features/settings/components/SettingsOpti
 import { useDebouncedValue } from "@hooks/useDebouncedValue";
 import { CaretDown, Hash, Lock } from "@phosphor-icons/react";
 import {
+  Button,
   Combobox,
   ComboboxContent,
   ComboboxEmpty,
@@ -14,9 +15,8 @@ import {
   ComboboxItem,
   ComboboxList,
   ComboboxTrigger,
-  Button as QuillButton,
 } from "@posthog/quill";
-import { Button, Callout, Flex, Text } from "@radix-ui/themes";
+import { Callout, Flex, Text } from "@radix-ui/themes";
 import type { SignalReportPriority, SlackChannelOption } from "@shared/types";
 import { useMemo, useRef, useState } from "react";
 
@@ -175,12 +175,14 @@ export function SignalSlackNotificationsSettings({
           </Text>
         </Flex>
         <Button
-          size="1"
-          variant="soft"
+          type="button"
+          variant="outline"
+          size="sm"
           disabled={slackConnect.isConnecting}
           onClick={() => {
             void slackConnect.connect();
           }}
+          className="w-fit"
         >
           {slackConnect.isConnecting
             ? "Waiting for Slack…"
@@ -300,10 +302,10 @@ export function SignalSlackNotificationsSettings({
 
   const connectWorkspaceButton = (
     <Button
-      size="1"
-      variant="ghost"
-      color="gray"
-      className="h-6 shrink-0 px-1"
+      type="button"
+      variant="outline"
+      size="sm"
+      className="shrink-0"
       disabled={slackConnect.isConnecting}
       onClick={() => {
         void slackConnect.connect();
@@ -379,7 +381,7 @@ export function SignalSlackNotificationsSettings({
             >
               <ComboboxTrigger
                 render={
-                  <QuillButton
+                  <Button
                     variant="outline"
                     size="sm"
                     disabled={!effectiveIntegrationId}
@@ -399,7 +401,7 @@ export function SignalSlackNotificationsSettings({
                       weight="bold"
                       className="shrink-0 text-muted-foreground"
                     />
-                  </QuillButton>
+                  </Button>
                 }
               />
               {channelComboboxModal ? (
diff --git a/apps/code/src/renderer/features/settings/components/sections/SignalSourcesSettings.tsx b/apps/code/src/renderer/features/settings/components/sections/SignalSourcesSettings.tsx
index 77b3e4614..b5034eab8 100644
--- a/apps/code/src/renderer/features/settings/components/sections/SignalSourcesSettings.tsx
+++ b/apps/code/src/renderer/features/settings/components/sections/SignalSourcesSettings.tsx
@@ -19,7 +19,7 @@ const PRIORITY_OPTIONS: { value: SignalReportPriority; label: string }[] = [
 const NEVER_VALUE = "__never__";
 
 const USER_PRIORITY_OPTIONS: { value: string; label: string }[] = [
-  { value: NEVER_VALUE, label: "Never — opt out of auto-assigned tasks" },
+  { value: NEVER_VALUE, label: "Never – opt out of auto-assigned tasks" },
   ...PRIORITY_OPTIONS,
 ];
 
@@ -59,9 +59,10 @@ export function SignalSourcesSettings({
 
   return (
     <Flex direction="column" gap="4">
-      <Text className="text-(--gray-11) text-[13px]">
-        Automatically analyze your product data and surface actionable insights.
-        Choose which sources to enable for this project.
+      <Text className="text-(--gray-11) text-sm">
+        Connect GitHub and pick which sources to monitor. PostHog Code will
+        analyze activity around the clock and surface ready-to-merge fixes and
+        improvements.
       </Text>
 
       <GitHubIntegrationSection hasGithubIntegration={hasGithubIntegration} />