diff --git a/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt b/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt
index d72c0e3269..a0382e02a2 100644
--- a/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt
+++ b/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt
@@ -221,7 +221,7 @@ class SessionPopupActivity : Activity() {
         followUpInput.hint = "Follow-up prompt"
         val okButton = findViewById<Button>(R.id.session_popup_secondary_button)
         val sendButton = findViewById<Button>(R.id.session_popup_primary_button)
-        okButton.text = "OK"
+        okButton.text = "Done"
         sendButton.text = "Send"
         okButton.setOnClickListener {
             dismissResultPopup(session, okButton, sendButton)
diff --git a/android/app/src/main/res/drawable/session_popup_primary_button_background.xml b/android/app/src/main/res/drawable/session_popup_primary_button_background.xml
new file mode 100644
index 0000000000..de4cbebec6
--- /dev/null
+++ b/android/app/src/main/res/drawable/session_popup_primary_button_background.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="@color/codex_session_popup_primary_button_background" />
+</shape>
diff --git a/android/app/src/main/res/drawable/session_popup_secondary_button_background.xml b/android/app/src/main/res/drawable/session_popup_secondary_button_background.xml
new file mode 100644
index 0000000000..51f769930a
--- /dev/null
+++ b/android/app/src/main/res/drawable/session_popup_secondary_button_background.xml
@@ -0,0 +1,8 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/codex_session_popup_secondary_button_border" />
+</shape>
diff --git a/android/app/src/main/res/layout/activity_session_popup.xml b/android/app/src/main/res/layout/activity_session_popup.xml
index b85a51cb20..28f42882b5 100644
--- a/android/app/src/main/res/layout/activity_session_popup.xml
+++ b/android/app/src/main/res/layout/activity_session_popup.xml
@@ -59,17 +59,13 @@
 
         <Button
             android:id="@+id/session_popup_secondary_button"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
+            style="@style/CodexSessionPopupSecondaryButton"
             android:text="Cancel" />
 
         <Button
             android:id="@+id/session_popup_primary_button"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/CodexSessionPopupPrimaryButton"
             android:layout_marginStart="8dp"
-            android:layout_weight="1"
             android:text="Send" />
     </LinearLayout>
 </LinearLayout>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index cfd5c9cc67..52ed7a8a91 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,3 +1,7 @@
 <resources>
     <color name="ic_launcher_background">#FFFFFFFF</color>
+    <color name="codex_session_popup_primary_button_background">#5F6867</color>
+    <color name="codex_session_popup_primary_button_text">#FFFFFFFF</color>
+    <color name="codex_session_popup_secondary_button_border">#C4C7C5</color>
+    <color name="codex_session_popup_secondary_button_text">#5F6867</color>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 3ef768129d..c8f83ce69c 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -10,4 +10,28 @@
         <item name="android:windowMinWidthMajor">90%</item>
         <item name="android:windowMinWidthMinor">90%</item>
     </style>
+
+    <style name="CodexSessionPopupButton">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:minHeight">40dp</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:paddingStart">20dp</item>
+        <item name="android:paddingEnd">20dp</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="CodexSessionPopupPrimaryButton" parent="@style/CodexSessionPopupButton">
+        <item name="android:background">@drawable/session_popup_primary_button_background</item>
+        <item name="android:textColor">@color/codex_session_popup_primary_button_text</item>
+    </style>
+
+    <style name="CodexSessionPopupSecondaryButton" parent="@style/CodexSessionPopupButton">
+        <item name="android:background">@drawable/session_popup_secondary_button_background</item>
+        <item name="android:textColor">@color/codex_session_popup_secondary_button_text</item>
+    </style>
 </resources>