diff --git a/frontend/src/features/chat/components/ChatWindow.js b/frontend/src/features/chat/components/ChatWindow.js
index 75bc20a..46815e4 100644
--- a/frontend/src/features/chat/components/ChatWindow.js
+++ b/frontend/src/features/chat/components/ChatWindow.js
@@ -92,7 +92,7 @@
       }
     }
   };
-  const isIntermediate = !message.isUser && message.status && !message.status.includes("finished in");
+  const isIntermediate = !message.isUser && message.status && !message.status.includes("finished") && !message.status.includes("complete");
   
   const assistantMessageClasses = `p-4 shadow-lg max-w-[95%] assistant-message mr-auto text-gray-900 dark:text-gray-100 ${isIntermediate ? 'is-intermediate' : ''}`;
   const userMessageClasses = `max-w-[90%] p-4 shadow-md ml-auto user-message-container`;
@@ -216,10 +216,15 @@
       {!message.isUser && message.status && (
         <div className="mt-2 pt-2 border-t border-gray-100 dark:border-gray-800 transition-all duration-300">
           <div className="status-chip text-[10px] sm:text-xs text-indigo-600 dark:text-indigo-300 font-semibold italic flex items-center gap-2">
-            <div className="w-2 h-2 bg-indigo-500 rounded-full animate-pulse"></div>
+            <div className={`w-2 h-2 rounded-full ${
+              typeof message.status === 'string' && (message.status.includes("complete") || message.status.includes("finished"))
+                ? "bg-emerald-500" 
+                : "bg-indigo-500 animate-pulse"
+            }`}></div>
             <span className={
               typeof message.status === 'string' &&
-                !message.status.includes("finished in") &&
+                !message.status.includes("finished") &&
+                !message.status.includes("complete") &&
                 !message.status.startsWith("Thought for")
                 ? "streaming-dots" : ""
             }>