diff --git a/ee/tabby-ui/app/search/components/assistant-message-section.tsx b/ee/tabby-ui/app/search/components/assistant-message-section.tsx
index 8eebaec4ff4..099ed0213be 100644
--- a/ee/tabby-ui/app/search/components/assistant-message-section.tsx
+++ b/ee/tabby-ui/app/search/components/assistant-message-section.tsx
@@ -37,9 +37,11 @@ import {
 import {
   IconBlocks,
   IconBug,
+  IconCheckCircled,
   IconChevronRight,
   IconCircleDot,
   IconEdit,
+  IconGitMerge,
   IconGitPullRequest,
   IconLayers,
   IconPlus,
@@ -516,14 +518,22 @@ function SourceCardContent({
           <div className="flex shrink-0 items-center gap-1">
             {isIssue && (
               <>
-                <IconCircleDot className="h-3.5 w-3.5" />
-                <span>{source.closed ? 'Closed' : 'Not closed'}</span>
+                {source.closed ? (
+                  <IconCheckCircled className="h-3.5 w-3.5" />
+                ) : (
+                  <IconCircleDot className="h-3.5 w-3.5" />
+                )}
+                <span>{source.closed ? 'Closed' : 'Open'}</span>
               </>
             )}
             {isPR && (
               <>
-                <IconGitPullRequest className="h-3.5 w-3.5" />
-                {source.merged ? 'Merged' : 'Not merged'}
+                {source.merged ? (
+                  <IconGitMerge className="h-3.5 w-3.5" />
+                ) : (
+                  <IconGitPullRequest className="h-3.5 w-3.5" />
+                )}
+                {source.merged ? 'Merged' : 'Open'}
               </>
             )}
           </div>
diff --git a/ee/tabby-ui/components/message-markdown/index.tsx b/ee/tabby-ui/components/message-markdown/index.tsx
index 34a1ba978c0..4a8594a5ad0 100644
--- a/ee/tabby-ui/components/message-markdown/index.tsx
+++ b/ee/tabby-ui/components/message-markdown/index.tsx
@@ -28,7 +28,12 @@ import {
 
 import { Mention } from '../mention-tag'
 import { Badge } from '../ui/badge'
-import { IconCircleDot, IconGitPullRequest } from '../ui/icons'
+import {
+  IconCheckCircled,
+  IconCircleDot,
+  IconGitMerge,
+  IconGitPullRequest
+} from '../ui/icons'
 import { Skeleton } from '../ui/skeleton'
 
 type RelevantDocItem = {
@@ -486,14 +491,15 @@ export function SiteFavicon({
 function IssueStateBadge({ closed }: { closed: boolean }) {
   return (
     <Badge
-      variant="outline"
-      className={cn('gap-1 text-xs text-white', {
-        'bg-[#7b52d7] dark:bg-[#8259dd]': closed,
-        'bg-gray-500 dark:bg-gray-500': !closed
-      })}
+      variant={closed ? 'default' : 'secondary'}
+      className="gap-1 py-1 text-xs"
     >
-      <IconCircleDot className="h-3.5 w-3.5" />
-      {closed ? 'Closed' : 'Not closed'}
+      {closed ? (
+        <IconCheckCircled className="h-3.5 w-3.5" />
+      ) : (
+        <IconCircleDot className="h-3.5 w-3.5" />
+      )}
+      {closed ? 'Closed' : 'Open'}
     </Badge>
   )
 }
@@ -501,14 +507,15 @@ function IssueStateBadge({ closed }: { closed: boolean }) {
 function PRStateBadge({ merged }: { merged: boolean }) {
   return (
     <Badge
-      variant="outline"
-      className={cn('gap-1 text-xs text-white', {
-        'bg-[#7b52d7] dark:bg-[#8259dd]': merged,
-        'bg-gray-500 dark:bg-gray-500': !merged
-      })}
+      variant={merged ? 'default' : 'secondary'}
+      className="gap-1 py-1 text-xs"
     >
-      <IconGitPullRequest className="h-3.5 w-3.5" />
-      {merged ? 'Merged' : 'Not merged'}
+      {merged ? (
+        <IconGitMerge className="h-3.5 w-3.5" />
+      ) : (
+        <IconGitPullRequest className="h-3.5 w-3.5" />
+      )}
+      {merged ? 'Merged' : 'Open'}
     </Badge>
   )
 }
diff --git a/ee/tabby-ui/components/ui/icons.tsx b/ee/tabby-ui/components/ui/icons.tsx
index 10d0a4297bf..6a118e352a5 100644
--- a/ee/tabby-ui/components/ui/icons.tsx
+++ b/ee/tabby-ui/components/ui/icons.tsx
@@ -13,7 +13,6 @@ import {
   CaseSensitive,
   ChevronsDownUp,
   CircleAlert,
-  CircleCheck,
   CircleDot,
   CircleHelp,
   CirclePlay,
@@ -23,6 +22,7 @@ import {
   FileText,
   Filter,
   GitFork,
+  GitMerge,
   GitPullRequest,
   Globe,
   Hash,
@@ -1715,18 +1715,18 @@ function IconCircleDot({
   return <CircleDot className={cn('h-4 w-4', className)} {...props} />
 }
 
-function IconCircleCheck({
+function IconGitPullRequest({
   className,
   ...props
-}: React.ComponentProps<typeof CircleCheck>) {
-  return <CircleCheck className={cn('h-4 w-4', className)} {...props} />
+}: React.ComponentProps<typeof GitPullRequest>) {
+  return <GitPullRequest className={cn('h-4 w-4', className)} {...props} />
 }
 
-function IconGitPullRequest({
+function IconGitMerge({
   className,
   ...props
-}: React.ComponentProps<typeof GitPullRequest>) {
-  return <GitPullRequest className={cn('h-4 w-4', className)} {...props} />
+}: React.ComponentProps<typeof GitMerge>) {
+  return <GitMerge className={cn('h-4 w-4', className)} {...props} />
 }
 
 export {
@@ -1839,5 +1839,5 @@ export {
   IconEyeOff,
   IconCircleDot,
   IconGitPullRequest,
-  IconCircleCheck
+  IconGitMerge
 }