diff --git a/package-lock.json b/package-lock.json
index 855c5dc..1ad0358 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "pinchchat",
-  "version": "1.63.1",
+  "version": "1.63.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pinchchat",
-      "version": "1.63.1",
+      "version": "1.63.2",
       "license": "MIT",
       "dependencies": {
         "@tailwindcss/vite": "^4.1.18",
diff --git a/package.json b/package.json
index 58082d3..0a7ce2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pinchchat",
-  "version": "1.63.1",
+  "version": "1.63.2",
   "description": "A sleek, dark-themed webchat UI for OpenClaw — monitor sessions, stream responses, and inspect tool calls in real-time.",
   "type": "module",
   "repository": {
diff --git a/src/components/ChatMessage.tsx b/src/components/ChatMessage.tsx
index e4278c8..d15d459 100644
--- a/src/components/ChatMessage.tsx
+++ b/src/components/ChatMessage.tsx
@@ -540,20 +540,20 @@ export const ChatMessageComponent = memo(function ChatMessageComponent({ message
                 <Bookmark size={12} className={isBookmarked ? 'fill-amber-400' : ''} />
               </button>
             )}
+            {isUser && onRetry && (
+              <button
+                onClick={() => onRetry(getPlainText(message))}
+                className={`h-6 w-6 rounded-md flex items-center justify-center transition-colors ${message.sendStatus === 'error' ? 'text-red-400' : 'text-pc-text-faint hover:text-pc-accent-light'}`}
+                title={t('message.retry')}
+                aria-label={t('message.retry')}
+              >
+                <RefreshCw size={12} />
+              </button>
+            )}
             <MetadataViewer metadata={message.metadata} />
             <RawJsonToggle isOpen={showRawJson} onToggle={() => setShowRawJson(o => !o)} />
           </div>
-          {/* Retry button (user messages only) */}
-          {isUser && onRetry && (
-            <button
-              onClick={() => onRetry(getPlainText(message))}
-              className={`absolute -top-3 right-2 h-7 w-7 rounded-lg border border-pc-border bg-pc-elevated/80 backdrop-blur-sm flex items-center justify-center text-pc-text-secondary hover:text-pc-accent-light hover:border-[var(--pc-accent-dim)] transition-all ${message.sendStatus === 'error' ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'}`}
-              title={t('message.retry')}
-              aria-label={t('message.retry')}
-            >
-              <RefreshCw size={13} className={message.sendStatus === 'error' ? 'text-red-400' : ''} />
-            </button>
-          )}
+          {/* Retry button moved into the action toolbar below */}
           {/* User-visible text */}
           {!isUser ? (
             <CollapsibleContent content={message.content || ''} isStreaming={message.isStreaming}>