diff --git a/apps/www/public/css/fonts.css b/apps/www/public/css/fonts.css
index abb86df266e..fe4b1f5fc1a 100644
--- a/apps/www/public/css/fonts.css
+++ b/apps/www/public/css/fonts.css
@@ -4,57 +4,57 @@
 
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Book.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Book.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Book.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Book.woff) format('woff');
   font-weight: 400;
   font-style: normal;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-BookItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-BookItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-BookItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-BookItalic.woff) format('woff');
   font-weight: 400;
   font-style: italic;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Medium.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Medium.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Medium.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Medium.woff) format('woff');
   font-weight: 500;
   font-style: normal;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-MediumItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-MediumItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-MediumItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-MediumItalic.woff) format('woff');
   font-weight: 500;
   font-style: italic;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Bold.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Bold.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Bold.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Bold.woff) format('woff');
   font-weight: 700;
   font-style: 600;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-BoldItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-BoldItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-BoldItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-BoldItalic.woff) format('woff');
   font-style: 600;
   font-style: italic;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Black.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Black.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Black.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Black.woff) format('woff');
   font-weight: 800;
   font-style: normal;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-BlackItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-BlackItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-BlackItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-BlackItalic.woff) format('woff');
   font-weight: 800;
   font-style: italic;
 }
diff --git a/studio/public/css/fonts.css b/studio/public/css/fonts.css
index 47a1664edf1..11fc167fc7c 100644
--- a/studio/public/css/fonts.css
+++ b/studio/public/css/fonts.css
@@ -2,57 +2,57 @@
 
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Book.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Book.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Book.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Book.woff) format('woff');
   font-weight: 400;
   font-style: normal;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-BookItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-BookItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-BookItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-BookItalic.woff) format('woff');
   font-weight: 400;
   font-style: italic;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Medium.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Medium.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Medium.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Medium.woff) format('woff');
   font-weight: 500;
   font-style: normal;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-MediumItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-MediumItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-MediumItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-MediumItalic.woff) format('woff');
   font-weight: 500;
   font-style: italic;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Bold.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Bold.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Bold.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Bold.woff) format('woff');
   font-weight: 700;
   font-style: 600;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-BoldItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-BoldItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-BoldItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-BoldItalic.woff) format('woff');
   font-style: 600;
   font-style: italic;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-Black.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-Black.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-Black.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-Black.woff) format('woff');
   font-weight: 800;
   font-style: normal;
 }
 @font-face {
   font-family: 'circular';
-  src: url(/fonts/custom-font/CustomFont-BlackItalic.woff2) format('woff2'),
-    url(/fonts/custom-font/CustomFont-BlackItalic.woff) format('woff');
+  src: url(/fonts/custom/CustomFont-BlackItalic.woff2) format('woff2'),
+    url(/fonts/custom/CustomFont-BlackItalic.woff) format('woff');
   font-weight: 800;
   font-style: italic;
 }
diff --git a/studio/public/fonts/custom-font/CustomFont-Black.woff b/studio/public/fonts/custom/CustomFont-Black.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Black.woff
rename to studio/public/fonts/custom/CustomFont-Black.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-Black.woff2 b/studio/public/fonts/custom/CustomFont-Black.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Black.woff2
rename to studio/public/fonts/custom/CustomFont-Black.woff2
diff --git a/studio/public/fonts/custom-font/CustomFont-BlackItalic.woff b/studio/public/fonts/custom/CustomFont-BlackItalic.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-BlackItalic.woff
rename to studio/public/fonts/custom/CustomFont-BlackItalic.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-BlackItalic.woff2 b/studio/public/fonts/custom/CustomFont-BlackItalic.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-BlackItalic.woff2
rename to studio/public/fonts/custom/CustomFont-BlackItalic.woff2
diff --git a/studio/public/fonts/custom-font/CustomFont-Bold.woff b/studio/public/fonts/custom/CustomFont-Bold.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Bold.woff
rename to studio/public/fonts/custom/CustomFont-Bold.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-Bold.woff2 b/studio/public/fonts/custom/CustomFont-Bold.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Bold.woff2
rename to studio/public/fonts/custom/CustomFont-Bold.woff2
diff --git a/studio/public/fonts/custom-font/CustomFont-BoldItalic.woff b/studio/public/fonts/custom/CustomFont-BoldItalic.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-BoldItalic.woff
rename to studio/public/fonts/custom/CustomFont-BoldItalic.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-BoldItalic.woff2 b/studio/public/fonts/custom/CustomFont-BoldItalic.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-BoldItalic.woff2
rename to studio/public/fonts/custom/CustomFont-BoldItalic.woff2
diff --git a/studio/public/fonts/custom-font/CustomFont-Book.woff b/studio/public/fonts/custom/CustomFont-Book.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Book.woff
rename to studio/public/fonts/custom/CustomFont-Book.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-Book.woff2 b/studio/public/fonts/custom/CustomFont-Book.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Book.woff2
rename to studio/public/fonts/custom/CustomFont-Book.woff2
diff --git a/studio/public/fonts/custom-font/CustomFont-BookItalic.woff b/studio/public/fonts/custom/CustomFont-BookItalic.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-BookItalic.woff
rename to studio/public/fonts/custom/CustomFont-BookItalic.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-BookItalic.woff2 b/studio/public/fonts/custom/CustomFont-BookItalic.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-BookItalic.woff2
rename to studio/public/fonts/custom/CustomFont-BookItalic.woff2
diff --git a/studio/public/fonts/custom-font/CustomFont-Medium.woff b/studio/public/fonts/custom/CustomFont-Medium.woff
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Medium.woff
rename to studio/public/fonts/custom/CustomFont-Medium.woff
diff --git a/studio/public/fonts/custom-font/CustomFont-Medium.woff2 b/studio/public/fonts/custom/CustomFont-Medium.woff2
similarity index 100%
rename from studio/public/fonts/custom-font/CustomFont-Medium.woff2
rename to studio/public/fonts/custom/CustomFont-Medium.woff2