diff --git a/common/src/main/resources/META-INF/resources/css/fonts.css b/common/src/main/resources/META-INF/resources/css/fonts.css
index 2a5cfbad1..f8a5f29dc 100644
--- a/common/src/main/resources/META-INF/resources/css/fonts.css
+++ b/common/src/main/resources/META-INF/resources/css/fonts.css
@@ -1,300 +1,31 @@
-/*family=Droid+Sans|Droid+Sans+Mono:300,400*/
-/* latin */
 @font-face {
     font-family: 'Droid Sans';
     font-style: normal;
+    font-display: swap;
     font-weight: 400;
-    src: url(../fonts/droid-sans/04424400fbb91d3a161a6446db55baf5.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    src: url(../fonts/droid-sans/droid-sans.woff2) format('woff2');
 }
 
-/* latin */
 @font-face {
     font-family: 'Droid Sans Mono';
     font-style: normal;
+    font-display: swap;
     font-weight: 400;
-    src: url(../fonts/droid-sans-mono/242c3e1fc5794bf33e44dcb29ea7c1de.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    src: url(../fonts/droid-sans-mono/droid-sans-mono.woff2) format('woff2');
 }
 
-/*family=Roboto:300,400*/
-/* cyrillic-ext */
 @font-face {
     font-family: 'Roboto';
     font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/d56abfe33954cd800a45676b0684577b.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+    font-display: swap;
+    font-weight: 300-800;
+    src: url(../fonts/Roboto/Roboto-Regular.woff2) format('woff2');
 }
 
-/* cyrillic */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/7475b4fcc13a8f8811f0dccf5cb117db.woff2) format('woff2');
-    unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/e17f875fd99daf85e1e61ba3fa115428.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/1ef6327eabe2217ef4968c5f090ade10.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/97ae156a75f200cc70d7ded594a414aa.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/ca7e2d880e6a0b9d167c615e6ea3ea54.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto/9da96513b09058c705906f432f79a3b8.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* cyrillic-ext */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/46b998b515eb4933754801479c6f6195.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/1757262c111d884cf1b2b4568ee43750.woff2) format('woff2');
-    unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/7c62c3b3bc43860531136c583262a342.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/f27d864775c4f8c6abc61ba427da2d26.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/12ce6f2df54cb6c6adec3f42d0cd175b.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/46fda89a03c06fbf09a0492219e2734d.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto/a6adaab7bfa86cb86712df4c60fe8f77.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/*family=Roboto+Condensed:300,400*/
-/* cyrillic-ext */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/9b9a1787d74d1d66dddc7db52b1913a3.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
 @font-face {
     font-family: 'Roboto Condensed';
     font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/ca9ac453a3618125fb1e55b2ef3b370f.woff2) format('woff2');
-    unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/beb2b82b14a42073c1a53cde8d0be38e.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/805c9e1b91cc5980efb18b94e89cb517.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/c184c47dd68c6946eb862c5b4bf2848a.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/fe516c16ddc5e870c407dbacd7759b63.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 300;
-    src: url(../fonts/Roboto_Condensed/f139fb22672e2f08f5433582f29e3fff.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* cyrillic-ext */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/63e8233a49094fcf6e46cef4439190f8.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/0db989e1400eb987b7877eaa94908ff8.woff2) format('woff2');
-    unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/6c865e85b582a7c2c81ac881dba77558.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/26c4907074899657caa5bb6ab5a2f68a.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/f8c6295cb4c13912da5c032c12dfec11.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/21bf24465b3d5ac66ad684b79d52a8a1.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Roboto Condensed';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Roboto_Condensed/1fe01eb7154fb93b7cafacb67954a5ac.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/*family=Amiri:300,400*/
-/* arabic */
-@font-face {
-    font-family: 'Amiri';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Amiri/5f2308e5c933aef9f4980603fcbd3c56.woff2) format('woff2');
-    unicode-range: U+0600-06FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF, U+FE80-FEFC;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Amiri';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Amiri/4cab594dafa21a3c8a4109baf4f434b7.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Amiri';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/Amiri/bf819e66d5033945655dd0efcdd3faa9.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    font-display: swap;
+    font-weight: 300-800;
+    src: url(../fonts/Roboto_Condensed/RobotoCondensed-VariableFont_wght.woff2) format('woff2');
 }
