diff --git a/desktop/index.html b/desktop/index.html
index b9d55a37..05d212eb 100644
--- a/desktop/index.html
+++ b/desktop/index.html
@@ -4,8 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Claude Code Companion</title>
-    <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&family=Inter:wght@400;500;600&family=JetBrains+Mono&display=swap" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:wght,FILL@100..700,0..1&display=swap" rel="stylesheet" />
+    <!-- Fonts are self-hosted in /fonts/ and declared via @font-face in globals.css -->
     <style>
       /* Prevent white flash on load */
       html { background: #FAF9F5; }
diff --git a/desktop/public/fonts/inter-latin-ext.woff2 b/desktop/public/fonts/inter-latin-ext.woff2
new file mode 100644
index 00000000..57da6f8d
Binary files /dev/null and b/desktop/public/fonts/inter-latin-ext.woff2 differ
diff --git a/desktop/public/fonts/inter-latin.woff2 b/desktop/public/fonts/inter-latin.woff2
new file mode 100644
index 00000000..91dc3e85
Binary files /dev/null and b/desktop/public/fonts/inter-latin.woff2 differ
diff --git a/desktop/public/fonts/jetbrains-mono-latin-ext.woff2 b/desktop/public/fonts/jetbrains-mono-latin-ext.woff2
new file mode 100644
index 00000000..11da8b45
Binary files /dev/null and b/desktop/public/fonts/jetbrains-mono-latin-ext.woff2 differ
diff --git a/desktop/public/fonts/jetbrains-mono-latin.woff2 b/desktop/public/fonts/jetbrains-mono-latin.woff2
new file mode 100644
index 00000000..5b9b02f0
Binary files /dev/null and b/desktop/public/fonts/jetbrains-mono-latin.woff2 differ
diff --git a/desktop/public/fonts/manrope-latin-ext.woff2 b/desktop/public/fonts/manrope-latin-ext.woff2
new file mode 100644
index 00000000..bdade6d8
Binary files /dev/null and b/desktop/public/fonts/manrope-latin-ext.woff2 differ
diff --git a/desktop/public/fonts/manrope-latin.woff2 b/desktop/public/fonts/manrope-latin.woff2
new file mode 100644
index 00000000..9d7abb17
Binary files /dev/null and b/desktop/public/fonts/manrope-latin.woff2 differ
diff --git a/desktop/public/fonts/material-symbols-outlined.woff2 b/desktop/public/fonts/material-symbols-outlined.woff2
new file mode 100644
index 00000000..44cb1e96
Binary files /dev/null and b/desktop/public/fonts/material-symbols-outlined.woff2 differ
diff --git a/desktop/src/theme/globals.css b/desktop/src/theme/globals.css
index 87a7ac5c..63a1836a 100644
--- a/desktop/src/theme/globals.css
+++ b/desktop/src/theme/globals.css
@@ -1,6 +1,71 @@
 @import "tailwindcss";
 @plugin "@tailwindcss/typography";
 
+/* ─── Self-hosted fonts (no Google CDN dependency) ────────────── */
+
+/* Inter – variable weight 400-600, latin */
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 400 600;
+  font-display: swap;
+  src: url('/fonts/inter-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 400 600;
+  font-display: swap;
+  src: url('/fonts/inter-latin-ext.woff2') format('woff2');
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* Manrope – variable weight 400-800, latin */
+@font-face {
+  font-family: 'Manrope';
+  font-style: normal;
+  font-weight: 400 800;
+  font-display: swap;
+  src: url('/fonts/manrope-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: 'Manrope';
+  font-style: normal;
+  font-weight: 400 800;
+  font-display: swap;
+  src: url('/fonts/manrope-latin-ext.woff2') format('woff2');
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* JetBrains Mono – weight 400, latin */
+@font-face {
+  font-family: 'JetBrains Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/fonts/jetbrains-mono-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: 'JetBrains Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/fonts/jetbrains-mono-latin-ext.woff2') format('woff2');
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* Material Symbols Outlined – variable weight, use block to avoid showing raw text */
+@font-face {
+  font-family: 'Material Symbols Outlined';
+  font-style: normal;
+  font-weight: 100 700;
+  font-display: block;
+  src: url('/fonts/material-symbols-outlined.woff2') format('woff2');
+}
+
 /* Code highlighting is handled by shiki/react-shiki (inline styles + CSS line numbers) */
 
 /* ─── Shiki code viewer ───────────────────────────────────────── */