diff --git a/web-app/src/components/ui/__tests__/button.test.tsx b/web-app/src/components/ui/__tests__/button.test.tsx
index 187bb4403d..219e7d8a18 100644
--- a/web-app/src/components/ui/__tests__/button.test.tsx
+++ b/web-app/src/components/ui/__tests__/button.test.tsx
@@ -1,61 +1,71 @@
+import React from 'react'
 import { render, screen, fireEvent } from '@testing-library/react'
 import { describe, it, expect, vi } from 'vitest'
 import userEvent from '@testing-library/user-event'
+import '@testing-library/jest-dom'
 import { Button } from '../button'
 
 describe('Button', () => {
   it('renders button with children', () => {
     render(<Button>Click me</Button>)
-    
+
     expect(screen.getByRole('button')).toBeInTheDocument()
     expect(screen.getByText('Click me')).toBeInTheDocument()
   })
 
   it('applies default variant classes', () => {
     render(<Button>Default Button</Button>)
-    
+
     const button = screen.getByRole('button')
-    expect(button).toHaveClass('bg-primary', 'text-primary-fg', 'hover:bg-primary/90')
+    expect(button).toHaveClass(
+      'bg-primary',
+      'text-primary-fg',
+      'hover:bg-primary/90'
+    )
   })
 
   it('applies destructive variant classes', () => {
     render(<Button variant="destructive">Destructive Button</Button>)
-    
+
     const button = screen.getByRole('button')
-    expect(button).toHaveClass('bg-destructive', 'text-destructive-fg', 'hover:bg-destructive/90')
+    expect(button).toHaveClass(
+      'bg-destructive',
+      'text-destructive-fg',
+      'hover:bg-destructive/90'
+    )
   })
 
   it('applies link variant classes', () => {
     render(<Button variant="link">Link Button</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('underline-offset-4', 'hover:no-underline')
   })
 
   it('applies default size classes', () => {
     render(<Button>Default Size</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('h-7', 'px-3', 'py-2')
   })
 
   it('applies small size classes', () => {
     render(<Button size="sm">Small Button</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('h-6', 'px-2')
   })
 
   it('applies large size classes', () => {
     render(<Button size="lg">Large Button</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('h-9', 'rounded-md', 'px-4')
   })
 
   it('applies icon size classes', () => {
     render(<Button size="icon">Icon</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('size-8')
   })
@@ -63,51 +73,62 @@ describe('Button', () => {
   it('handles click events', async () => {
     const handleClick = vi.fn()
     const user = userEvent.setup()
-    
+
     render(<Button onClick={handleClick}>Click me</Button>)
-    
+
     await user.click(screen.getByRole('button'))
-    
+
     expect(handleClick).toHaveBeenCalledTimes(1)
   })
 
   it('can be disabled', () => {
     render(<Button disabled>Disabled Button</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toBeDisabled()
-    expect(button).toHaveClass('disabled:pointer-events-none', 'disabled:opacity-50')
+    expect(button).toHaveClass(
+      'disabled:pointer-events-none',
+      'disabled:opacity-50'
+    )
   })
 
   it('does not trigger click when disabled', async () => {
     const handleClick = vi.fn()
     const user = userEvent.setup()
-    
-    render(<Button disabled onClick={handleClick}>Disabled Button</Button>)
-    
+
+    render(
+      <Button disabled onClick={handleClick}>
+        Disabled Button
+      </Button>
+    )
+
     await user.click(screen.getByRole('button'))
-    
+
     expect(handleClick).not.toHaveBeenCalled()
   })
 
   it('forwards ref correctly', () => {
     const ref = vi.fn()
-    
+
     render(<Button ref={ref}>Button with ref</Button>)
-    
+
     expect(ref).toHaveBeenCalledWith(expect.any(HTMLButtonElement))
   })
 
   it('accepts custom className', () => {
     render(<Button className="custom-class">Custom Button</Button>)
-    
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('custom-class')
   })
 
   it('accepts custom props', () => {
-    render(<Button data-testid="custom-button" type="submit">Custom Button</Button>)
-    
+    render(
+      <Button data-testid="custom-button" type="submit">
+        Custom Button
+      </Button>
+    )
+
     const button = screen.getByTestId('custom-button')
     expect(button).toHaveAttribute('type', 'submit')
   })
@@ -118,15 +139,19 @@ describe('Button', () => {
         <a href="/test">Link Button</a>
       </Button>
     )
-    
+
     const link = screen.getByRole('link')
     expect(link).toHaveAttribute('href', '/test')
     expect(link).toHaveClass('bg-primary', 'text-primary-fg') // Should inherit button classes
   })
 
   it('combines variant and size classes correctly', () => {
-    render(<Button variant="destructive" size="lg">Large Destructive Button</Button>)
-    
+    render(
+      <Button variant="destructive" size="lg">
+        Large Destructive Button
+      </Button>
+    )
+
     const button = screen.getByRole('button')
     expect(button).toHaveClass('bg-destructive', 'text-destructive-fg') // destructive variant
     expect(button).toHaveClass('h-9', 'rounded-md', 'px-4') // large size
@@ -134,35 +159,45 @@ describe('Button', () => {
 
   it('handles keyboard events', () => {
     const handleKeyDown = vi.fn()
-    
+
     render(<Button onKeyDown={handleKeyDown}>Keyboard Button</Button>)
-    
+
     const button = screen.getByRole('button')
     fireEvent.keyDown(button, { key: 'Enter' })
-    
-    expect(handleKeyDown).toHaveBeenCalledWith(expect.objectContaining({
-      key: 'Enter'
-    }))
+
+    expect(handleKeyDown).toHaveBeenCalledWith(
+      expect.objectContaining({
+        key: 'Enter',
+      })
+    )
   })
 
   it('supports focus events', () => {
     const handleFocus = vi.fn()
     const handleBlur = vi.fn()
-    
-    render(<Button onFocus={handleFocus} onBlur={handleBlur}>Focus Button</Button>)
-    
+
+    render(
+      <Button onFocus={handleFocus} onBlur={handleBlur}>
+        Focus Button
+      </Button>
+    )
+
     const button = screen.getByRole('button')
     fireEvent.focus(button)
     fireEvent.blur(button)
-    
+
     expect(handleFocus).toHaveBeenCalledTimes(1)
     expect(handleBlur).toHaveBeenCalledTimes(1)
   })
 
   it('applies focus-visible styling', () => {
     render(<Button>Focus Button</Button>)
-    
+
     const button = screen.getByRole('button')
-    expect(button).toHaveClass('focus-visible:border-ring', 'focus-visible:ring-ring/50')
+    expect(button).toHaveClass(
+      'focus-visible:border-primary',
+      'focus-visible:ring-2',
+      'focus-visible:ring-primary/60'
+    )
   })
-})
\ No newline at end of file
+})
diff --git a/web-app/src/components/ui/button.tsx b/web-app/src/components/ui/button.tsx
index bface0830d..46110406f9 100644
--- a/web-app/src/components/ui/button.tsx
+++ b/web-app/src/components/ui/button.tsx
@@ -5,13 +5,18 @@ import { cva, type VariantProps } from 'class-variance-authority'
 import { cn } from '@/lib/utils'
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[0px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive cursor-pointer focus:outline-none",
+  cn(
+    "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none aria-invalid:ring-destructive/60 aria-invalid:border-destructive cursor-pointer",
+    'focus:border-accent focus:ring-2 focus:ring-accent/50 focus:accent-[0px]',
+    'focus-visible:border-accent focus-visible:ring-2 focus-visible:ring-accent/50 focus-visible:accent-[0px]'
+  ),
   {
     variants: {
       variant: {
-        default: 'bg-primary text-primary-fg shadow-xs hover:bg-primary/90',
+        default:
+          'bg-primary text-primary-fg shadow-xs hover:bg-primary/90 focus-visible:ring-primary/60 focus:ring-primary/60 focus:border-primary focus-visible:border-primary',
         destructive:
-          'bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 text-destructive-fg',
+          'bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/60 text-destructive-fg focus:border-destructive focus:ring-destructive/60',
         link: 'underline-offset-4 hover:no-underline',
       },
       size: {
diff --git a/web-app/src/containers/ThreadContent.tsx b/web-app/src/containers/ThreadContent.tsx
index 69f4402fdf..716c6bfc4b 100644
--- a/web-app/src/containers/ThreadContent.tsx
+++ b/web-app/src/containers/ThreadContent.tsx
@@ -104,13 +104,13 @@ const EditDialog = ({
           </TooltipContent>
         </Tooltip>
       </DialogTrigger>
-      <DialogContent className="w-3/4 h-3/4">
+      <DialogContent className="w-3/4">
         <DialogHeader>
           <DialogTitle>{t('common:dialogs.editMessage.title')}</DialogTitle>
           <Textarea
             value={draft}
             onChange={(e) => setDraft(e.target.value)}
-            className="mt-2 resize-none h-full w-full"
+            className="mt-2 resize-none w-full"
             onKeyDown={(e) => {
               // Prevent key from being captured by parent components
               e.stopPropagation()
diff --git a/web-app/src/containers/dialogs/ToolApproval.tsx b/web-app/src/containers/dialogs/ToolApproval.tsx
index da4690d9aa..57b54e4a1d 100644
--- a/web-app/src/containers/dialogs/ToolApproval.tsx
+++ b/web-app/src/containers/dialogs/ToolApproval.tsx
@@ -19,7 +19,7 @@ export default function ToolApproval() {
     return null
   }
 
-  const { toolName, onApprove, onDeny } = modalProps
+  const { toolName, toolParameters, onApprove, onDeny } = modalProps
 
   const handleAllowOnce = () => {
     onApprove(true) // true = allow once only
@@ -58,7 +58,20 @@ export default function ToolApproval() {
           </div>
         </DialogHeader>
 
-        <div className="bg-main-view-fg/8 p-2 border border-main-view-fg/5 rounded-lg">
+        {toolParameters && Object.keys(toolParameters).length > 0 && (
+          <div className="bg-main-view-fg/4 p-2 border border-main-view-fg/5 rounded-lg">
+            <h4 className="text-sm font-medium text-main-view-fg mb-2">
+              {t('tools:toolApproval.parameters')}
+            </h4>
+            <div className="bg-main-view-fg/6 rounded-md p-2 text-sm font-mono border border-main-view-fg/5">
+              <pre className="text-main-view-fg/80 whitespace-pre-wrap break-words">
+                {JSON.stringify(toolParameters, null, 2)}
+              </pre>
+            </div>
+          </div>
+        )}
+
+        <div className="bg-main-view-fg/1 p-2 border border-main-view-fg/5 rounded-lg">
           <p className="text-sm text-main-view-fg/70 leading-relaxed">
             {t('tools:toolApproval.securityNotice')}
           </p>
@@ -80,7 +93,7 @@ export default function ToolApproval() {
             >
               {t('tools:toolApproval.allowOnce')}
             </Button>
-            <Button variant="default" onClick={handleAllow}>
+            <Button variant="default" onClick={handleAllow} autoFocus>
               {t('tools:toolApproval.alwaysAllow')}
             </Button>
           </div>
diff --git a/web-app/src/hooks/useToolApproval.ts b/web-app/src/hooks/useToolApproval.ts
index 0428c8ca43..5edc5dddc7 100644
--- a/web-app/src/hooks/useToolApproval.ts
+++ b/web-app/src/hooks/useToolApproval.ts
@@ -5,6 +5,7 @@ import { localStorageKey } from '@/constants/localStorage'
 export type ToolApprovalModalProps = {
   toolName: string
   threadId: string
+  toolParameters?: object
   onApprove: (allowOnce: boolean) => void
   onDeny: () => void
 }
@@ -21,7 +22,7 @@ type ToolApprovalState = {
   // Actions
   approveToolForThread: (threadId: string, toolName: string) => void
   isToolApproved: (threadId: string, toolName: string) => boolean
-  showApprovalModal: (toolName: string, threadId: string) => Promise<boolean>
+  showApprovalModal: (toolName: string, threadId: string, toolParameters?: object) => Promise<boolean>
   closeModal: () => void
   setModalOpen: (open: boolean) => void
   setAllowAllMCPPermissions: (allow: boolean) => void
@@ -52,7 +53,7 @@ export const useToolApproval = create<ToolApprovalState>()(
         return state.approvedTools[threadId]?.includes(toolName) || false
       },
 
-      showApprovalModal: (toolName: string, threadId: string) => {
+      showApprovalModal: (toolName: string, threadId: string, toolParameters?: object) => {
         return new Promise<boolean>((resolve) => {
           // Check if tool is already approved for this thread
           const state = get()
@@ -66,6 +67,7 @@ export const useToolApproval = create<ToolApprovalState>()(
             modalProps: {
               toolName,
               threadId,
+              toolParameters,
               onApprove: (allowOnce: boolean) => {
                 if (!allowOnce) {
                   // If not "allow once", add to approved tools for this thread
diff --git a/web-app/src/lib/completion.ts b/web-app/src/lib/completion.ts
index 5f5bb5c1c7..22ac724e97 100644
--- a/web-app/src/lib/completion.ts
+++ b/web-app/src/lib/completion.ts
@@ -329,7 +329,11 @@ export const postMessageProcessing = async (
   message: ThreadMessage,
   abortController: AbortController,
   approvedTools: Record<string, string[]> = {},
-  showModal?: (toolName: string, threadId: string) => Promise<boolean>,
+  showModal?: (
+    toolName: string,
+    threadId: string,
+    toolParameters?: object
+  ) => Promise<boolean>,
   allowAllMCPPermissions: boolean = false
 ) => {
   // Handle completed tool calls
@@ -358,11 +362,23 @@ export const postMessageProcessing = async (
       }
 
       // Check if tool is approved or show modal for approval
+      let toolParameters = {}
+      if (toolCall.function.arguments.length) {
+        try {
+          toolParameters = JSON.parse(toolCall.function.arguments)
+        } catch (error) {
+          console.error('Failed to parse tool arguments:', error)
+        }
+      }
       const approved =
         allowAllMCPPermissions ||
         approvedTools[message.thread_id]?.includes(toolCall.function.name) ||
         (showModal
-          ? await showModal(toolCall.function.name, message.thread_id)
+          ? await showModal(
+              toolCall.function.name,
+              message.thread_id,
+              toolParameters
+            )
           : true)
 
       let result = approved
diff --git a/web-app/src/locales/de-DE/tool-approval.json b/web-app/src/locales/de-DE/tool-approval.json
index b90c345a00..3303abaadd 100644
--- a/web-app/src/locales/de-DE/tool-approval.json
+++ b/web-app/src/locales/de-DE/tool-approval.json
@@ -7,5 +7,6 @@
   "alwaysAllow": "Immer erlauben",
   "permissions": "Berechtigungen",
   "approve": "Genehmigen",
-  "reject": "Ablehnen"
+  "reject": "Ablehnen",
+  "parameters": "Werkzeug-Parameter"
 }
diff --git a/web-app/src/locales/de-DE/tools.json b/web-app/src/locales/de-DE/tools.json
index 7c678c94fb..4e7ebe2a45 100644
--- a/web-app/src/locales/de-DE/tools.json
+++ b/web-app/src/locales/de-DE/tools.json
@@ -5,6 +5,7 @@
     "securityNotice": "Dieses Werkzeug möchte eine Aktion ausführen. Bitte überprüfen und genehmigen oder Ablehnen.",
     "deny": "Ablehnen",
     "allowOnce": "Einmal erlauben",
-    "alwaysAllow": "Immer erlauben"
+    "alwaysAllow": "Immer erlauben",
+    "parameters": "Werkzeug-Parameter"
   }
 }
diff --git a/web-app/src/locales/en/tool-approval.json b/web-app/src/locales/en/tool-approval.json
index a954164256..f15e30c9b0 100644
--- a/web-app/src/locales/en/tool-approval.json
+++ b/web-app/src/locales/en/tool-approval.json
@@ -7,5 +7,6 @@
   "alwaysAllow": "Always Allow",
   "permissions": "Permissions",
   "approve": "Approve",
-  "reject": "Reject"
+  "reject": "Reject",
+  "parameters": "Tool Parameters"
 }
\ No newline at end of file
diff --git a/web-app/src/locales/en/tools.json b/web-app/src/locales/en/tools.json
index da7f6ad66b..0a4691ea49 100644
--- a/web-app/src/locales/en/tools.json
+++ b/web-app/src/locales/en/tools.json
@@ -5,6 +5,7 @@
     "securityNotice": "Malicious tools or conversation content could potentially trick the assistant into attempting harmful actions. Review each tool call carefully before approving.",
     "deny": "Deny",
     "allowOnce": "Allow Once",
-    "alwaysAllow": "Always Allow"
+    "alwaysAllow": "Always Allow",
+    "parameters": "Tool Parameters"
   }
 }
diff --git a/web-app/src/locales/id/tool-approval.json b/web-app/src/locales/id/tool-approval.json
index 05714e9f08..3353b7626e 100644
--- a/web-app/src/locales/id/tool-approval.json
+++ b/web-app/src/locales/id/tool-approval.json
@@ -7,5 +7,6 @@
   "alwaysAllow": "Selalu Izinkan",
   "permissions": "Izin",
   "approve": "Setujui",
-  "reject": "Tolak"
+  "reject": "Tolak",
+  "parameters": "Parameter Alat"
 }
\ No newline at end of file
diff --git a/web-app/src/locales/id/tools.json b/web-app/src/locales/id/tools.json
index 5f0eb382c6..1e001afc64 100644
--- a/web-app/src/locales/id/tools.json
+++ b/web-app/src/locales/id/tools.json
@@ -5,6 +5,7 @@
     "deny": "Tolak",
     "allowOnce": "Izinkan Sekali",
     "alwaysAllow": "Selalu Izinkan",
-    "description": "Asisten ingin menggunakan <strong>{{toolName}}</strong>"
+    "description": "Asisten ingin menggunakan <strong>{{toolName}}</strong>",
+    "parameters": "Parameter Alat"
   }
 }
diff --git a/web-app/src/locales/vn/tool-approval.json b/web-app/src/locales/vn/tool-approval.json
index e154e9849d..bbe388d7eb 100644
--- a/web-app/src/locales/vn/tool-approval.json
+++ b/web-app/src/locales/vn/tool-approval.json
@@ -7,5 +7,6 @@
   "alwaysAllow": "Luôn cho phép",
   "permissions": "Quyền",
   "approve": "Phê duyệt",
-  "reject": "Từ chối"
+  "reject": "Từ chối",
+  "parameters": "Tham số công cụ"
 }
\ No newline at end of file
diff --git a/web-app/src/locales/vn/tools.json b/web-app/src/locales/vn/tools.json
index f14553888d..63306479fe 100644
--- a/web-app/src/locales/vn/tools.json
+++ b/web-app/src/locales/vn/tools.json
@@ -5,6 +5,7 @@
     "deny": "Từ chối",
     "allowOnce": "Cho phép một lần",
     "alwaysAllow": "Luôn cho phép",
-    "description": "Trợ lý muốn sử dụng <strong>{{toolName}}</strong>"
+    "description": "Trợ lý muốn sử dụng <strong>{{toolName}}</strong>",
+    "parameters": "Tham số công cụ"
   }
 }
diff --git a/web-app/src/locales/zh-CN/tool-approval.json b/web-app/src/locales/zh-CN/tool-approval.json
index 3cfca11ce5..d1f60d5b14 100644
--- a/web-app/src/locales/zh-CN/tool-approval.json
+++ b/web-app/src/locales/zh-CN/tool-approval.json
@@ -7,5 +7,6 @@
   "alwaysAllow": "始终允许",
   "permissions": "权限",
   "approve": "批准",
-  "reject": "拒绝"
+  "reject": "拒绝",
+  "parameters": "工具参数"
 }
\ No newline at end of file
diff --git a/web-app/src/locales/zh-CN/tools.json b/web-app/src/locales/zh-CN/tools.json
index 1812261bb7..332ffc6ecb 100644
--- a/web-app/src/locales/zh-CN/tools.json
+++ b/web-app/src/locales/zh-CN/tools.json
@@ -5,6 +5,7 @@
     "deny": "拒绝",
     "allowOnce": "允许一次",
     "alwaysAllow": "始终允许",
-    "description": "助手想要使用 <strong>{{toolName}}</strong>"
+    "description": "助手想要使用 <strong>{{toolName}}</strong>",
+    "parameters": "工具参数"
   }
 }
diff --git a/web-app/src/locales/zh-TW/tool-approval.json b/web-app/src/locales/zh-TW/tool-approval.json
index 5a5a295e81..1d1dcd19b3 100644
--- a/web-app/src/locales/zh-TW/tool-approval.json
+++ b/web-app/src/locales/zh-TW/tool-approval.json
@@ -7,5 +7,6 @@
   "alwaysAllow": "一律允許",
   "permissions": "權限",
   "approve": "核准",
-  "reject": "拒絕"
+  "reject": "拒絕",
+  "parameters": "工具參數"
 }
\ No newline at end of file
diff --git a/web-app/src/locales/zh-TW/tools.json b/web-app/src/locales/zh-TW/tools.json
index aae5fb21a6..64ed15e8df 100644
--- a/web-app/src/locales/zh-TW/tools.json
+++ b/web-app/src/locales/zh-TW/tools.json
@@ -5,6 +5,7 @@
     "deny": "拒絕",
     "allowOnce": "允許一次",
     "alwaysAllow": "一律允許",
-    "description": "助理想要使用 <strong>{{toolName}}</strong>"
+    "description": "助理想要使用 <strong>{{toolName}}</strong>",
+    "parameters": "工具參數"
   }
 }