diff --git a/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff b/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff
new file mode 100755
index 000000000..2d619c8df
Binary files /dev/null and b/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff differ
diff --git a/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff2 b/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff2
old mode 100644
new mode 100755
index 6ffdb8548..08b2a8bbd
Binary files a/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff2 and b/src/system/assets/fonts/gentium-basic/GentiumBasic-Italic.woff2 differ
diff --git a/src/system/assets/fonts/gentium-basic/GentiumBasic.woff b/src/system/assets/fonts/gentium-basic/GentiumBasic.woff
new file mode 100755
index 000000000..b64856660
Binary files /dev/null and b/src/system/assets/fonts/gentium-basic/GentiumBasic.woff differ
diff --git a/src/system/assets/fonts/gentium-basic/GentiumBasic.woff2 b/src/system/assets/fonts/gentium-basic/GentiumBasic.woff2
old mode 100644
new mode 100755
index 4322e58ff..73b95a3e6
Binary files a/src/system/assets/fonts/gentium-basic/GentiumBasic.woff2 and b/src/system/assets/fonts/gentium-basic/GentiumBasic.woff2 differ
diff --git a/src/system/assets/fonts/lato/Lato-Bold.woff b/src/system/assets/fonts/lato/Lato-Bold.woff
new file mode 100755
index 000000000..4a05d41f8
Binary files /dev/null and b/src/system/assets/fonts/lato/Lato-Bold.woff differ
diff --git a/src/system/assets/fonts/lato/Lato-Bold.woff2 b/src/system/assets/fonts/lato/Lato-Bold.woff2
new file mode 100755
index 000000000..403910390
Binary files /dev/null and b/src/system/assets/fonts/lato/Lato-Bold.woff2 differ
diff --git a/src/system/assets/fonts/lato/Lato-BoldItalic.woff b/src/system/assets/fonts/lato/Lato-BoldItalic.woff
new file mode 100755
index 000000000..6948134fd
Binary files /dev/null and b/src/system/assets/fonts/lato/Lato-BoldItalic.woff differ
diff --git a/src/system/assets/fonts/lato/Lato-BoldItalic.woff2 b/src/system/assets/fonts/lato/Lato-BoldItalic.woff2
new file mode 100755
index 000000000..370e19a64
Binary files /dev/null and b/src/system/assets/fonts/lato/Lato-BoldItalic.woff2 differ
diff --git a/src/system/assets/fonts/lato/Lato-Italic.eot b/src/system/assets/fonts/lato/Lato-Italic.eot
deleted file mode 100644
index 3f826421a..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Italic.eot and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Italic.ttf b/src/system/assets/fonts/lato/Lato-Italic.ttf
deleted file mode 100644
index b4bfc9b24..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Italic.ttf and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Italic.woff b/src/system/assets/fonts/lato/Lato-Italic.woff
old mode 100644
new mode 100755
index 76114bc03..5a3ef04a3
Binary files a/src/system/assets/fonts/lato/Lato-Italic.woff and b/src/system/assets/fonts/lato/Lato-Italic.woff differ
diff --git a/src/system/assets/fonts/lato/Lato-Italic.woff2 b/src/system/assets/fonts/lato/Lato-Italic.woff2
old mode 100644
new mode 100755
index 3404f37e2..fca06c03e
Binary files a/src/system/assets/fonts/lato/Lato-Italic.woff2 and b/src/system/assets/fonts/lato/Lato-Italic.woff2 differ
diff --git a/src/system/assets/fonts/lato/Lato-Regular.eot b/src/system/assets/fonts/lato/Lato-Regular.eot
deleted file mode 100644
index 11e3f2a5f..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Regular.eot and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Regular.ttf b/src/system/assets/fonts/lato/Lato-Regular.ttf
deleted file mode 100644
index 74decd9eb..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Regular.ttf and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Regular.woff b/src/system/assets/fonts/lato/Lato-Regular.woff
old mode 100644
new mode 100755
index ae1307ff5..b597f6367
Binary files a/src/system/assets/fonts/lato/Lato-Regular.woff and b/src/system/assets/fonts/lato/Lato-Regular.woff differ
diff --git a/src/system/assets/fonts/lato/Lato-Regular.woff2 b/src/system/assets/fonts/lato/Lato-Regular.woff2
old mode 100644
new mode 100755
index 3bf984332..d16f838a2
Binary files a/src/system/assets/fonts/lato/Lato-Regular.woff2 and b/src/system/assets/fonts/lato/Lato-Regular.woff2 differ
diff --git a/src/system/assets/fonts/lato/Lato-Semibold.eot b/src/system/assets/fonts/lato/Lato-Semibold.eot
deleted file mode 100644
index d46c5f99f..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Semibold.eot and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Semibold.ttf b/src/system/assets/fonts/lato/Lato-Semibold.ttf
deleted file mode 100644
index faf591e28..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Semibold.ttf and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Semibold.woff b/src/system/assets/fonts/lato/Lato-Semibold.woff
deleted file mode 100644
index 794417f6a..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Semibold.woff and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-Semibold.woff2 b/src/system/assets/fonts/lato/Lato-Semibold.woff2
deleted file mode 100644
index 591692541..000000000
Binary files a/src/system/assets/fonts/lato/Lato-Semibold.woff2 and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-SemiboldItalic.eot b/src/system/assets/fonts/lato/Lato-SemiboldItalic.eot
deleted file mode 100644
index 373a1ca54..000000000
Binary files a/src/system/assets/fonts/lato/Lato-SemiboldItalic.eot and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-SemiboldItalic.ttf b/src/system/assets/fonts/lato/Lato-SemiboldItalic.ttf
deleted file mode 100644
index 4ea1e8f1a..000000000
Binary files a/src/system/assets/fonts/lato/Lato-SemiboldItalic.ttf and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-SemiboldItalic.woff b/src/system/assets/fonts/lato/Lato-SemiboldItalic.woff
deleted file mode 100644
index d1df7676e..000000000
Binary files a/src/system/assets/fonts/lato/Lato-SemiboldItalic.woff and /dev/null differ
diff --git a/src/system/assets/fonts/lato/Lato-SemiboldItalic.woff2 b/src/system/assets/fonts/lato/Lato-SemiboldItalic.woff2
deleted file mode 100644
index 5e6ac2719..000000000
Binary files a/src/system/assets/fonts/lato/Lato-SemiboldItalic.woff2 and /dev/null differ
diff --git a/src/system/styles/fonts/gentium-basic.scss b/src/system/styles/fonts/gentium-basic.scss
index 38ffdba58..04628b6e0 100644
--- a/src/system/styles/fonts/gentium-basic.scss
+++ b/src/system/styles/fonts/gentium-basic.scss
@@ -2,7 +2,10 @@
   font-family: 'Gentium Basic';
   font-style: normal;
   font-weight: 400;
