diff --git a/packages/app/index.html b/packages/app/index.html
index 450807a42e0..1e516cbbb1d 100644
--- a/packages/app/index.html
+++ b/packages/app/index.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>OpenCode</title>
-    <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <link rel="shortcut icon" href="/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" href="/favicon-96x96-v2.png" sizes="96x96" />
+    <link rel="icon" type="image/svg+xml" href="/favicon-v2.svg" />
+    <link rel="shortcut icon" href="/favicon-v2.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-v2.png" />
     <link rel="manifest" href="/site.webmanifest" />
     <meta name="theme-color" content="#F8F7F7" />
     <meta name="theme-color" content="#131010" media="(prefers-color-scheme: dark)" />
diff --git a/packages/app/public/apple-touch-icon-v2.png b/packages/app/public/apple-touch-icon-v2.png
new file mode 120000
index 00000000000..c0d4353db47
--- /dev/null
+++ b/packages/app/public/apple-touch-icon-v2.png
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/apple-touch-icon-v2.png
\ No newline at end of file
diff --git a/packages/app/public/favicon-96x96-v2.png b/packages/app/public/favicon-96x96-v2.png
new file mode 120000
index 00000000000..b3129f6bf91
--- /dev/null
+++ b/packages/app/public/favicon-96x96-v2.png
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/favicon-96x96-v2.png
\ No newline at end of file
diff --git a/packages/app/public/favicon-v2.ico b/packages/app/public/favicon-v2.ico
new file mode 120000
index 00000000000..d8527270af6
--- /dev/null
+++ b/packages/app/public/favicon-v2.ico
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/favicon-v2.ico
\ No newline at end of file
diff --git a/packages/app/public/favicon-v2.svg b/packages/app/public/favicon-v2.svg
new file mode 120000
index 00000000000..2600394ceae
--- /dev/null
+++ b/packages/app/public/favicon-v2.svg
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/favicon-v2.svg
\ No newline at end of file
diff --git a/packages/app/src/entry.tsx b/packages/app/src/entry.tsx
index 28741098c8e..8c4662926ad 100644
--- a/packages/app/src/entry.tsx
+++ b/packages/app/src/entry.tsx
@@ -37,7 +37,7 @@ const platform: Platform = {
       .then(() => {
         const notification = new Notification(title, {
           body: description ?? "",
-          icon: "https://opencode.ai/favicon-96x96.png",
+          icon: "https://opencode.ai/favicon-96x96-v2.png",
         })
         notification.onclick = () => {
           window.focus()
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index 81177d1386d..2f3b39d8628 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -1284,7 +1284,7 @@ export default function Layout(props: ParentProps) {
         <div class="size-full rounded overflow-clip">
           <Avatar
             fallback={name()}
-            src={props.project.id === opencode ? "https://opencode.ai/favicon.svg" : props.project.icon?.url}
+            src={props.project.id === opencode ? "https://opencode.ai/favicon-v2.svg" : props.project.icon?.url}
             {...getAvatarColors(props.project.icon?.color)}
             class="size-full rounded"
             style={
diff --git a/packages/console/function/src/auth.ts b/packages/console/function/src/auth.ts
index 082564b21ce..ee68dffff53 100644
--- a/packages/console/function/src/auth.ts
+++ b/packages/console/function/src/auth.ts
@@ -35,7 +35,7 @@ export const subjects = createSubjects({
 
 const MY_THEME: Theme = {
   ...THEME_OPENAUTH,
-  logo: "https://opencode.ai/favicon.svg",
+  logo: "https://opencode.ai/favicon-v2.svg",
 }
 
 export default {
diff --git a/packages/desktop/index.html b/packages/desktop/index.html
index d7d439ab8ab..f03666d5e78 100644
--- a/packages/desktop/index.html
+++ b/packages/desktop/index.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>OpenCode</title>
-    <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <link rel="shortcut icon" href="/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" href="/favicon-96x96-v2.png" sizes="96x96" />
+    <link rel="icon" type="image/svg+xml" href="/favicon-v2.svg" />
+    <link rel="shortcut icon" href="/favicon-v2.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-v2.png" />
     <link rel="manifest" href="/site.webmanifest" />
     <meta name="theme-color" content="#F8F7F7" />
     <meta name="theme-color" content="#131010" media="(prefers-color-scheme: dark)" />
diff --git a/packages/desktop/src/index.tsx b/packages/desktop/src/index.tsx
index 6cd77d7d557..a06270b13fe 100644
--- a/packages/desktop/src/index.tsx
+++ b/packages/desktop/src/index.tsx
@@ -253,7 +253,7 @@ const createPlatform = (password: Accessor<string | null>): Platform => ({
       .then(() => {
         const notification = new Notification(title, {
           body: description ?? "",
-          icon: "https://opencode.ai/favicon-96x96.png",
+          icon: "https://opencode.ai/favicon-96x96-v2.png",
         })
         notification.onclick = () => {
           const win = getCurrentWindow()
diff --git a/packages/docs/docs.json b/packages/docs/docs.json
index 4461f8253b7..93dff10f8c2 100644
--- a/packages/docs/docs.json
+++ b/packages/docs/docs.json
@@ -7,7 +7,7 @@
     "light": "#07C983",
     "dark": "#15803D"
   },
-  "favicon": "/favicon.svg",
+  "favicon": "/favicon-v2.svg",
   "navigation": {
     "tabs": [
       {
diff --git a/packages/docs/favicon-v2.svg b/packages/docs/favicon-v2.svg
new file mode 100644
index 00000000000..b785c738bf1
--- /dev/null
+++ b/packages/docs/favicon-v2.svg
@@ -0,0 +1,19 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.06145 23.1079C5.26816 22.3769 -3.39077 20.6274 1.4173 5.06384C9.6344 6.09939 16.9728 14.0644 9.06145 23.1079Z" fill="url(#paint0_linear_17557_2021)"/>
+<path d="M8.91928 23.0939C5.27642 21.2223 0.78371 4.20891 17.0071 0C20.7569 7.19341 19.6212 16.5452 8.91928 23.0939Z" fill="url(#paint1_linear_17557_2021)"/>
+<path d="M8.91388 23.0788C8.73534 19.8817 10.1585 9.08525 23.5699 13.1107C23.1812 20.1229 18.984 26.4182 8.91388 23.0788Z" fill="url(#paint2_linear_17557_2021)"/>
+<defs>
+<linearGradient id="paint0_linear_17557_2021" x1="3.77557" y1="5.91571" x2="5.23185" y2="21.5589" gradientUnits="userSpaceOnUse">
+<stop stop-color="#18E299"/>
+<stop offset="1" stop-color="#15803D"/>
+</linearGradient>
+<linearGradient id="paint1_linear_17557_2021" x1="12.1711" y1="-0.718425" x2="10.1897" y2="22.9832" gradientUnits="userSpaceOnUse">
+<stop stop-color="#16A34A"/>
+<stop offset="1" stop-color="#4ADE80"/>
+</linearGradient>
+<linearGradient id="paint2_linear_17557_2021" x1="23.1327" y1="15.353" x2="9.33841" y2="18.5196" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4ADE80"/>
+<stop offset="1" stop-color="#0D9373"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/ui/src/assets/favicon/apple-touch-icon-v2.png b/packages/ui/src/assets/favicon/apple-touch-icon-v2.png
new file mode 100644
index 00000000000..70fd01b0ea3
Binary files /dev/null and b/packages/ui/src/assets/favicon/apple-touch-icon-v2.png differ
diff --git a/packages/ui/src/assets/favicon/favicon-96x96-v2.png b/packages/ui/src/assets/favicon/favicon-96x96-v2.png
new file mode 100644
index 00000000000..15266d28f15
Binary files /dev/null and b/packages/ui/src/assets/favicon/favicon-96x96-v2.png differ
diff --git a/packages/ui/src/assets/favicon/favicon-v2.ico b/packages/ui/src/assets/favicon/favicon-v2.ico
new file mode 100644
index 00000000000..34ca0b9c01b
Binary files /dev/null and b/packages/ui/src/assets/favicon/favicon-v2.ico differ
diff --git a/packages/ui/src/assets/favicon/favicon-v2.svg b/packages/ui/src/assets/favicon/favicon-v2.svg
new file mode 100644
index 00000000000..157edc4d752
--- /dev/null
+++ b/packages/ui/src/assets/favicon/favicon-v2.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512"><svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="512" height="512" fill="#131010"></rect>
+<path d="M320 224V352H192V224H320Z" fill="#5A5858"></path>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M384 416H128V96H384V416ZM320 160H192V352H320V160Z" fill="white"></path>
+</svg><style>@media (prefers-color-scheme: light) { :root { filter: none; } }
+@media (prefers-color-scheme: dark) { :root { filter: none; } }
+</style></svg>
\ No newline at end of file
diff --git a/packages/ui/src/components/favicon.tsx b/packages/ui/src/components/favicon.tsx
index 3462384d458..abb0e1f78c6 100644
--- a/packages/ui/src/components/favicon.tsx
+++ b/packages/ui/src/components/favicon.tsx
@@ -3,9 +3,9 @@ import { Link, Meta } from "@solidjs/meta"
 export const Favicon = () => {
   return (
     <>
-      <Link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
-      <Link rel="shortcut icon" href="/favicon.ico" />
-      <Link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+      <Link rel="icon" type="image/png" href="/favicon-96x96-v2.png" sizes="96x96" />
+      <Link rel="shortcut icon" href="/favicon-v2.ico" />
+      <Link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-v2.png" />
       <Link rel="manifest" href="/site.webmanifest" />
       <Meta name="apple-mobile-web-app-title" content="OpenCode" />
     </>
diff --git a/packages/web/astro.config.mjs b/packages/web/astro.config.mjs
index 99a1c3bd80c..9be189cede8 100644
--- a/packages/web/astro.config.mjs
+++ b/packages/web/astro.config.mjs
@@ -32,6 +32,34 @@ export default defineConfig({
     solidJs(),
     starlight({
       title: "OpenCode",
+      favicon: "/favicon-v2.svg",
+      head: [
+        {
+          tag: "link",
+          attrs: {
+            rel: "icon",
+            href: "/favicon-v2.ico",
+            sizes: "32x32",
+          },
+        },
+        {
+          tag: "link",
+          attrs: {
+            rel: "icon",
+            type: "image/png",
+            href: "/favicon-96x96-v2.png",
+            sizes: "96x96",
+          },
+        },
+        {
+          tag: "link",
+          attrs: {
+            rel: "apple-touch-icon",
+            href: "/apple-touch-icon-v2.png",
+            sizes: "180x180",
+          },
+        },
+      ],
       lastUpdated: true,
       expressiveCode: { themes: ["github-light", "github-dark"] },
       social: [
diff --git a/packages/web/public/apple-touch-icon-v2.png b/packages/web/public/apple-touch-icon-v2.png
new file mode 120000
index 00000000000..c0d4353db47
--- /dev/null
+++ b/packages/web/public/apple-touch-icon-v2.png
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/apple-touch-icon-v2.png
\ No newline at end of file
diff --git a/packages/web/public/favicon-96x96-v2.png b/packages/web/public/favicon-96x96-v2.png
new file mode 120000
index 00000000000..b3129f6bf91
--- /dev/null
+++ b/packages/web/public/favicon-96x96-v2.png
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/favicon-96x96-v2.png
\ No newline at end of file
diff --git a/packages/web/public/favicon-v2.ico b/packages/web/public/favicon-v2.ico
new file mode 120000
index 00000000000..d8527270af6
--- /dev/null
+++ b/packages/web/public/favicon-v2.ico
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/favicon-v2.ico
\ No newline at end of file
diff --git a/packages/web/public/favicon-v2.svg b/packages/web/public/favicon-v2.svg
new file mode 120000
index 00000000000..2600394ceae
--- /dev/null
+++ b/packages/web/public/favicon-v2.svg
@@ -0,0 +1 @@
+../../ui/src/assets/favicon/favicon-v2.svg
\ No newline at end of file