diff --git a/public/fonts/ember/Amazon-Ember-Medium.ttf b/public/fonts/ember/Amazon-Ember-Medium.ttf
new file mode 100644
index 00000000..8c731e96
Binary files /dev/null and b/public/fonts/ember/Amazon-Ember-Medium.ttf differ
diff --git a/public/fonts/ember/Amazon-Ember-MediumItalic.ttf b/public/fonts/ember/Amazon-Ember-MediumItalic.ttf
new file mode 100644
index 00000000..76afa50e
Binary files /dev/null and b/public/fonts/ember/Amazon-Ember-MediumItalic.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_Bd.ttf b/public/fonts/ember/AmazonEmber_Bd.ttf
new file mode 100644
index 00000000..aee22007
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_Bd.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_BdIt.ttf b/public/fonts/ember/AmazonEmber_BdIt.ttf
new file mode 100644
index 00000000..0ff95baf
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_BdIt.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_He.ttf b/public/fonts/ember/AmazonEmber_He.ttf
new file mode 100644
index 00000000..b44ad9f1
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_He.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_HeIt.ttf b/public/fonts/ember/AmazonEmber_HeIt.ttf
new file mode 100644
index 00000000..9e02baa0
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_HeIt.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_Lt.ttf b/public/fonts/ember/AmazonEmber_Lt.ttf
new file mode 100644
index 00000000..a32aee2a
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_Lt.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_LtIt.ttf b/public/fonts/ember/AmazonEmber_LtIt.ttf
new file mode 100644
index 00000000..ad3b4d05
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_LtIt.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_Rg.ttf b/public/fonts/ember/AmazonEmber_Rg.ttf
new file mode 100644
index 00000000..f17f7b49
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_Rg.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_RgIt.ttf b/public/fonts/ember/AmazonEmber_RgIt.ttf
new file mode 100644
index 00000000..05c1af8c
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_RgIt.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_Th.ttf b/public/fonts/ember/AmazonEmber_Th.ttf
new file mode 100644
index 00000000..09b020f6
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_Th.ttf differ
diff --git a/public/fonts/ember/AmazonEmber_ThIt.ttf b/public/fonts/ember/AmazonEmber_ThIt.ttf
new file mode 100644
index 00000000..2237ccb8
Binary files /dev/null and b/public/fonts/ember/AmazonEmber_ThIt.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-Bold.ttf b/public/fonts/google-sans/GoogleSans-Bold.ttf
new file mode 100644
index 00000000..71b847f8
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-Bold.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-BoldItalic.ttf b/public/fonts/google-sans/GoogleSans-BoldItalic.ttf
new file mode 100644
index 00000000..82e0e6a1
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-BoldItalic.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-Italic.ttf b/public/fonts/google-sans/GoogleSans-Italic.ttf
new file mode 100644
index 00000000..1f9059a5
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-Italic.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-Medium.ttf b/public/fonts/google-sans/GoogleSans-Medium.ttf
new file mode 100644
index 00000000..8b9aebc9
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-Medium.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-MediumItalic.ttf b/public/fonts/google-sans/GoogleSans-MediumItalic.ttf
new file mode 100644
index 00000000..407b297d
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-MediumItalic.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-Regular.ttf b/public/fonts/google-sans/GoogleSans-Regular.ttf
new file mode 100644
index 00000000..cc37c3f3
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-Regular.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-SemiBold.ttf b/public/fonts/google-sans/GoogleSans-SemiBold.ttf
new file mode 100644
index 00000000..b80284d2
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-SemiBold.ttf differ
diff --git a/public/fonts/google-sans/GoogleSans-SemiBoldItalic.ttf b/public/fonts/google-sans/GoogleSans-SemiBoldItalic.ttf
new file mode 100644
index 00000000..4d348491
Binary files /dev/null and b/public/fonts/google-sans/GoogleSans-SemiBoldItalic.ttf differ
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index aeb9dfc1..274030ed 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 import "./globals.css";
-import { Geist, Inter, Manrope, Open_Sans } from "next/font/google";
+import localFont from "next/font/local";
+import { APP_FONT } from "./font-config";
 import { ThemeProvider } from "@app/providers/ThemeProvider";
 import EnvProvider from "@app/providers/EnvProvider";
 import { pullEnv } from "@app/lib/pullEnv";
@@ -24,6 +25,7 @@ import { TanstackQueryProvider } from "@app/components/TanstackQueryProvider";
 import { TailwindIndicator } from "@app/components/TailwindIndicator";
 import { ViewportHeightFix } from "@app/components/ViewportHeightFix";
 import StoreInternalRedirect from "@app/components/StoreInternalRedirect";
+import { Inter } from "next/font/google";
 
 export const metadata: Metadata = {
     title: `Dashboard - ${process.env.BRANDING_APP_NAME || "Pangolin"}`,
@@ -32,10 +34,79 @@ export const metadata: Metadata = {
 
 export const dynamic = "force-dynamic";
 
-const font = Inter({
+const ember = localFont({
+    src: [
+        {
+            path: "../../public/fonts/ember/AmazonEmber_Th.ttf",
+            weight: "100",
+            style: "normal"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_ThIt.ttf",
+            weight: "100",
+            style: "italic"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_Lt.ttf",
+            weight: "300",
+            style: "normal"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_LtIt.ttf",
+            weight: "300",
+            style: "italic"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_Rg.ttf",
+            weight: "400",
+            style: "normal"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_RgIt.ttf",
+            weight: "400",
+            style: "italic"
+        },
+        {
+            path: "../../public/fonts/ember/Amazon-Ember-Medium.ttf",
+            weight: "500",
+            style: "normal"
+        },
+        {
+            path: "../../public/fonts/ember/Amazon-Ember-MediumItalic.ttf",
+            weight: "500",
+            style: "italic"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_Bd.ttf",
+            weight: "700",
+            style: "normal"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_BdIt.ttf",
+            weight: "700",
+            style: "italic"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_He.ttf",
+            weight: "800",
+            style: "normal"
+        },
+        {
+            path: "../../public/fonts/ember/AmazonEmber_HeIt.ttf",
+            weight: "800",
+            style: "italic"
+        }
+    ],
+    variable: "--font-ember",
+    display: "swap"
+});
+
+const inter = Inter({
     subsets: ["latin"]
 });
 
+const fontClassName = inter.className;
+
 export default async function RootLayout({
     children
 }: Readonly<{
@@ -79,7 +150,7 @@ export default async function RootLayout({
 
     return (
         <html suppressHydrationWarning lang={locale}>
-            <body className={`${font.className} h-screen-safe overflow-hidden`}>
+            <body className={`${fontClassName} h-screen-safe overflow-hidden`}>
                 <StoreInternalRedirect />
                 <TopLoader />
                 {build === "saas" && (