diff --git a/frontend-web/src/components/workspace/agents/agent-brand-icon.tsx b/frontend-web/src/components/workspace/agents/agent-brand-icon.tsx
index 0364ff8b..8ea2bb34 100644
--- a/frontend-web/src/components/workspace/agents/agent-brand-icon.tsx
+++ b/frontend-web/src/components/workspace/agents/agent-brand-icon.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import agentAvatarDark from "@/assets/img/agent-avatar.png";
+import agentAvatarLight from "@/assets/img/agent-avatar-red.png";
 import { useTheme } from "@/contexts/ThemeContext";
 import { cn } from "@/lib/utils";
 
@@ -30,7 +32,7 @@ export function AgentBrandIcon({
   const styles = SIZE_STYLES[size];
   const { theme } = useTheme();
   const avatarSrc =
-    theme === "light" ? "/agent-avatar-red.png" : "/agent-avatar.png";
+    theme === "light" ? agentAvatarLight : agentAvatarDark;
 
   return (
     <span
diff --git a/frontend-web/src/components/workspace/cm-chat-sidebar.tsx b/frontend-web/src/components/workspace/cm-chat-sidebar.tsx
index ac30cd82..9f7abc4d 100644
--- a/frontend-web/src/components/workspace/cm-chat-sidebar.tsx
+++ b/frontend-web/src/components/workspace/cm-chat-sidebar.tsx
@@ -17,6 +17,8 @@ import { usePathname } from "next/navigation";
 import type { MouseEvent } from "react";
 import { useNavigate } from "react-router-dom";
 
+import cmAssistantLogoDark from "@/assets/img/cm-assistant-logo.png";
+import cmAssistantLogoLight from "@/assets/img/cm-assistant-logo-red.png";
 import { cn } from "@/lib/utils";
 import { useTheme } from "@/contexts/ThemeContext";
 
@@ -68,7 +70,7 @@ export function CmChatSidebar({
   const pathname = usePathname();
   const navigate = useNavigate();
   const { theme } = useTheme();
-  const brandLogoSrc = theme === "light" ? "/cm-assistant-logo-red.png" : "/cm-assistant-logo.png";
+  const brandLogoSrc = theme === "light" ? cmAssistantLogoLight : cmAssistantLogoDark;
 
   const handleNewChat = (event: MouseEvent<HTMLAnchorElement>) => {
     if (event.metaKey || event.ctrlKey || event.shiftKey || event.button === 1) return;
diff --git a/frontend-web/src/components/workspace/workspace-header.tsx b/frontend-web/src/components/workspace/workspace-header.tsx
index ea3afbf0..edc18b44 100644
--- a/frontend-web/src/components/workspace/workspace-header.tsx
+++ b/frontend-web/src/components/workspace/workspace-header.tsx
@@ -5,6 +5,8 @@ import Link from "next/link";
 
 import { Button } from "@/components/ui/button";
 import { useSidebar } from "@/components/ui/sidebar";
+import cmAssistantLogoDark from "@/assets/img/cm-assistant-logo.png";
+import cmAssistantLogoLight from "@/assets/img/cm-assistant-logo-red.png";
 import { useTheme } from "@/contexts/ThemeContext";
 import { useI18n } from "@/core/i18n/hooks";
 import { env } from "@/env";
@@ -14,8 +16,8 @@ function BrandMark({ className }: { className?: string }) {
   const { theme } = useTheme();
   const brandLogoSrc =
     theme === "dark"
-      ? "/cm-assistant-logo.png"
-      : "/cm-assistant-logo-red.png";
+      ? cmAssistantLogoDark
+      : cmAssistantLogoLight;
 
   return (
     <img