-  src: local('Gentium Basic'), local('GentiumBasic'), url('~@@/assets/fonts/gentium-basic/GentiumBasic.woff2') format('woff2');
+  src: local('Gentium Basic'),
+       local('GentiumBasic'),
+       url('~@@/assets/fonts/gentium-basic/GentiumBasic.woff2') format('woff2'),
+       url('~@@/assets/fonts/gentium-basic/GentiumBasic.woff') format('woff');
   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;
 }
 
@@ -10,6 +13,9 @@
   font-family: 'Gentium Basic';
   font-style: italic;
   font-weight: 400;
-  src: local('Gentium Basic Italic'), local('GentiumBasic-Italic'), url('~@@/assets/fonts/gentium-basic/GentiumBasic-Italic.woff2') format('woff2');
+  src: local('Gentium Basic Italic'),
+       local('GentiumBasic-Italic'),
+       url('~@@/assets/fonts/gentium-basic/GentiumBasic-Italic.woff2') format('woff2'),
+       url('~@@/assets/fonts/gentium-basic/GentiumBasic-Italic.woff') format('woff');
   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/src/system/styles/fonts/lato.scss b/src/system/styles/fonts/lato.scss
index 61a06be43..aceb39e49 100644
--- a/src/system/styles/fonts/lato.scss
+++ b/src/system/styles/fonts/lato.scss
@@ -1,24 +1,18 @@
-/* Webfont: Lato-Semibold */
+/* Webfont: Lato-Bold */
 @font-face {
   font-family: 'LatoWeb';
-  src: url('~@@/assets/fonts/lato/Lato-Semibold.eot'); /* IE9 Compat Modes */
-  src: url('~@@/assets/fonts/lato/Lato-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('~@@/assets/fonts/lato/Lato-Semibold.woff2') format('woff2'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-Semibold.woff') format('woff'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-Semibold.ttf') format('truetype');
+  src: url('~@@/assets/fonts/lato/Lato-Bold.woff2') format('woff2'),
+       url('~@@/assets/fonts/lato/Lato-Bold.woff') format('woff');
   font-style: normal;
   font-weight: 600;
   text-rendering: optimizeLegibility;
 }
 
-/* Webfont: Lato-SemiboldItalic */
+/* Webfont: Lato-BoldItalic */
 @font-face {
   font-family: 'LatoWeb';
-  src: url('~@@/assets/fonts/lato/Lato-SemiboldItalic.eot'); /* IE9 Compat Modes */
-  src: url('~@@/assets/fonts/lato/Lato-SemiboldItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('~@@/assets/fonts/lato/Lato-SemiboldItalic.woff2') format('woff2'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-SemiboldItalic.woff') format('woff'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-SemiboldItalic.ttf') format('truetype');
+  src: url('~@@/assets/fonts/lato/Lato-BoldItalic.woff2') format('woff2'),
+       url('~@@/assets/fonts/lato/Lato-BoldItalic.woff') format('woff');
   font-style: italic;
   font-weight: 600;
   text-rendering: optimizeLegibility;
@@ -27,11 +21,8 @@
 /* Webfont: Lato-Italic */
 @font-face {
   font-family: 'LatoWeb';
-  src: url('~@@/assets/fonts/lato/Lato-Italic.eot'); /* IE9 Compat Modes */
-  src: url('~@@/assets/fonts/lato/Lato-Italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('~@@/assets/fonts/lato/Lato-Italic.woff2') format('woff2'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-Italic.woff') format('woff'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-Italic.ttf') format('truetype');
+  src: url('~@@/assets/fonts/lato/Lato-Italic.woff2') format('woff2'),
+       url('~@@/assets/fonts/lato/Lato-Italic.woff') format('woff');
   font-style: italic;
   font-weight: normal;
   text-rendering: optimizeLegibility;
@@ -40,11 +31,8 @@
 /* Webfont: Lato-Regular */
 @font-face {
   font-family: 'LatoWeb';
-  src: url('~@@/assets/fonts/lato/Lato-Regular.eot'); /* IE9 Compat Modes */
-  src: url('~@@/assets/fonts/lato/Lato-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('~@@/assets/fonts/lato/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-Regular.woff') format('woff'), /* Modern Browsers */
-       url('~@@/assets/fonts/lato/Lato-Regular.ttf') format('truetype');
+  src: url('~@@/assets/fonts/lato/Lato-Regular.woff2') format('woff2'),
+       url('~@@/assets/fonts/lato/Lato-Regular.woff') format('woff');
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;