diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 0b8b3748295e..80c40d826f4e 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useEffect, useMemo, useState } from 'react'
+import React, { RefObject, useMemo, useState } from 'react'
 import slugify from '@sindresorhus/slugify'
 import { useWindowSize } from '@uidotdev/usehooks'
 import type { UseChatHelpers } from 'ai/react'
@@ -258,7 +258,7 @@ function ChatPanelRenderer(
                     ease: 'easeInOut',
                     duration: 0.1
                   }}
-                  exit={{ opacity: 0, scale: 0.9, y: 5 }}
+                  exit={{ opacity: 0, scale: 0.9, y: -5 }}
                 >
                   <Badge
                     variant="outline"
@@ -281,7 +281,7 @@ function ChatPanelRenderer(
                     <Button
                       size="icon"
                       variant="ghost"
-                      className="h-7 w-7 shrink-0 rounded-l-none"
+                      className="h-7 w-7 shrink-0 rounded-l-none hover:bg-muted/50"
                       onClick={e => {
                         updateEnableActiveSelection(!enableActiveSelection)
                       }}
@@ -303,7 +303,7 @@ function ChatPanelRenderer(
                       ease: 'easeInOut',
                       duration: 0.1
                     }}
-                    exit={{ opacity: 0, scale: 0.9, y: 5 }}
+                    exit={{ opacity: 0, scale: 0.9, y: -5 }}
                     layout
                   >
                     <Badge
@@ -314,7 +314,7 @@ function ChatPanelRenderer(
                       <Button
                         size="icon"
                         variant="ghost"
-                        className="h-7 w-7 shrink-0 rounded-l-none"
+                        className="h-7 w-7 shrink-0 rounded-l-none hover:bg-muted/50"
                         onClick={removeRelevantContext.bind(null, idx)}
                       >
                         <IconRemove />
diff --git a/ee/tabby-ui/components/chat/form-editor/utils.tsx b/ee/tabby-ui/components/chat/form-editor/utils.tsx
index c70ef00e45b9..55ad9e5405a8 100644
--- a/ee/tabby-ui/components/chat/form-editor/utils.tsx
+++ b/ee/tabby-ui/components/chat/form-editor/utils.tsx
@@ -28,7 +28,7 @@ export function fileItemToSourceItem(info: FileItem): SourceItem {
  */
 export const FileItemIcon = () => (
   <svg
-    className="text-muted-foreground h-4 w-4"
+    className="h-4 w-4 text-muted-foreground"
     viewBox="0 0 24 24"
     fill="none"
     stroke="currentColor"
@@ -56,8 +56,8 @@ export const MentionComponent = ({ node }: { node: any }) => {
     <NodeViewWrapper className="inline">
       <span
         className={cn(
-          'bg-muted inline-flex items-center rounded px-1.5 py-0.5 text-sm font-medium text-white',
-          'ring-muted ring-1 ring-inset'
+          'inline-flex items-center rounded bg-muted px-1.5 py-0.5 text-sm font-medium text-white',
+          'ring-1 ring-inset ring-muted'
         )}
         data-category={node.attrs.category}
       >
@@ -161,7 +161,7 @@ export const MentionList = ({
     >
       {/* If no items found, show a simple message */}
       {!items.length ? (
-        <div className="text-muted-foreground px-2 py-1.5 text-sm">
+        <div className="px-2 py-1.5 text-sm text-muted-foreground">
           Cannot find any files.
         </div>
       ) : (
@@ -183,7 +183,7 @@ export const MentionList = ({
             >
               <FileItemIcon />
               <span className="flex-1 truncate">{shortenLabel(item.name)}</span>
-              <span className="text-muted-foreground max-w-[150px] truncate text-xs">
+              <span className="max-w-[150px] truncate text-xs text-muted-foreground">
                 {shortenLabel(item.filepath, 20)}
               </span>
             </button>
diff --git a/ee/tabby-ui/components/chat/prompt-form.tsx b/ee/tabby-ui/components/chat/prompt-form.tsx
index 6cbc31e55ec9..7844834e2a03 100644
--- a/ee/tabby-ui/components/chat/prompt-form.tsx
+++ b/ee/tabby-ui/components/chat/prompt-form.tsx
@@ -278,7 +278,7 @@ function PromptFormRenderer(
       <div className="relative flex flex-col px-4">
         {/* Editor & Submit row */}
         <div className="relative flex items-center gap-2">
-          <IconEdit className="text-muted-foreground h-4 w-4" />
+          <IconEdit className="h-4 w-4 text-muted-foreground" />
           <div className="min-w-0 flex-1">
             {/* TipTap editor content */}
             <EditorContent