diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html
index 9f63119f2d4379d9daa6d73762887891d6aeb47c..3d3fc0af41b35ac6755f9143a0238b653c59d233 100644
--- a/aleksis/core/templates/core/base.html
+++ b/aleksis/core/templates/core/base.html
@@ -67,7 +67,7 @@
   <!-- Menu button (sidenav) -->
   <div class="container">
     <a href="#" data-target="slide-out" class="top-nav sidenav-trigger hide-on-large-only">
-      <i class="material-icons">menu</i>
+      <i class="material-icons iconify" data-icon="mdi:menu"></i>
     </a>
   </div>
 
@@ -80,7 +80,7 @@
         {% if user.is_authenticated %}
           <li>{% trans "Logged in as" %} {{ user.get_username }}</li>
           <li>
-            <a href="{% url 'logout' %}">{% trans "Logout" %} <i class="material-icons right">exit_to_app</i></a>
+            <a href="{% url 'logout' %}">{% trans "Logout" %} <i class="iconify material-icons right" data-icon="mdi:logout"></i></a>
           </li>
         {% endif %}
       </ul>
@@ -107,7 +107,7 @@
             <div class="search-wrapper">
               <input id="search" name="q" type="search" enterkeyhint="search" placeholder="{% trans "Search" %}">
               <button class="btn btn-flat search-button" type="submit" aria-label="{% trans "Search" %}">
-                <i class="material-icons">search</i>
+                <i class="material-icons iconify" data-icon="mdi:search">search</i>
               </button>
               <div class="progress" id="search-loader">
                 <div class="indeterminate"></div>
@@ -130,16 +130,16 @@
   {% if messages %}
     {% for message in messages %}
       <figure class="alert {% if message.tags %}{{ message.tags }}{% else %}info{% endif %}">
-          {% if message.tags == "success" %}
-            <i class="material-icons left">check_circle</i>
-          {% elif  message.tags == "info" %}
-            <i class="material-icons left">info</i>
-          {% elif  message.tags == "warning" %}
-            <i class="material-icons left">warning</i>
-          {% elif  message.tags == "error" %}
-            <i class="material-icons left">error</i>
-          {% endif %}
-          {{ message }}
+        {% if message.tags == "success" %}
+          <i class="material-icons left iconify" data-icon="mdi:check-circle"></i>
+        {% elif message.tags == "info" %}
+          <i class="material-icons left iconify" data-icon="mdi:information"></i>
+        {% elif message.tags == "warning" %}
+          <i class="material-icons left iconify" data-icon="mdi:alert"></i>
+        {% elif message.tags == "error" %}
+          <i class="material-icons left iconify" data-icon="mdi:alert-circle"></i>
+        {% endif %}
+        {{ message }}
       </figure>
     {% endfor %}
   {% endif %}