diff --git a/frontend/components/logo/dog-icon.tsx b/frontend/components/logo/dog-icon.tsx
new file mode 100644
index 00000000..d9b5774d
--- /dev/null
+++ b/frontend/components/logo/dog-icon.tsx
@@ -0,0 +1,22 @@
+const DogIcon = (props: React.SVGProps<SVGSVGElement>) => {
+  return (
+    <svg 
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M19.9049 23H17.907C17.907 23 15.4096 20.5 16.908 16C17.3753 14.2544 17.3813 12.4181 17.2439 11C17.161 10.1434 17.0256 9.43934 16.908 9C16.7416 8.33333 16.8081 7 18.4065 7C19.5457 7 20.9571 6.92944 21.4034 6.5C22.3268 5.61145 21.9029 4 21.9029 4C21.9029 4 20.9039 3 18.906 3C18.7395 2.33333 17.7072 1 14.9101 1C12.113 1 11.5835 2.16589 10.9143 4C10.4155 5.36686 10.423 6.99637 11.1692 7.71747M14.4106 4C14.2441 5.33333 14.4106 8 11.9132 8C11.5968 8 11.3534 7.89548 11.1692 7.71747M14.9101 23H12.4127M7.91738 23H12.4127M10.4148 15.5C11.5715 16.1667 13.5905 18.6 12.4127 23M3.42204 15C1.02177 18.5 1.64205 23 5.41997 23C5.41997 22 5.71966 19.2 6.91841 16C8.41686 12 11.1692 11.4349 11.1692 7.71747M16.908 4V4.5"
+        stroke="#0F62FE"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  )
+}
+
+export default DogIcon;
\ No newline at end of file
diff --git a/frontend/next.config.ts b/frontend/next.config.ts
index 5f31c456..0d08df3b 100644
--- a/frontend/next.config.ts
+++ b/frontend/next.config.ts
@@ -1,4 +1,9 @@
 import type { NextConfig } from "next";
+import dotenv from "dotenv";
+import path from "path";
+
+// Load environment variables from root .env file
+dotenv.config({ path: path.resolve(__dirname, "../.env") });
 
 const nextConfig: NextConfig = {
   // Increase timeout for API routes
@@ -9,6 +14,9 @@ const nextConfig: NextConfig = {
   eslint: {
     ignoreDuringBuilds: true,
   },
+  env: {
+    UPDATED_ONBOARDING: process.env.UPDATED_ONBOARDING,
+  },
 };
 
 export default nextConfig;
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 33300bd4..0c1c2c73 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -35,6 +35,7 @@
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
+        "dotenv": "^17.2.3",
         "lucide-react": "^0.525.0",
         "motion": "^12.23.12",
         "next": "15.3.5",
@@ -4088,6 +4089,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/dotenv": {
+      "version": "17.2.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index fd996c33..5347aa8c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -36,6 +36,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
+    "dotenv": "^17.2.3",
     "lucide-react": "^0.525.0",
     "motion": "^12.23.12",
     "next": "15.3.5",
diff --git a/frontend/src/app/chat/components/assistant-message.tsx b/frontend/src/app/chat/components/assistant-message.tsx
index d52460c1..45934a98 100644
--- a/frontend/src/app/chat/components/assistant-message.tsx
+++ b/frontend/src/app/chat/components/assistant-message.tsx
@@ -2,6 +2,7 @@ import { Bot, GitBranch } from "lucide-react";
 import { MarkdownRenderer } from "@/components/markdown-renderer";
 import { FunctionCalls } from "./function-calls";
 import type { FunctionCall } from "../types";
+import DogIcon from "@/components/logo/dog-icon";
 
 interface AssistantMessageProps {
   content: string;
@@ -24,10 +25,13 @@ export function AssistantMessage({
   showForkButton = false,
   onFork,
 }: AssistantMessageProps) {
+  const updatedOnboarding = process.env.UPDATED_ONBOARDING === "true";
+  const IconComponent = updatedOnboarding ? DogIcon : Bot;
+
   return (
     <div className="flex gap-3">
       <div className="w-8 h-8 rounded-lg bg-accent/20 flex items-center justify-center flex-shrink-0 select-none">
-        <Bot className="h-4 w-4 text-accent-foreground" />
+        <IconComponent className="h-4 w-4 text-accent-foreground" />
       </div>
       <div className="flex-1 min-w-0">
         <FunctionCalls
diff --git a/frontend/src/app/chat/components/chat-input.tsx b/frontend/src/app/chat/components/chat-input.tsx
index 01494e12..e63a5236 100644
--- a/frontend/src/app/chat/components/chat-input.tsx
+++ b/frontend/src/app/chat/components/chat-input.tsx
@@ -21,7 +21,6 @@ interface ChatInputProps {
   loading: boolean;
   isUploading: boolean;
   selectedFilter: KnowledgeFilterData | null;
-  isFilterHighlighted: boolean;
   isFilterDropdownOpen: boolean;
   availableFilters: KnowledgeFilterData[];
   filterSearchTerm: string;
@@ -48,7 +47,6 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>((
     loading,
     isUploading,
     selectedFilter,
-    isFilterHighlighted,
     isFilterDropdownOpen,
     availableFilters,
     filterSearchTerm,
diff --git a/frontend/src/app/chat/page.tsx b/frontend/src/app/chat/page.tsx
index 2ae927d1..d3fe85fe 100644
--- a/frontend/src/app/chat/page.tsx
+++ b/frontend/src/app/chat/page.tsx
@@ -1886,7 +1886,6 @@ function ChatPage() {
         loading={loading}
         isUploading={isUploading}
         selectedFilter={selectedFilter}
-        isFilterHighlighted={isFilterHighlighted}
         isFilterDropdownOpen={isFilterDropdownOpen}
         availableFilters={availableFilters}
         filterSearchTerm={filterSearchTerm}
diff --git a/frontend/src/app/onboarding/components/onboarding-card.tsx b/frontend/src/app/onboarding/components/onboarding-card.tsx
index c8b6dc09..9ca70ab8 100644
--- a/frontend/src/app/onboarding/components/onboarding-card.tsx
+++ b/frontend/src/app/onboarding/components/onboarding-card.tsx
@@ -30,11 +30,10 @@ import { OpenAIOnboarding } from "./openai-onboarding";
 
 const OnboardingCard = ({
   isDoclingHealthy,
-  boarderless = false,
 }: {
   isDoclingHealthy: boolean;
-  boarderless?: boolean;
 }) => {
+  const updatedOnboarding = process.env.UPDATED_ONBOARDING === "true";
   const { data: settingsDb, isLoading: isSettingsLoading } =
   useGetSettingsQuery();
 
@@ -120,7 +119,7 @@ const OnboardingCard = ({
   const isComplete = !!settings.llm_model && !!settings.embedding_model && isDoclingHealthy;
 
   return (
-    <Card className={`w-full max-w-[600px] ${boarderless ? "border-none" : ""}`}>
+    <Card className={`w-full max-w-[600px] ${updatedOnboarding ? "border-none" : ""}`}>
       <Tabs
         defaultValue={modelProvider}
         onValueChange={handleSetModelProvider}
@@ -165,7 +164,7 @@ const OnboardingCard = ({
           </TabsContent>
         </CardContent>
       </Tabs>
-      <CardFooter className="flex justify-end">
+      <CardFooter className={`flex  ${updatedOnboarding ? "" : "justify-end"}`}>
         <Tooltip>
           <TooltipTrigger asChild>
             <div>