diff --git a/app/views/about.tpl b/app/views/about.tpl
index 27cca947a..098f06ddd 100644
--- a/app/views/about.tpl
+++ b/app/views/about.tpl
@@ -6,7 +6,7 @@
                     <li>
                         <span class="primary active icon gray">
                             <a href="<?php echo \Movim\Route::urlize('main'); ?>">
-                                <i class="zmdi zmdi-arrow-left"></i>
+                                <i class="material-icons">arrow_back</i>
                             </a>
                         </span>
                         <p class="center"><?php echo __('page.about'); ?></p>
diff --git a/app/views/account.tpl b/app/views/account.tpl
index 045b42af6..1417cf952 100644
--- a/app/views/account.tpl
+++ b/app/views/account.tpl
@@ -4,10 +4,9 @@
             <header>
                 <ul class="list middle">
                     <li>
-
                         <span class="primary active icon gray">
                             <a href="<?php echo \Movim\Route::urlize('main'); ?>">
-                                <i class="zmdi zmdi-home"></i>
+                                <i class="material-icons">home</i>
                             </a>
                         </span>
                         <p class="center"><?php echo __('page.account_creation'); ?></p>
diff --git a/app/views/accountnext.tpl b/app/views/accountnext.tpl
index 43aaf0d09..59c793832 100644
--- a/app/views/accountnext.tpl
+++ b/app/views/accountnext.tpl
@@ -7,7 +7,7 @@
                     <li>
                         <span class="primary active icon gray">
                             <a href="<?php echo \Movim\Route::urlize('account'); ?>">
-                                <i class="zmdi zmdi-arrow-left"></i>
+                                <i class="material-icons">arrow_back</i>
                             </a>
                         </span>
                         <p class="center"><?php echo __('page.account_creation'); ?></p>
diff --git a/app/views/admin.tpl b/app/views/admin.tpl
index 1c28c4f1b..d7467b538 100644
--- a/app/views/admin.tpl
+++ b/app/views/admin.tpl
@@ -4,10 +4,9 @@
             <header>
                 <ul class="list middle">
                     <li>
-
                         <span class="primary active icon gray">
                             <a href="<?php echo \Movim\Route::urlize('main'); ?>">
-                                <i class="zmdi zmdi-arrow-left"></i>
+                                <i class="material-icons">arrow_back</i>
                             </a>
                         </span>
                         <p class="center"><?php echo __('page.administration'); ?></p>
diff --git a/app/views/adminlogin.tpl b/app/views/adminlogin.tpl
index a7e28239f..41d5aba61 100644
--- a/app/views/adminlogin.tpl
+++ b/app/views/adminlogin.tpl
@@ -4,10 +4,9 @@
             <header>
                 <ul class="list middle">
                     <li>
-
                         <span class="primary active icon gray">
                             <a href="<?php echo \Movim\Route::urlize('main'); ?>">
-                                <i class="zmdi zmdi-arrow-left"></i>
+                                <i class="material-icons">arrow_back</i>
                             </a>
                         </span>
                         <p class="center"><?php echo __('page.administration'); ?></p>
diff --git a/app/views/blog.tpl b/app/views/blog.tpl
index b5ad7e665..964c17ee6 100644
--- a/app/views/blog.tpl
+++ b/app/views/blog.tpl
@@ -5,7 +5,7 @@
             <ul class="list">
                 <li>
                     <span class="primary icon gray">
-                        <i class="zmdi zmdi-cloud-outline"></i>
+                        <i class="material-icons">cloud_queue</i>
                     </span>
                     <p class="center normal"><a target="_blank" href="https://movim.eu">Powered by Movim</a></p>
                 </li>
diff --git a/app/views/conf.tpl b/app/views/conf.tpl
index 1aae5bbfd..22ed6a65a 100644
--- a/app/views/conf.tpl
+++ b/app/views/conf.tpl
@@ -15,8 +15,8 @@
                 <ul class="list middle">
                     <li>
                         <span id="menu" class="primary icon active gray" >
-                            <i class="zmdi zmdi-menu on_mobile" onclick="MovimTpl.toggleMenu()"></i>
-                            <i class="zmdi zmdi-settings on_desktop"></i>
+                            <i class="material-icons on_desktop">settings</i>
+                            <i class="material-icons on_mobile" onclick="MovimTpl.toggleMenu()">menu</i>
                         </span>
                         <p><?php echo __('page.configuration'); ?></p>
                     </li>
diff --git a/app/views/help.tpl b/app/views/help.tpl
index da517a902..8b20c1ed5 100644
--- a/app/views/help.tpl
+++ b/app/views/help.tpl
@@ -14,8 +14,8 @@
                 <ul class="list middle">
                     <li>
                         <span id="menu" class="primary icon active gray">
-                            <i class="zmdi zmdi-help on_desktop"></i>
-                            <i class="zmdi zmdi-menu on_mobile" onclick="MovimTpl.toggleMenu()"></i>
+                            <i class="material-icons on_desktop">help</i>
+                            <i class="material-icons on_mobile" onclick="MovimTpl.toggleMenu()">menu</i>
                         </span>
                         <p class="center"><?php echo __('page.help'); ?></p>
                     </li>
diff --git a/app/views/node.tpl b/app/views/node.tpl
index b5ad7e665..964c17ee6 100644
--- a/app/views/node.tpl
+++ b/app/views/node.tpl
@@ -5,7 +5,7 @@
             <ul class="list">
                 <li>
                     <span class="primary icon gray">
-                        <i class="zmdi zmdi-cloud-outline"></i>
+                        <i class="material-icons">cloud_queue</i>
                     </span>
                     <p class="center normal"><a target="_blank" href="https://movim.eu">Powered by Movim</a></p>
                 </li>
diff --git a/app/views/page.tpl b/app/views/page.tpl
index 89620ab88..11e2fa64f 100644
--- a/app/views/page.tpl
+++ b/app/views/page.tpl
@@ -61,7 +61,7 @@
             <ul class="list">
                 <li>
                     <span class="control icon gray">
-                        <i class="zmdi zmdi-code-setting"></i>
+                        <i class="material-icons">signal_cellular_off</i>
                     </span>
                     <p class="normal">
                         <?php echo __('error.websocket'); ?>
diff --git a/themes/material/css/form.css b/themes/material/css/form.css
index 2f32e9ba6..98d1ab6a9 100644
--- a/themes/material/css/form.css
+++ b/themes/material/css/form.css
@@ -49,8 +49,8 @@ form > div > textarea,
 }
 
 form > div > .select:after {
-    font-family: "Material-Design-Iconic-Font";
-    content: "\f2f2";
+    font-family: 'Material Icons';
+    content: "\e5c5";
     display: block;
     font-size: 4rem;
     color: #999;