diff --git a/src/features/auth-page/login.tsx b/src/features/auth-page/login.tsx
index 4bb5c9651..a6a671a47 100644
--- a/src/features/auth-page/login.tsx
+++ b/src/features/auth-page/login.tsx
@@ -29,7 +29,7 @@ export const LogIn: FC<LoginProps> = (props) => {
           <Avatar className="h-36 w-30">
             <AvatarImage src={theme === 'dark' ? "/Logo-COMAU-white.png" : "/ai-icon.png"} />
           </Avatar>
-          <span className={theme === 'dark' ? "text-white" : "text-blue"}>AIKO - AI for Comau</span>
+          <span className={theme === 'dark' ? "text-white" : "text-blue"}>AICO - AI for Comau</span>
         </CardTitle>
         {/* <CardDescription className="text-center text-sm">
         Welcome to Comau Generalist AI platform
diff --git a/src/features/chat-page/chat-header/chat-header.tsx b/src/features/chat-page/chat-header/chat-header.tsx
index 882f26d45..5f0f43248 100644
--- a/src/features/chat-page/chat-header/chat-header.tsx
+++ b/src/features/chat-page/chat-header/chat-header.tsx
@@ -26,22 +26,21 @@ export const ChatHeader: FC<Props> = (props) => {
     <div className="bg-background border-b flex items-center py-2">
       <div className="container max-w-3xl flex justify-between items-center">
         <div className="flex flex-col">
-          <div className="grid grid-rows-2 grid-flow-col gap-2 items-center">
+          <div className="grid grid-rows-2 grid-flow-col gap-5 items-center">
             <div className="row-span-2">
               <Image
-                src={theme === 'dark' ? "/Logo-COMAU-white.png" : "/ai-icon.png"}
+                src={theme === 'dark' ? "/aico-white.png" : "/aico-blue.png"}
                 alt={props.chatThread.name}
                 width={100}
                 height={100}
               />
             </div>
             <div className="row-span-3">
-                {/* Riga vuota */} <div style={{ height: '20px' }}></div>
-                <span style={{ fontWeight: 'bold', fontSize: '30px' }}>
-                {/* <VenetianMask size={18} /> */}
+                 <span style={{ fontWeight: 'bold', fontSize: '30px' }}>
+                 {/* <VenetianMask size={18} /> */}
                 {persona} (AI for Comau)
               </span>
-              <div style={{ height: '20px' }}></div>
+              <div style={{ height: '10px' }}></div>
               <span className="flex flex-col" style={{ fontSize: '15px'}}>Current Chat:  {props.chatThread.name}</span>
             </div>
           </div>
diff --git a/src/features/chat-page/chat-page.tsx b/src/features/chat-page/chat-page.tsx
index 7ea223c72..5694cdc10 100644
--- a/src/features/chat-page/chat-page.tsx
+++ b/src/features/chat-page/chat-page.tsx
@@ -10,6 +10,7 @@ import { useSession } from "next-auth/react";
 import { FC, useEffect, useRef } from "react";
 import { ExtensionModel } from "../extensions-page/extension-services/models";
 import { ChatHeader } from "./chat-header/chat-header";
+import Link from "next/link";
 import {
   ChatDocumentModel,
   ChatMessageModel,
@@ -18,6 +19,7 @@ import {
 import MessageContent from "./message-content";
 import Disclaimer from "../ui/chat/disclaimer";
 import { AlignCenter } from "lucide-react";
+import { useTheme } from "next-themes";
 
 interface ChatPageProps {
   messages: Array<ChatMessageModel>;
@@ -28,6 +30,7 @@ interface ChatPageProps {
 
 export const ChatPage: FC<ChatPageProps> = (props) => {
   const { data: session } = useSession();
+  const { theme } = useTheme();
 
   useEffect(() => {
     chatStore.initChatSession({
@@ -63,9 +66,10 @@ export const ChatPage: FC<ChatPageProps> = (props) => {
                 }}
                 profilePicture={
                   message.role === "assistant"
-                    ? "/aiko.png"
+                    ? theme === 'dark' ? "/logo-COMAU-white.png" : "/logo-COMAU.png"
                     : session?.user?.image
                 }
+                theme={theme}
               >
                 <MessageContent message={message} />
               </ChatMessageArea>
@@ -77,10 +81,11 @@ export const ChatPage: FC<ChatPageProps> = (props) => {
       
       <div className="flex flex-col items-center mt-4">
          <ChatInput />
-       <div className="mt-2 text-center">
-        <Disclaimer text={"The information generated by COMAU AICO could be wrong, please verify before using it."} />
+
+       <div className="mt-2 text-center text-sm">
+        <Disclaimer text={<>COMAU AICO generated content may be inaccurate. <Link target="_blank" href="https://drive.google.com/file/d/1OXkt4Z9hVoy4rXGFBOhzR9e0LJers5fJ/view">Refered Policy</Link>.</>}/>
        </div>
-      </div>
+      </div> 
     </main>
   );
 };
diff --git a/src/features/main-menu/main-menu.tsx b/src/features/main-menu/main-menu.tsx
index 4d7476a4b..81260ac4d 100644
--- a/src/features/main-menu/main-menu.tsx
+++ b/src/features/main-menu/main-menu.tsx
@@ -23,23 +23,27 @@ import { MenuLink } from "./menu-link";
 import { UserProfile } from "./user-profile";
 import Image from "next/image";
 
+
+
+
 export const MainMenu = async () => {
   const user = await getCurrentUser();
-
+ 
+  
   return (
     <Menu>
       <MenuBar>
         <MenuItemContainer>
-          <MenuItem tooltip="Home" asChild>
-            <MenuLink href="/chat" ariaLabel="Go to the Home page">
-              <Home {...menuIconProps} />
-              {/* <Image
+          <MenuItem tooltip="Corporate" asChild>
+            <MenuLink href="https://www.comau.com/en/" ariaLabel="Go to the Corporate Site">
+              <Home/>
+              <Image 
                 src="/ai-icon.png"
-                width={45}
-                height={45}
+                width={80}
+                height={80}
                 quality={100}
                 alt="ai-icon"
-              /> */}
+              />
             </MenuLink>
           </MenuItem>
           <MenuTrayToggle />
diff --git a/src/features/main-menu/theme-toggle.tsx b/src/features/main-menu/theme-toggle.tsx
index db6041714..ddda42cd3 100644
--- a/src/features/main-menu/theme-toggle.tsx
+++ b/src/features/main-menu/theme-toggle.tsx
@@ -25,14 +25,14 @@ export const ThemeToggle = () => {
         >
           <Moon size={18} />
         </TabsTrigger>
-        <TabsTrigger
+        {/*<TabsTrigger
           value="system"
           onClick={() => setTheme("system")}
           className="flex-1"
           title="System theme"
         >
           <Laptop2 size={18} />
-        </TabsTrigger>
+        </TabsTrigger>*/}
       </TabsList>
     </Tabs>
   );
diff --git a/src/features/theme/theme-config.ts b/src/features/theme/theme-config.ts
index 5d2f0dac6..05f65af83 100644
--- a/src/features/theme/theme-config.ts
+++ b/src/features/theme/theme-config.ts
@@ -1,5 +1,5 @@
-export const AI_NAME = "AIKO";
-export const AI_DESCRIPTION = "Hey, I'm AIKO (Artificial Intelligence for Comau), your super assistant.";
+export const AI_NAME = "AICO";
+export const AI_DESCRIPTION = "Hey, I'm AICO (Artificial Intelligence for Comau), your super assistant.";
 export const CHAT_DEFAULT_PERSONA = AI_NAME;
 
 export const CHAT_DEFAULT_SYSTEM_PROMPT = `Your name is ${AI_NAME}. You are a friendly AI assistant. You must always return in markdown format.
diff --git a/src/features/ui/chat/chat-input-area/chat-input-area.tsx b/src/features/ui/chat/chat-input-area/chat-input-area.tsx
index a460ef8b2..26adfaaf5 100644
--- a/src/features/ui/chat/chat-input-area/chat-input-area.tsx
+++ b/src/features/ui/chat/chat-input-area/chat-input-area.tsx
@@ -14,7 +14,7 @@ export const ChatInputForm = React.forwardRef<
   <div className="absolute bottom-10 w-full py-2 ">
     <div className="container max-w-3xl flex flex-col gap-1">
       <ChatInputStatus status={status} />
-      <div className="backdrop-blur-xl bg-background/70 rounded-md overflow-hidden focus-within:border-primary border">
+      <div className="backdrop-blur-xl bg-background/70 rounded-3xl overflow-hidden border-2 border-gray-600 focus-within:border-4 focus-within:border-blue-900">
         <form ref={ref} className="p-[2px]" {...props}>
           {props.children}
         </form>
diff --git a/src/features/ui/chat/chat-input-area/chat-text-input.tsx b/src/features/ui/chat/chat-input-area/chat-text-input.tsx
index d47367c2d..f62bbcacf 100644
--- a/src/features/ui/chat/chat-input-area/chat-text-input.tsx
+++ b/src/features/ui/chat/chat-input-area/chat-text-input.tsx
@@ -7,7 +7,7 @@ export const ChatTextInput = React.forwardRef<
   return (
     <textarea
       ref={ref}
-      className="p-4 w-full focus:outline-none bg-transparent resize-none "
+      className="p-4 w-full focus:outline-none bg-transparent resize-none text-md leading-relaxed"
       placeholder="Type your message here..."
       {...props}
     />
diff --git a/src/features/ui/chat/chat-message-area/chat-message-area.tsx b/src/features/ui/chat/chat-message-area/chat-message-area.tsx
index ad8483de0..f340df760 100644
--- a/src/features/ui/chat/chat-message-area/chat-message-area.tsx
+++ b/src/features/ui/chat/chat-message-area/chat-message-area.tsx
@@ -15,6 +15,7 @@ export const ChatMessageArea = (props: {
   profilePicture?: string | null;
   profileName?: string;
   role: "function" | "user" | "assistant" | "system" | "tool";
+  theme?: string;
   onCopy: () => void;
 }) => {
   const [isIconChecked, setIsIconChecked] = useState(false);
@@ -74,10 +75,11 @@ export const ChatMessageArea = (props: {
           {profile}
           <div
             className={cn(
-              "text-primary capitalize items-center flex",
+              "text-primary capitalize items-center flex text-muted-foreground",
               props.role === "function" || props.role === "tool"
                 ? "text-muted-foreground text-sm"
-                : ""
+                : "",
+              props.theme === "dark" ? "text-white" : "text-black"
             )}
           >
             {props.profileName}
diff --git a/src/features/ui/chat/chat-message-area/chat-message-content.tsx b/src/features/ui/chat/chat-message-area/chat-message-content.tsx
index 8dfaf65d3..d61d0fd28 100644
--- a/src/features/ui/chat/chat-message-area/chat-message-content.tsx
+++ b/src/features/ui/chat/chat-message-area/chat-message-content.tsx
@@ -11,7 +11,7 @@ const ChatMessageContentArea: ForwardRefRenderFunction<
   return (
     <div
       ref={ref}
-      className="container max-w-3xl  relative min-h-screen pb-[240px] pt-16  flex flex-col gap-16"
+      className="container max-w-3xl  relative min-h-screen pb-[240px] pt-6  flex flex-col gap-16"
     >
       {props.children}
     </div>
diff --git a/src/features/ui/chat/disclaimer.tsx b/src/features/ui/chat/disclaimer.tsx
index b99540afe..7efcde859 100644
--- a/src/features/ui/chat/disclaimer.tsx
+++ b/src/features/ui/chat/disclaimer.tsx
@@ -1,8 +1,9 @@
 // Disclaimer Component in TypeScript
-import React from 'react';
+import React, { ReactNode } from 'react';
+
 
 interface DisclaimerProps {
-  text: string;
+  text: ReactNode;
 }
 
 const Disclaimer: React.FC<DisclaimerProps> = ({ text }) => {
diff --git a/src/package-lock.json b/src/package-lock.json
index 2fdc29900..c2cd10f82 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -54,7 +54,7 @@
       },
       "devDependencies": {
         "@types/node": "^20",
-        "@types/react": "^18",
+        "@types/react": "^18.3.12",
         "@types/react-dom": "^18",
         "autoprefixer": "^10.0.1",
         "eslint": "^8",
@@ -2495,12 +2495,12 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/react": {
-      "version": "18.2.45",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.45.tgz",
-      "integrity": "sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg==",
+      "version": "18.3.12",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
+      "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
+      "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
@@ -2521,11 +2521,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.8",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
-    },
     "node_modules/@types/tunnel": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
diff --git a/src/package.json b/src/package.json
index 59375f410..dda087e66 100644
--- a/src/package.json
+++ b/src/package.json
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "@types/node": "^20",
-    "@types/react": "^18",
+    "@types/react": "^18.3.12",
     "@types/react-dom": "^18",
     "autoprefixer": "^10.0.1",
     "eslint": "^8",
diff --git a/src/public/aico-blue.png b/src/public/aico-blue.png
new file mode 100644
index 000000000..f61ff8ec2
Binary files /dev/null and b/src/public/aico-blue.png differ
diff --git a/src/public/aico-white.png b/src/public/aico-white.png
new file mode 100644
index 000000000..a01b37677
Binary files /dev/null and b/src/public/aico-white.png differ