diff --git a/src/components/conversations/conversation-detail-panel.tsx b/src/components/conversations/conversation-detail-panel.tsx
index 25b05e8..6ad7d99 100644
--- a/src/components/conversations/conversation-detail-panel.tsx
+++ b/src/components/conversations/conversation-detail-panel.tsx
@@ -570,6 +570,7 @@ const ConversationTabView = memo(function ConversationTabView({
   const messageListNode = (
     <MessageListView
       conversationId={effectiveConversationId}
+      agentType={selectedAgent}
       connStatus={connStatus}
       isActive={isActive}
       sendSignal={sendSignal}
diff --git a/src/components/message/live-turn-stats.tsx b/src/components/message/live-turn-stats.tsx
index b389f0e..7a1181f 100644
--- a/src/components/message/live-turn-stats.tsx
+++ b/src/components/message/live-turn-stats.tsx
@@ -9,9 +9,12 @@ import {
   estimateChangedLineStats,
 } from "@/lib/line-change-stats"
 import { FilePenLine, Timer, Wrench } from "lucide-react"
+import type { AgentType } from "@/lib/types"
+import { AgentIcon } from "@/components/agent-icon"
 
 interface LiveTurnStatsProps {
   message: LiveMessage
+  agentType: AgentType
   isStreaming?: boolean
 }
 
@@ -260,6 +263,7 @@ function extractLiveEditStats(message: LiveMessage): LiveEditStats {
 
 export function LiveTurnStats({
   message,
+  agentType,
   isStreaming = true,
 }: LiveTurnStatsProps) {
   const locale = useLocale()
@@ -309,7 +313,7 @@ export function LiveTurnStats({
 
   return (
     <div className="flex h-8 shrink-0 items-center justify-center gap-3 px-4 text-xs leading-none text-muted-foreground">
-      <span className="inline-block h-1.5 w-1.5 rounded-full bg-primary animate-pulse shrink-0" />
+      <AgentIcon agentType={agentType} className="h-3.5 w-3.5 animate-pulse" />
       {isThinking ? (
         <span>{t("thinking")}</span>
       ) : (
diff --git a/src/components/message/message-list-view.tsx b/src/components/message/message-list-view.tsx
index 936f91f..6ecf13d 100644
--- a/src/components/message/message-list-view.tsx
+++ b/src/components/message/message-list-view.tsx
@@ -24,12 +24,13 @@ import {
   buildPlanKey,
   extractLatestPlanEntriesFromMessages,
 } from "@/lib/agent-plan"
-import type { ConnectionStatus, SessionStats } from "@/lib/types"
+import type { AgentType, ConnectionStatus, SessionStats } from "@/lib/types"
 import { VirtualizedMessageThread } from "@/components/message/virtualized-message-thread"
 import { useStickToBottomContext } from "use-stick-to-bottom"
 
 interface MessageListViewProps {
   conversationId: number
+  agentType: AgentType
   connStatus?: ConnectionStatus | null
   isActive?: boolean
   sendSignal?: number
@@ -128,6 +129,7 @@ const AutoScrollOnSend = memo(function AutoScrollOnSend({
 
 export function MessageListView({
   conversationId,
+  agentType,
   connStatus,
   isActive = true,
   sendSignal = 0,
@@ -309,6 +311,7 @@ export function MessageListView({
       {liveMessage && connStatus === "prompting" && (
         <LiveTurnStats
           message={liveMessage}
+          agentType={agentType}
           isStreaming={connStatus === "prompting"}
         />
       )}