diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt
index f9ff325e7..62da455aa 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt
@@ -36,9 +36,9 @@ fun StatusPill(
     onClick = onClick,
     modifier = modifier,
     shape = RoundedCornerShape(14.dp),
-    color = MaterialTheme.colorScheme.surface.copy(alpha = 0.86f),
-    shadowElevation = 10.dp,
-    border = BorderStroke(0.5.dp, Color.White.copy(alpha = 0.18f)),
+    color = MaterialTheme.colorScheme.surfaceContainer.copy(alpha = 0.92f),
+    shadowElevation = 3.dp,
+    border = BorderStroke(0.5.dp, Color.White.copy(alpha = 0.10f)),
   ) {
     Row(
       modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatComposer.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatComposer.kt
index 23cf59794..4cf60f641 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatComposer.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatComposer.kt
@@ -1,6 +1,5 @@
 package com.steipete.clawdis.node.ui.chat
 
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -61,10 +60,10 @@ fun ChatComposer(
   val canSend = pendingRunCount == 0 && (input.trim().isNotEmpty() || attachments.isNotEmpty()) && healthOk
 
   Surface(
-    shape = RoundedCornerShape(16.dp),
-    color = MaterialTheme.colorScheme.surfaceContainerHighest,
-    tonalElevation = 2.dp,
-    shadowElevation = 6.dp,
+    shape = MaterialTheme.shapes.large,
+    color = MaterialTheme.colorScheme.surfaceContainer,
+    tonalElevation = 0.dp,
+    shadowElevation = 0.dp,
   ) {
     Column(modifier = Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
       Row(
@@ -103,45 +102,37 @@ fun ChatComposer(
         AttachmentsStrip(attachments = attachments, onRemoveAttachment = onRemoveAttachment)
       }
 
-      Surface(
-        shape = RoundedCornerShape(12.dp),
-        color = MaterialTheme.colorScheme.surface,
-        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline.copy(alpha = 0.35f)),
-      ) {
-        Column(modifier = Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-          OutlinedTextField(
-            value = input,
-            onValueChange = { input = it },
-            modifier = Modifier.fillMaxWidth(),
-            placeholder = { Text("Message Clawd…") },
-            minLines = 2,
-            maxLines = 6,
-          )
+      OutlinedTextField(
+        value = input,
+        onValueChange = { input = it },
+        modifier = Modifier.fillMaxWidth(),
+        placeholder = { Text("Message Clawd…") },
+        minLines = 2,
+        maxLines = 6,
+      )
 
-          Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-            ConnectionPill(sessionKey = sessionKey, healthOk = healthOk)
-            Spacer(modifier = Modifier.weight(1f))
+      Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+        ConnectionPill(sessionKey = sessionKey, healthOk = healthOk)
+        Spacer(modifier = Modifier.weight(1f))
 
-            if (pendingRunCount > 0) {
-              FilledTonalIconButton(
-                onClick = onAbort,
-                colors =
-                  IconButtonDefaults.filledTonalIconButtonColors(
-                    containerColor = Color(0x33E74C3C),
-                    contentColor = Color(0xFFE74C3C),
-                  ),
-              ) {
-                Icon(Icons.Default.Stop, contentDescription = "Abort")
-              }
-            } else {
-              FilledTonalIconButton(onClick = {
-                val text = input
-                input = ""
-                onSend(text)
-              }, enabled = canSend) {
-                Icon(Icons.Default.ArrowUpward, contentDescription = "Send")
-              }
-            }
+        if (pendingRunCount > 0) {
+          FilledTonalIconButton(
+            onClick = onAbort,
+            colors =
+              IconButtonDefaults.filledTonalIconButtonColors(
+                containerColor = Color(0x33E74C3C),
+                contentColor = Color(0xFFE74C3C),
+              ),
+          ) {
+            Icon(Icons.Default.Stop, contentDescription = "Abort")
+          }
+        } else {
+          FilledTonalIconButton(onClick = {
+            val text = input
+            input = ""
+            onSend(text)
+          }, enabled = canSend) {
+            Icon(Icons.Default.ArrowUpward, contentDescription = "Send")
           }
         }
       }
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageListCard.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageListCard.kt
index 7acf71a7d..ef4138641 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageListCard.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageListCard.kt
@@ -57,12 +57,12 @@ fun ChatMessageListCard(
 
   Card(
     modifier = modifier.fillMaxWidth(),
-    shape = MaterialTheme.shapes.extraLarge,
+    shape = MaterialTheme.shapes.large,
     colors =
       CardDefaults.cardColors(
-        containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+        containerColor = MaterialTheme.colorScheme.surfaceContainer,
       ),
-    elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+    elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
   ) {
     Box(modifier = Modifier.fillMaxSize()) {
       LazyColumn(
@@ -120,10 +120,10 @@ private fun ChatStatusPill(
 ) {
   Surface(
     modifier = modifier,
-    shape = MaterialTheme.shapes.extraLarge,
-    color = MaterialTheme.colorScheme.surface.copy(alpha = 0.90f),
-    shadowElevation = 4.dp,
-    tonalElevation = 2.dp,
+    shape = MaterialTheme.shapes.large,
+    color = MaterialTheme.colorScheme.surfaceContainerHighest.copy(alpha = 0.96f),
+    shadowElevation = 1.dp,
+    tonalElevation = 0.dp,
   ) {
     Row(
       modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp),