diff --git a/.typos.toml b/.typos.toml
index da42b8c45..f889e2374 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -1,4 +1,17 @@
 [files]
+extend-exclude = [
+  "*.png",
+  "*.jpg", 
+  "*.jpeg",
+  "*.gif",
+  "*.ico",
+  "*.svg",
+  "*.woff",
+  "*.woff2",
+  "*.ttf",
+  "*.eot",
+  "crates/fig_desktop/icons/**"
+]
 
 [default.extend-words]
 mmaped = "mmaped"
diff --git a/crates/fig_desktop/icons/128x128.png b/crates/fig_desktop/icons/128x128.png
index 938fe5e5a..bc13d41dc 100644
Binary files a/crates/fig_desktop/icons/128x128.png and b/crates/fig_desktop/icons/128x128.png differ
diff --git a/crates/fig_desktop/icons/128x128@2x.png b/crates/fig_desktop/icons/128x128@2x.png
index 8ecdd2f89..c33a296d2 100644
Binary files a/crates/fig_desktop/icons/128x128@2x.png and b/crates/fig_desktop/icons/128x128@2x.png differ
diff --git a/crates/fig_desktop/icons/32x32.png b/crates/fig_desktop/icons/32x32.png
index a65db62fc..f767697fd 100644
Binary files a/crates/fig_desktop/icons/32x32.png and b/crates/fig_desktop/icons/32x32.png differ
diff --git a/crates/fig_desktop/icons/icon-monochrome-light.png b/crates/fig_desktop/icons/icon-monochrome-light.png
index f7a5c50f3..c5d107d69 100644
Binary files a/crates/fig_desktop/icons/icon-monochrome-light.png and b/crates/fig_desktop/icons/icon-monochrome-light.png differ
diff --git a/crates/fig_desktop/icons/icon-monochrome.png b/crates/fig_desktop/icons/icon-monochrome.png
index 88d97d841..de5b79e44 100644
Binary files a/crates/fig_desktop/icons/icon-monochrome.png and b/crates/fig_desktop/icons/icon-monochrome.png differ
diff --git a/crates/fig_desktop/icons/not-logged-in-light.png b/crates/fig_desktop/icons/not-logged-in-light.png
deleted file mode 100644
index 80e090fa3..000000000
Binary files a/crates/fig_desktop/icons/not-logged-in-light.png and /dev/null differ
diff --git a/crates/fig_desktop/icons/not-logged-in.png b/crates/fig_desktop/icons/not-logged-in.png
deleted file mode 100644
index dd5e6e8bf..000000000
Binary files a/crates/fig_desktop/icons/not-logged-in.png and /dev/null differ
diff --git a/crates/fig_desktop/src/tray.rs b/crates/fig_desktop/src/tray.rs
index 9819c93bc..e53ea0cb1 100644
--- a/crates/fig_desktop/src/tray.rs
+++ b/crates/fig_desktop/src/tray.rs
@@ -1,6 +1,5 @@
 use std::borrow::Cow;
 
