From a630986d069b1aaea58456b369bf928d0fee03cf Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 27 May 2026 12:30:41 +0700
Subject: [PATCH] Align user message footer controls

---
 packages/app/src/components/message.tsx            | 9 +++------
 packages/app/src/components/rewind/rewind-menu.tsx | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 0f0c3a3f4..4dbee1b49 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -411,13 +411,10 @@ const userMessageStylesheet = StyleSheet.create((theme) => ({
   },
   copyButton: {
     alignSelf: "center",
-    width: 24,
-    height: 24,
-    padding: 0,
-    margin: 0,
+    padding: theme.spacing[1],
+    paddingTop: theme.spacing[1],
+    marginTop: 0,
     marginRight: -theme.spacing[1],
-    alignItems: "center",
-    justifyContent: "center",
   },
   trailingRow: {
     alignSelf: "flex-end",
diff --git a/packages/app/src/components/rewind/rewind-menu.tsx b/packages/app/src/components/rewind/rewind-menu.tsx
index 5b1b80e94..c603b4d22 100644
--- a/packages/app/src/components/rewind/rewind-menu.tsx
+++ b/packages/app/src/components/rewind/rewind-menu.tsx
@@ -137,8 +137,8 @@ export const RewindMenu = memo(function RewindMenu({
 
 const styles = StyleSheet.create((theme) => ({
   trigger: {
-    width: 24,
-    height: 24,
+    padding: theme.spacing[1],
+    paddingTop: theme.spacing[1],
     alignItems: "center",
     justifyContent: "center",
     backgroundColor: "transparent",
@@ -147,7 +147,7 @@ const styles = StyleSheet.create((theme) => ({
     opacity: theme.opacity[50],
   },
   triggerSlot: {
-    alignSelf: "flex-start",
+    alignSelf: "center",
   },
   tooltipText: {
     color: theme.colors.foreground,