diff --git a/common/src/main/resources/META-INF/resources/fonts/Amiri/4cab594dafa21a3c8a4109baf4f434b7.woff2 b/common/src/main/resources/META-INF/resources/fonts/Amiri/4cab594dafa21a3c8a4109baf4f434b7.woff2
deleted file mode 100644
index c769ae1ad..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Amiri/4cab594dafa21a3c8a4109baf4f434b7.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Amiri/5f2308e5c933aef9f4980603fcbd3c56.woff2 b/common/src/main/resources/META-INF/resources/fonts/Amiri/5f2308e5c933aef9f4980603fcbd3c56.woff2
deleted file mode 100644
index d768cdfe1..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Amiri/5f2308e5c933aef9f4980603fcbd3c56.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Amiri/bf819e66d5033945655dd0efcdd3faa9.woff2 b/common/src/main/resources/META-INF/resources/fonts/Amiri/bf819e66d5033945655dd0efcdd3faa9.woff2
deleted file mode 100644
index 6ef46c23e..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Amiri/bf819e66d5033945655dd0efcdd3faa9.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/12ce6f2df54cb6c6adec3f42d0cd175b.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/12ce6f2df54cb6c6adec3f42d0cd175b.woff2
deleted file mode 100644
index 6284d2e3b..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/12ce6f2df54cb6c6adec3f42d0cd175b.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/1757262c111d884cf1b2b4568ee43750.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/1757262c111d884cf1b2b4568ee43750.woff2
deleted file mode 100644
index 47da36299..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/1757262c111d884cf1b2b4568ee43750.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/1ef6327eabe2217ef4968c5f090ade10.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/1ef6327eabe2217ef4968c5f090ade10.woff2
deleted file mode 100644
index b289f0029..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/1ef6327eabe2217ef4968c5f090ade10.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/46b998b515eb4933754801479c6f6195.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/46b998b515eb4933754801479c6f6195.woff2
deleted file mode 100644
index 22ddee9c9..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/46b998b515eb4933754801479c6f6195.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/46fda89a03c06fbf09a0492219e2734d.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/46fda89a03c06fbf09a0492219e2734d.woff2
deleted file mode 100644
index 8a8de615e..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/46fda89a03c06fbf09a0492219e2734d.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/7475b4fcc13a8f8811f0dccf5cb117db.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/7475b4fcc13a8f8811f0dccf5cb117db.woff2
deleted file mode 100644
index 9d7fb7f87..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/7475b4fcc13a8f8811f0dccf5cb117db.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/7c62c3b3bc43860531136c583262a342.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/7c62c3b3bc43860531136c583262a342.woff2
deleted file mode 100644
index 72ce0e984..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/7c62c3b3bc43860531136c583262a342.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/97ae156a75f200cc70d7ded594a414aa.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/97ae156a75f200cc70d7ded594a414aa.woff2
deleted file mode 100644
index c00998785..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/97ae156a75f200cc70d7ded594a414aa.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/9da96513b09058c705906f432f79a3b8.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/9da96513b09058c705906f432f79a3b8.woff2
deleted file mode 100644
index 60681387e..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/9da96513b09058c705906f432f79a3b8.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/Roboto-Regular.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/Roboto-Regular.woff2
new file mode 100644
index 000000000..fba688417
Binary files /dev/null and b/common/src/main/resources/META-INF/resources/fonts/Roboto/Roboto-Regular.woff2 differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/a6adaab7bfa86cb86712df4c60fe8f77.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/a6adaab7bfa86cb86712df4c60fe8f77.woff2
deleted file mode 100644
index 020729ef8..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/a6adaab7bfa86cb86712df4c60fe8f77.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/ca7e2d880e6a0b9d167c615e6ea3ea54.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/ca7e2d880e6a0b9d167c615e6ea3ea54.woff2
deleted file mode 100644
index 91231c9c4..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/ca7e2d880e6a0b9d167c615e6ea3ea54.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/d56abfe33954cd800a45676b0684577b.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/d56abfe33954cd800a45676b0684577b.woff2
deleted file mode 100644
index 0f6e60b8e..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/d56abfe33954cd800a45676b0684577b.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/e17f875fd99daf85e1e61ba3fa115428.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/e17f875fd99daf85e1e61ba3fa115428.woff2
deleted file mode 100644
index 87711c048..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/e17f875fd99daf85e1e61ba3fa115428.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto/f27d864775c4f8c6abc61ba427da2d26.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto/f27d864775c4f8c6abc61ba427da2d26.woff2
deleted file mode 100644
index fc71d944a..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto/f27d864775c4f8c6abc61ba427da2d26.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/0db989e1400eb987b7877eaa94908ff8.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/0db989e1400eb987b7877eaa94908ff8.woff2
deleted file mode 100644
index 2700b1f3a..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/0db989e1400eb987b7877eaa94908ff8.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/1fe01eb7154fb93b7cafacb67954a5ac.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/1fe01eb7154fb93b7cafacb67954a5ac.woff2
deleted file mode 100644
index e4c259c72..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/1fe01eb7154fb93b7cafacb67954a5ac.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/21bf24465b3d5ac66ad684b79d52a8a1.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/21bf24465b3d5ac66ad684b79d52a8a1.woff2
deleted file mode 100644
index f003e86ea..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/21bf24465b3d5ac66ad684b79d52a8a1.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/26c4907074899657caa5bb6ab5a2f68a.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/26c4907074899657caa5bb6ab5a2f68a.woff2
deleted file mode 100644
index 314c9a731..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/26c4907074899657caa5bb6ab5a2f68a.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/63e8233a49094fcf6e46cef4439190f8.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/63e8233a49094fcf6e46cef4439190f8.woff2
deleted file mode 100644
index 3608e513b..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/63e8233a49094fcf6e46cef4439190f8.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/6c865e85b582a7c2c81ac881dba77558.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/6c865e85b582a7c2c81ac881dba77558.woff2
deleted file mode 100644
index c2c0efa3f..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/6c865e85b582a7c2c81ac881dba77558.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/805c9e1b91cc5980efb18b94e89cb517.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/805c9e1b91cc5980efb18b94e89cb517.woff2
deleted file mode 100644
index 734113d76..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/805c9e1b91cc5980efb18b94e89cb517.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/9b9a1787d74d1d66dddc7db52b1913a3.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/9b9a1787d74d1d66dddc7db52b1913a3.woff2
deleted file mode 100644
index 4942ef780..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/9b9a1787d74d1d66dddc7db52b1913a3.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/RobotoCondensed-VariableFont_wght.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/RobotoCondensed-VariableFont_wght.woff2
new file mode 100644
index 000000000..1e2744826
Binary files /dev/null and b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/RobotoCondensed-VariableFont_wght.woff2 differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/beb2b82b14a42073c1a53cde8d0be38e.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/beb2b82b14a42073c1a53cde8d0be38e.woff2
deleted file mode 100644
index 19bd6527e..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/beb2b82b14a42073c1a53cde8d0be38e.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/c184c47dd68c6946eb862c5b4bf2848a.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/c184c47dd68c6946eb862c5b4bf2848a.woff2
deleted file mode 100644
index e96302618..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/c184c47dd68c6946eb862c5b4bf2848a.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/ca9ac453a3618125fb1e55b2ef3b370f.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/ca9ac453a3618125fb1e55b2ef3b370f.woff2
deleted file mode 100644
index 9f4c86d45..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/ca9ac453a3618125fb1e55b2ef3b370f.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/f139fb22672e2f08f5433582f29e3fff.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/f139fb22672e2f08f5433582f29e3fff.woff2
deleted file mode 100644
index 87001d190..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/f139fb22672e2f08f5433582f29e3fff.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/f8c6295cb4c13912da5c032c12dfec11.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/f8c6295cb4c13912da5c032c12dfec11.woff2
deleted file mode 100644
index 6359e5e59..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/f8c6295cb4c13912da5c032c12dfec11.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/fe516c16ddc5e870c407dbacd7759b63.woff2 b/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/fe516c16ddc5e870c407dbacd7759b63.woff2
deleted file mode 100644
index bd11c8a41..000000000
Binary files a/common/src/main/resources/META-INF/resources/fonts/Roboto_Condensed/fe516c16ddc5e870c407dbacd7759b63.woff2 and /dev/null differ
diff --git a/common/src/main/resources/META-INF/resources/fonts/droid-sans-mono/242c3e1fc5794bf33e44dcb29ea7c1de.woff2 b/common/src/main/resources/META-INF/resources/fonts/droid-sans-mono/droid-sans-mono.woff2
similarity index 100%
rename from common/src/main/resources/META-INF/resources/fonts/droid-sans-mono/242c3e1fc5794bf33e44dcb29ea7c1de.woff2
rename to common/src/main/resources/META-INF/resources/fonts/droid-sans-mono/droid-sans-mono.woff2
diff --git a/common/src/main/resources/META-INF/resources/fonts/droid-sans/04424400fbb91d3a161a6446db55baf5.woff2 b/common/src/main/resources/META-INF/resources/fonts/droid-sans/droid-sans.woff2
similarity index 100%
rename from common/src/main/resources/META-INF/resources/fonts/droid-sans/04424400fbb91d3a161a6446db55baf5.woff2
rename to common/src/main/resources/META-INF/resources/fonts/droid-sans/droid-sans.woff2
diff --git a/erfurt/src/main/resources/META-INF/resources/css/fonts.css b/erfurt/src/main/resources/META-INF/resources/css/fonts.css
index a7bb59485..7084927b9 100644
--- a/erfurt/src/main/resources/META-INF/resources/css/fonts.css
+++ b/erfurt/src/main/resources/META-INF/resources/css/fonts.css
@@ -1,269 +1,42 @@
+/**************/
 /* Noto Sans */