-use cfg_if::cfg_if;
 use fig_install::{
     InstallComponents,
     UpdateOptions,
@@ -354,25 +353,16 @@ pub async fn build_tray(
         .build()
 }
 
-pub fn get_icon(is_logged_in: bool) -> Icon {
+pub fn get_icon(_is_logged_in: bool) -> Icon {
     let (icon_rgba, icon_width, icon_height) = {
-        let bytes = if is_logged_in {
-            cfg_if! {
-                if #[cfg(target_os = "linux")] {
-                    include_bytes!("../icons/icon-monochrome-light.png").to_vec()
-                } else {
-                    include_bytes!("../icons/icon-monochrome.png").to_vec()
-                }
+        let bytes = {
+            #[cfg(target_os = "linux")]
+            {
+                include_bytes!("../icons/icon-monochrome-light.png").to_vec()
             }
-        } else {
-            cfg_if! {
-                if #[cfg(target_os = "linux")] {
-                    // This is intentionally the same as when logged in since Linux tray icons
-                    // don't really seem to work that well when multiple choices are available.
-                    include_bytes!("../icons/icon-monochrome-light.png").to_vec()
-                } else {
-                    include_bytes!("../icons/not-logged-in.png").to_vec()
-                }
+            #[cfg(not(target_os = "linux"))]
+            {
+                include_bytes!("../icons/icon-monochrome.png").to_vec()
             }
         };
         let image = image::load_from_memory(&bytes)
diff --git a/packages/dashboard-app/index.html b/packages/dashboard-app/index.html
index d2905ed4f..5e1a3058a 100644
--- a/packages/dashboard-app/index.html
+++ b/packages/dashboard-app/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Amazon Q Dashboard</title>
+    <title>Kiro Dashboard</title>
   </head>
   <body>
     <div class="relative" id="root"></div>
diff --git a/packages/dashboard-app/src/components/installs/modal/login/index.tsx b/packages/dashboard-app/src/components/installs/modal/login/index.tsx
index 5472d10bc..6c32d6398 100644
--- a/packages/dashboard-app/src/components/installs/modal/login/index.tsx
+++ b/packages/dashboard-app/src/components/installs/modal/login/index.tsx
@@ -10,7 +10,11 @@ import Tab, { ProfileTab } from "./tabs";
 import { useLocalStateZodDefault } from "@/hooks/store/useState";
 import { z } from "zod";
 import { Link } from "@/components/ui/link";
-import { Q_MIGRATION_URL } from "@/lib/constants";
+import {
+  Q_MIGRATION_URL,
+  PRODUCT_NAME,
+  PREVIOUS_PRODUCT_NAME,
+} from "@/lib/constants";
 import { useAuth, useAuthRequest, useRefreshAuth } from "@/hooks/store/useAuth";
 
 export default function LoginModal({ next }: { next: () => void }) {
@@ -405,7 +409,7 @@ export default function LoginModal({ next }: { next: () => void }) {
             <>
               <div className="text-center mb-6">
                 <h2 className="text-xl font-semibold text-white mb-3">
-                  Welcome to Kiro
+                  Welcome to {PRODUCT_NAME}
                 </h2>
                 <p className="text-base text-white">
                   Click below to open the auth portal and sign in
@@ -450,7 +454,7 @@ export default function LoginModal({ next }: { next: () => void }) {
         {completedOnboarding && tab == "builderId" && (
           <div className="text-center flex flex-col">
             <div className="font-ember font-bold">
-              CodeWhisperer is now Amazon Q
+              {PREVIOUS_PRODUCT_NAME} is now {PRODUCT_NAME}
             </div>
             <Link href={Q_MIGRATION_URL} className="text-sm">
               Read the announcement blog post
diff --git a/packages/dashboard-app/src/index.css b/packages/dashboard-app/src/index.css
index d7669ea52..519c8af2a 100644
--- a/packages/dashboard-app/src/index.css
+++ b/packages/dashboard-app/src/index.css
@@ -125,8 +125,8 @@
       ellipse farthest-corner at 100% 0%,
       #a7f8ff 0%,
       #008dff 40%,
-      #4a00c8 80%,
-      #39127d 100%
+      #8700ff 80%,
+      #5500b3 100%
     );
   }
 
@@ -134,8 +134,8 @@
     background: radial-gradient(
       ellipse farthest-corner at 100% 0%,
       #008dff 0%,
-      #4a00c8 50%,
-      #39127d 100%
+      #8700ff 50%,
+      #5500b3 100%
     );
   }
 
@@ -152,15 +152,15 @@
       ),
       radial-gradient(
         100% 100% at 100% 0%,
-        #6e3bf1 7.53%,
-        rgba(110, 59, 241, 0) 100%
+        #c19aff 7.53%,
+        rgba(193, 154, 255, 0) 100%
       ),
       radial-gradient(
         100% 86.61% at 100% 100%,
         #538bf7 0%,
         rgba(83, 139, 247, 0) 100%
       ),
-      #301673;
+      #8a6bb8;
   }
 }
 
diff --git a/packages/dashboard-app/src/lib/constants.ts b/packages/dashboard-app/src/lib/constants.ts
index 75c86c34f..468195387 100644
--- a/packages/dashboard-app/src/lib/constants.ts
+++ b/packages/dashboard-app/src/lib/constants.ts
@@ -1,6 +1,7 @@
 // These should match the rust constants in fig_util::consts
-export const PRODUCT_NAME = "Amazon Q";
-export const CLI_BINARY_NAME = "q";
+export const PRODUCT_NAME = "Kiro";
+export const PREVIOUS_PRODUCT_NAME = "Amazon Q";
+export const CLI_BINARY_NAME = "kiro-cli";
 
 export const DESKTOP_ENTRY_NAME = "amazon-q.desktop";
 
diff --git a/packages/dashboard-app/src/pages/onboarding.tsx b/packages/dashboard-app/src/pages/onboarding.tsx
index a3b711a49..5da679146 100644
--- a/packages/dashboard-app/src/pages/onboarding.tsx
+++ b/packages/dashboard-app/src/pages/onboarding.tsx
@@ -3,7 +3,12 @@ import translateDemo from "@assets/images/translate_demo.gif";
 import chatDemo from "@assets/images/chat_demo.gif";
 import { Link } from "@/components/ui/link";
 import { QLogo } from "@/components/svg/icons";
-import { AUTOCOMPLETE_SSH_WIKI_URL, Q_MIGRATION_URL } from "@/lib/constants";
+import {
+  AUTOCOMPLETE_SSH_WIKI_URL,
+  Q_MIGRATION_URL,
+  PRODUCT_NAME,
+  PREVIOUS_PRODUCT_NAME,
+} from "@/lib/constants";
 import { Terminal } from "@/components/ui/terminal";
 
 export default function Page() {
@@ -19,7 +24,7 @@ export default function Page() {
           <QLogo size={42} />
           <div className="flex flex-col gap-1">
             <h1 className="font-bold text-xl font-ember leading-none">
-              CodeWhisperer is now Amazon Q
+              {PREVIOUS_PRODUCT_NAME} is now {PRODUCT_NAME}
             </h1>
             <p className="text-base leading-tight">
               <Link
diff --git a/packages/dashboard-app/src/pages/terminal/chat.tsx b/packages/dashboard-app/src/pages/terminal/chat.tsx
index 99811bdc5..412838ceb 100644
--- a/packages/dashboard-app/src/pages/terminal/chat.tsx
+++ b/packages/dashboard-app/src/pages/terminal/chat.tsx
@@ -2,6 +2,7 @@ import { UserPrefView } from "@/components/preference/list";
 import { Terminal } from "@/components/ui/terminal";
 import settings, { intro } from "@/data/chat";
 import chatDemo from "@assets/images/chat_demo.gif";
+import { PRODUCT_NAME } from "@/lib/constants";
 
 export default function Page() {
   return (
@@ -16,9 +17,10 @@ export default function Page() {
         </h2>
         <div className="flex flex-col gap-6 mt-4">
           <p className="font-light leading-tight">
-            Amazon Q is an agentic AI assistant capable of performing complex,
-            multi-step actions on your behalf. Amazon Q can write files locally,
-            query AWS resources, and execute bash commands for you.
+            {PRODUCT_NAME} is an agentic AI assistant capable of performing
+            complex, multi-step actions on your behalf. {PRODUCT_NAME} can write
+            files locally, query AWS resources, and execute bash commands for
+            you.
           </p>
           <Terminal title="Chat">
             <Terminal.Tab>
diff --git a/packages/dashboard-app/tailwind.config.js b/packages/dashboard-app/tailwind.config.js
index a12a4de98..7bdde6fba 100644
--- a/packages/dashboard-app/tailwind.config.js
+++ b/packages/dashboard-app/tailwind.config.js
@@ -75,17 +75,30 @@ export default {
           950: "#142557",
         },
         dusk: {
-          50: "#f4f3ff",
-          100: "#ebe9fe",
-          200: "#d8d5ff",
-          300: "#bcb4fe",
-          400: "#9c89fc",
-          500: "#7c59f9",
-          600: "#6e3bf1",
-          700: "#5c24dd",
-          800: "#4c1eb9",
-          900: "#401b97",
-          950: "#250e67",
+          50: "#f4f0ff",
+          100: "#ebe0ff",
+          200: "#d8c5ff",
+          300: "#bc9dff",
+          400: "#9c6bff",
+          500: "#8700ff",
+          600: "#7700e6",
+          700: "#6600cc",
+          800: "#5500b3",
+          900: "#440099",
+          950: "#330066",
+        },
+        "dusk-dark": {
+          50: "#faf8ff",
+          100: "#f3edff",
+          200: "#e9ddff",
+          300: "#d9c2ff",
+          400: "#c19aff",
+          500: "#a970ff",
+          600: "#9347ff",
+          700: "#7c2eff",
+          800: "#6b1fff",
+          900: "#5a1ae6",
+          950: "#3d0fb3",
         },
       },
       borderRadius: {