diff --git a/apps/macos/Sources/Clawdis/Onboarding.swift b/apps/macos/Sources/Clawdis/Onboarding.swift
index efaf12276..496989430 100644
--- a/apps/macos/Sources/Clawdis/Onboarding.swift
+++ b/apps/macos/Sources/Clawdis/Onboarding.swift
@@ -1134,7 +1134,7 @@ struct OnboardingView: View {
             .buttonStyle(.borderedProminent)
         }
         .padding(.horizontal, 28)
-        .padding(.bottom, 36)
+        .padding(.bottom, 16)
         .frame(minHeight: 60)
     }
 
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift
index 3f6793e9e..87e009a07 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift
@@ -9,9 +9,10 @@ private enum ChatUIConstants {
 @MainActor
 struct ChatMessageBubble: View {
     let message: ClawdisChatMessage
+    let style: ClawdisChatView.Style
 
     var body: some View {
-        ChatMessageBody(message: self.message, isUser: self.isUser)
+        ChatMessageBody(message: self.message, isUser: self.isUser, style: self.style)
             .frame(maxWidth: ChatUIConstants.bubbleMaxWidth, alignment: self.isUser ? .trailing : .leading)
             .frame(maxWidth: .infinity, alignment: self.isUser ? .trailing : .leading)
             .padding(.horizontal, 2)
@@ -24,6 +25,7 @@ struct ChatMessageBubble: View {
 private struct ChatMessageBody: View {
     let message: ClawdisChatMessage
     let isUser: Bool
+    let style: ClawdisChatView.Style
 
     var body: some View {
         let text = self.primaryText
@@ -87,7 +89,14 @@ private struct ChatMessageBody: View {
     }
 
     private var bubbleBackground: AnyShapeStyle {
-        let fill = self.isUser ? ClawdisChatTheme.userBubble : ClawdisChatTheme.assistantBubble
+        let fill: Color
+        if self.isUser {
+            fill = ClawdisChatTheme.userBubble
+        } else if self.style == .onboarding {
+            fill = ClawdisChatTheme.card
+        } else {
+            fill = ClawdisChatTheme.assistantBubble
+        }
         return AnyShapeStyle(fill)
     }
 
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
index c20959265..5f9a34445 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
@@ -70,7 +70,7 @@ public struct ClawdisChatView: View {
             ScrollView {
                 LazyVStack(spacing: Layout.messageSpacing) {
                     ForEach(self.visibleMessages) { msg in
-                        ChatMessageBubble(message: msg)
+                        ChatMessageBubble(message: msg, style: self.style)
                             .frame(
                                 maxWidth: .infinity,
                                 alignment: msg.role.lowercased() == "user" ? .trailing : .leading)