+/**************/
 
 /* Regular */
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* devanagari */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
-}
-
-/* greek-ext */
 @font-face {
   font-family: 'Noto Sans Regular';
   font-style: normal;
+  font-display: swap;
   font-weight: 300;
   src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-  font-family: 'Noto Sans Regular';
-  font-style: normal;
-  font-weight: 300;
-  src: url(../fonts/NotoSans/NotoSans-Regular.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* Bold */
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Noto Sans Bold';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-  font-family: 'Noto Sans Bold';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-  font-family: 'Noto Sans Bold';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-  font-family: 'Noto Sans Bold';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
 @font-face {
   font-family: 'Noto Sans Bold';
   font-style: normal;
+  font-display: swap;
   font-weight: 700;
   src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-  font-family: 'Noto Sans Bold';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-  font-family: 'Noto Sans Bold';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSans/NotoSans-Bold.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /**************/
 /* Noto Serif */
 /**************/
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
 
-/* latin */
 @font-face {
   font-family: 'Noto Serif';
   font-style: normal;
+  font-display: swap;
   font-weight: 400;
   src: url(../fonts/NotoSerif/NotoSerif-Regular.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* bold */
-
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-  font-family: 'Noto Serif';
-  font-style: normal;
-  font-weight: 700;
-  src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
 @font-face {
   font-family: 'Noto Serif';
   font-style: normal;
+  font-display: swap;
   font-weight: 700;
   src: url(../fonts/NotoSerif/NotoSerif-Bold.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
diff --git a/jena/src/main/resources/xsl/html-layout.xsl b/jena/src/main/resources/xsl/html-layout.xsl
index c44d1aaaf..3eb200863 100644
--- a/jena/src/main/resources/xsl/html-layout.xsl
+++ b/jena/src/main/resources/xsl/html-layout.xsl
@@ -53,32 +53,21 @@
       <meta http-equiv="x-ua-compatible" content="ie=edge"/>
 
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet"/>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"></script>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"></script>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"></script>
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css"
-            rel="stylesheet"/>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"></script>
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css"
-            type="text/css"/>
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css"
-            type="text/css"/>
+      <script src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
+      <script src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"/>
+      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css" rel="stylesheet"/>
+      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
       <link rel="shortcut icon" href="{$WebApplicationBaseURL}images/favicon.ico"/>
 
-      <script type="text/javascript">var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
-      </script>
-      <script type="text/javascript">var currentLang = '<xsl:value-of select="$CurrentLang"/>';
-      </script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/session-polling.js"></script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/person-popover.js"></script>
+      <script>var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';</script>
+      <script>var currentLang = '<xsl:value-of select="$CurrentLang"/>';</script>
+      <script src="{$WebApplicationBaseURL}js/session-polling.js"/>
+      <script src="{$WebApplicationBaseURL}js/person-popover.js"/>
       <xsl:copy-of select="node()"/>
     </head>
   </xsl:template>
diff --git a/weimar/src/main/resources/META-INF/resources/css/fonts.css b/weimar/src/main/resources/META-INF/resources/css/fonts.css
deleted file mode 100644
index e294d5226..000000000
--- a/weimar/src/main/resources/META-INF/resources/css/fonts.css
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Regular */
-/* cyrillic-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* Italic */
-/* cyrillic-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url(../fonts/FiraSans/FiraSans-Italic.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* Bold */
-/* cyrillic-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-    font-family: 'Fira Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url(../fonts/FiraSans/FiraSans-Bold.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/weimar/src/main/resources/META-INF/resources/scss/base/_fonts.scss b/weimar/src/main/resources/META-INF/resources/scss/base/_fonts.scss
new file mode 100644
index 000000000..9f09f5abf
--- /dev/null
+++ b/weimar/src/main/resources/META-INF/resources/scss/base/_fonts.scss
@@ -0,0 +1,7 @@
+@font-face {
+  font-family: 'Fira Sans';
+  font-style: normal;
+  font-weight: 400-700;
+  font-display: swap;
+  src: url(../../../fonts/FiraSans/FiraSans-Regular.woff2) format('woff2');
+}
diff --git a/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss b/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
index a75f46752..f13bbbff0 100644
--- a/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
+++ b/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
@@ -21,3 +21,4 @@
 @import "./base/forms";
 // forms but not buttons
 @import "./base/cards"; // cards
+@import "./base/fonts";
diff --git a/weimar/src/main/resources/xsl/html-layout.xsl b/weimar/src/main/resources/xsl/html-layout.xsl
index 151988afc..27a51b4fe 100644
--- a/weimar/src/main/resources/xsl/html-layout.xsl
+++ b/weimar/src/main/resources/xsl/html-layout.xsl
@@ -52,23 +52,16 @@
 
       <link rel="shortcut icon" href="{$WebApplicationBaseURL}images/favicon.ico"/>
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet"/>
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
       <script src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
-      <script
-        src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
       <script src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"/>
 
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css"
-            rel="stylesheet"/>
+      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css" rel="stylesheet"/>
       <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
 
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css"
-            type="text/css"/>
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css"
-            type="text/css"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
 
       <script>
         var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';