diff --git a/public/fonts/lato-100.woff2 b/public/fonts/lato-100.woff2
new file mode 100644
index 0000000000..c9da634eac
Binary files /dev/null and b/public/fonts/lato-100.woff2 differ
diff --git a/public/fonts/roboto-light-300.woff2 b/public/fonts/roboto-light-300.woff2
new file mode 100644
index 0000000000..4411cbc875
Binary files /dev/null and b/public/fonts/roboto-light-300.woff2 differ
diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig
index 0fd75c042e..456f0b73dd 100644
--- a/resources/views/errors/500.twig
+++ b/resources/views/errors/500.twig
@@ -1,8 +1,17 @@
 <html>
 <head>
-    <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
-
+    <base href="{{ route('index') }}/" />
     <style>
+
+        /* latin */
+        @font-face {
+            font-family: 'Lato';
+            font-style: normal;
+            font-weight: 100;
+            src: local('Lato Hairline'), local('Lato-Hairline'), url('fonts/lato-100.woff2') format('woff2');
+            unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+        }
+
         body {
             margin: 0;
             padding: 0;
@@ -38,24 +47,5 @@
     </div>
 </div>
 
-<script>
-    (function (i, s, o, g, r, a, m) {
-        i['GoogleAnalyticsObject'] = r;
-        i[r] = i[r] || function () {
-                    (i[r].q = i[r].q || []).push(arguments)
-                }, i[r].l = 1 * new Date();
-        a = s.createElement(o),
-                m = s.getElementsByTagName(o)[0];
-        a.async = 1;
-        a.src = g;
-        m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-
-    ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto');
-    ga('send', 'pageview');
-
-</script>
-
-
 </body>
 </html>
diff --git a/resources/views/errors/503.twig b/resources/views/errors/503.twig
index cf418601da..41970faee3 100644
--- a/resources/views/errors/503.twig
+++ b/resources/views/errors/503.twig
@@ -1,8 +1,18 @@
 <html>
 <head>
-    <link href='https://fonts.googleapis.com/css?family=Roboto:300' rel='stylesheet' type='text/css'>
+    <base href="{{ route('index') }}/" />
     <title>Firefly III is in maintenance mode.</title>
     <style>
+
+        /* latin */
+        @font-face {
+            font-family: 'Roboto';
+            font-style: normal;
+            font-weight: 300;
+            src: local('Roboto Light'), local('Roboto-Light'), url('fonts/roboto-light-300.woff2') format('woff2');
+            unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+        }
+
         body {
             margin: 0;
             padding: 0;
