diff --git a/umap/static/umap/font.css b/umap/static/umap/font.css
index 5a7dbd05..9d7f4e3c 100644
--- a/umap/static/umap/font.css
+++ b/umap/static/umap/font.css
@@ -5,26 +5,29 @@
 
 @font-face {
     font-family: 'fira_sans';
-    src: url('./font/FiraSans-Light.woff2') format('woff2'),
-         url('./font/FiraSans-Light.woff') format('woff');
+    src: url('./font/firasans-light.woff2') format('woff2'),
+         url('./font/firasans-light.woff') format('woff');
     font-weight: normal;
     font-style: normal;
+    font-display: swap;
 }
 
 @font-face {
     font-family: 'fira_sans';
-    src: url('./font/FiraSans-SemiBold.woff2') format('woff2'),
-         url('./font/FiraSans-SemiBold.woff') format('woff');
+    src: url('./font/firasans-semibold.woff2') format('woff2'),
+         url('./font/firasans-semibold.woff') format('woff');
     font-weight: bold;
     font-style: normal;
+    font-display: swap;
 }
 
 @font-face {
     font-family: 'fira_sans';
-    src: url('./font/FiraSans-LightItalic.woff2') format('woff2'),
-         url('./font/FiraSans-LightItalic.woff') format('woff');
+    src: url('./font/firasans-lightitalic.woff2') format('woff2'),
+         url('./font/firasans-lightitalic.woff') format('woff');
     font-weight: normal;
     font-style: italic;
+    font-display: swap;
 }
 
 
diff --git a/umap/static/umap/font/FiraSans-Light.woff b/umap/static/umap/font/FiraSans-Light.woff
deleted file mode 100755
index 747071e9..00000000
Binary files a/umap/static/umap/font/FiraSans-Light.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-Light.woff2 b/umap/static/umap/font/FiraSans-Light.woff2
deleted file mode 100755
index 5c0e34d6..00000000
Binary files a/umap/static/umap/font/FiraSans-Light.woff2 and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.woff b/umap/static/umap/font/FiraSans-LightItalic.woff
deleted file mode 100755
index e19720ac..00000000
Binary files a/umap/static/umap/font/FiraSans-LightItalic.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.woff2 b/umap/static/umap/font/FiraSans-LightItalic.woff2
deleted file mode 100755
index 0e9b453e..00000000
Binary files a/umap/static/umap/font/FiraSans-LightItalic.woff2 and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.woff b/umap/static/umap/font/FiraSans-SemiBold.woff
deleted file mode 100755
index 8b408d4d..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBold.woff and /dev/null differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.woff2 b/umap/static/umap/font/FiraSans-SemiBold.woff2
deleted file mode 100755
index bafabb5a..00000000
Binary files a/umap/static/umap/font/FiraSans-SemiBold.woff2 and /dev/null differ
diff --git a/umap/static/umap/fonts/firasans-light.woff b/umap/static/umap/fonts/firasans-light.woff
new file mode 100644
index 00000000..cd70d05a
Binary files /dev/null and b/umap/static/umap/fonts/firasans-light.woff differ
diff --git a/umap/static/umap/fonts/firasans-light.woff2 b/umap/static/umap/fonts/firasans-light.woff2
new file mode 100644
index 00000000..e9f3eda8
Binary files /dev/null and b/umap/static/umap/fonts/firasans-light.woff2 differ
diff --git a/umap/static/umap/fonts/firasans-lightitalic.woff b/umap/static/umap/fonts/firasans-lightitalic.woff
new file mode 100644
index 00000000..677ff13e
Binary files /dev/null and b/umap/static/umap/fonts/firasans-lightitalic.woff differ
diff --git a/umap/static/umap/fonts/firasans-lightitalic.woff2 b/umap/static/umap/fonts/firasans-lightitalic.woff2
new file mode 100644
index 00000000..3d0c1d5b
Binary files /dev/null and b/umap/static/umap/fonts/firasans-lightitalic.woff2 differ
diff --git a/umap/static/umap/fonts/firasans-semibold.woff b/umap/static/umap/fonts/firasans-semibold.woff
new file mode 100644
index 00000000..202dfd88
Binary files /dev/null and b/umap/static/umap/fonts/firasans-semibold.woff differ
diff --git a/umap/static/umap/fonts/firasans-semibold.woff2 b/umap/static/umap/fonts/firasans-semibold.woff2
new file mode 100644
index 00000000..65359655
Binary files /dev/null and b/umap/static/umap/fonts/firasans-semibold.woff2 differ