diff --git a/src/app.html b/src/app.html
index 6339817a5a..c2e7a68e33 100644
--- a/src/app.html
+++ b/src/app.html
@@ -16,30 +16,6 @@
             as="font"
             type="font/woff2"
             crossorigin />
-        <link
-            rel="preload"
-            href="/fonts/poppins/poppins-v19-latin-500.woff2"
-            as="font"
-            type="font/woff2"
-            crossorigin />
-        <link
-            rel="preload"
-            href="/fonts/poppins/poppins-v19-latin-600.woff2"
-            as="font"
-            type="font/woff2"
-            crossorigin />
-        <link
-            rel="preload"
-            href="/fonts/poppins/poppins-v19-latin-700.woff2"
-            as="font"
-            type="font/woff2"
-            crossorigin />
-        <link
-            rel="preload"
-            href="/fonts/source-code-pro/source-code-pro-v20-latin-regular.woff2"
-            as="font"
-            type="font/woff2"
-            crossorigin />
         <link rel="preload" as="style" type="text/css" href="/fonts/main.css" />
         <link rel="stylesheet" href="/fonts/main.css" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index bed3f7556d..414a98617d 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -223,7 +223,7 @@
             position: relative;
 
             p {
-                font-family: 'Poppins';
+                font-family: 'Aeonik Pro';
                 font-size: clamp(3.5rem, 7vw, 5.25rem);
                 font-weight: 700;
             }
@@ -251,7 +251,7 @@
     .mobile-beta {
         text-align: center;
         align-self: center;
-        font-family: 'Poppins';
+        font-family: 'Aeonik Pro';
         font-size: 1.125rem;
         font-weight: 700;
         text-transform: uppercase;
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7c6df71e64..1010de904a 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -206,4 +206,8 @@
         mask-composite: exclude;
         pointer-events: none;
     }
+
+    :root {
+        --heading-font: 'Aeonik Pro', arial, sans-serif;
+    }
 </style>
diff --git a/static/fonts/aeonik-pro/AeonikPro-Air.woff2 b/static/fonts/aeonik-pro/AeonikPro-Air.woff2
new file mode 100644
index 0000000000..be98db6b8f
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Air.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-AirItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-AirItalic.woff2
new file mode 100644
index 0000000000..8143309a26
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-AirItalic.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-Black.woff2 b/static/fonts/aeonik-pro/AeonikPro-Black.woff2
new file mode 100644
index 0000000000..e0db5fada1
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Black.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-BlackItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-BlackItalic.woff2
new file mode 100644
index 0000000000..5e8a9a4a12
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-BlackItalic.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-Bold.woff2 b/static/fonts/aeonik-pro/AeonikPro-Bold.woff2
new file mode 100644
index 0000000000..6806a1b889
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Bold.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-BoldItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-BoldItalic.woff2
new file mode 100644
index 0000000000..d761110488
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-BoldItalic.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-Light.woff2 b/static/fonts/aeonik-pro/AeonikPro-Light.woff2
new file mode 100644
index 0000000000..e65bc78592
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Light.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-LightItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-LightItalic.woff2
new file mode 100644
index 0000000000..a792392463
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-LightItalic.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-Medium.woff2 b/static/fonts/aeonik-pro/AeonikPro-Medium.woff2
new file mode 100644
index 0000000000..fdb77499a0
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Medium.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-MediumItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-MediumItalic.woff2
new file mode 100644
index 0000000000..f0dbed6401
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-MediumItalic.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-Regular.woff2 b/static/fonts/aeonik-pro/AeonikPro-Regular.woff2
new file mode 100644
index 0000000000..79f061118f
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Regular.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-RegularItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-RegularItalic.woff2
new file mode 100644
index 0000000000..20f172cf3c
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-RegularItalic.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-Thin.woff2 b/static/fonts/aeonik-pro/AeonikPro-Thin.woff2
new file mode 100644
index 0000000000..e378c86ca3
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-Thin.woff2 differ
diff --git a/static/fonts/aeonik-pro/AeonikPro-ThinItalic.woff2 b/static/fonts/aeonik-pro/AeonikPro-ThinItalic.woff2
new file mode 100644
index 0000000000..5920c221d6
Binary files /dev/null and b/static/fonts/aeonik-pro/AeonikPro-ThinItalic.woff2 differ
diff --git a/static/fonts/main.css b/static/fonts/main.css
index af99c1f9da..6be25e39e7 100644
--- a/static/fonts/main.css
+++ b/static/fonts/main.css
@@ -23,25 +23,113 @@
 }
 
 @font-face {
-    font-family: 'Poppins';
+    font-family: 'Aeonik Pro';
+    font-style: normal;
+    font-weight: 100;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Air.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 100;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-AirItalic.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: normal;
+    font-weight: 200;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Thin.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 200;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-ThinItalic.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: normal;
+    font-weight: 300;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Light.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 300;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-LightItalic.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Regular.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 400;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-RegularItalic.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
     font-style: normal;
     font-weight: 500;
-    font-display: swap;
-    src: url('poppins/poppins-v19-latin-500.woff2') format('woff2');
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Medium.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 500;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-MediumItalic.woff2') format('woff2');
 }
 
 @font-face {
-    font-family: 'Poppins';
+    font-family: 'Aeonik Pro';
     font-style: normal;
     font-weight: 600;
-    font-display: swap;
-    src: url('poppins/poppins-v19-latin-600.woff2') format('woff2');
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Bold.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 600;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-BoldItalic.woff2') format('woff2');
 }
 
 @font-face {
-    font-family: 'Poppins';
+    font-family: 'Aeonik Pro';
     font-style: normal;
     font-weight: 700;
-    font-display: swap;
-    src: url('poppins/poppins-v19-latin-700.woff2') format('woff2');
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-Black.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Aeonik Pro';
+    font-style: italic;
+    font-weight: 700;
+    src: local('Aeonik Pro'), local('AeonikPro'),
+        url('aeonik-pro/AeonikPro-BlackItalic.woff2') format('woff2');
 }