diff --git a/res/material-icons.ttf b/res/MaterialIcons-Regular.ttf
similarity index 61%
rename from res/material-icons.ttf
rename to res/MaterialIcons-Regular.ttf
index 9519e1d75e8e60fc461d42dceff7162076484747..7015564ad166a3e9d88c82f17829f0cc01ebe29a 100644
Binary files a/res/material-icons.ttf and b/res/MaterialIcons-Regular.ttf differ
diff --git a/res/MaterialIcons-Regular.woff b/res/MaterialIcons-Regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..b648a3eea2d16b6ce783906d6b7d5f251b9eb56c
Binary files /dev/null and b/res/MaterialIcons-Regular.woff differ
diff --git a/res/MaterialIcons-Regular.woff2 b/res/MaterialIcons-Regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..9fa211252080046a23b2449dbdced6abc2b0bb34
Binary files /dev/null and b/res/MaterialIcons-Regular.woff2 differ
diff --git a/res/fonts.css b/res/fonts.css
deleted file mode 100644
index b9bbda83cfec68f1f6a77569f9a0f4c691675c67..0000000000000000000000000000000000000000
--- a/res/fonts.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Material Icons'), local('MaterialIcons-Regular'), url(material-icons.ttf) format('truetype');
-}
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-}
diff --git a/res/material-icons.css b/res/material-icons.css
new file mode 100644
index 0000000000000000000000000000000000000000..326ae4daa7f9dc09779795af507821e4dd04fad7
--- /dev/null
+++ b/res/material-icons.css
@@ -0,0 +1,35 @@
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Material Icons'),
+       local('MaterialIcons-Regular'),
+       url(MaterialIcons-Regular.woff2) format('woff2'),
+       url(MaterialIcons-Regular.woff) format('woff'),
+       url(MaterialIcons-Regular.ttf) format('truetype');
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;  /* Preferred icon size */
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
diff --git a/templates/login.phtml b/templates/login.phtml
index fe9d55f5fa3b70db0c4e4993c8abbc631789e853..006480640a842595f358b2d956d72035b1b3146e 100644
--- a/templates/login.phtml
+++ b/templates/login.phtml
@@ -5,7 +5,7 @@
     <title>Quassel Search</title>
 
     <link rel="stylesheet" href="res/login.css">
-    <link rel="stylesheet" href="res/fonts.css">
+    <link rel="stylesheet" href="res/material-icons.css">
 </head>
 <body>
 
diff --git a/templates/search.phtml b/templates/search.phtml
index 12803a9e90d4a492764c473592dfeeae55c45c41..54dc6e59fa449c2f243834c585814c69fc6a9f6b 100644
--- a/templates/search.phtml
+++ b/templates/search.phtml
@@ -5,7 +5,7 @@
     <title>Quassel Search</title>
 
     <link rel="stylesheet" href="res/search.css">
-    <link rel="stylesheet" href="res/fonts.css">
+    <link rel="stylesheet" href="res/material-icons.css">
 </head>
 <body>
 <nav>