diff --git a/aleksis/core/templates/core/group/child_groups.html b/aleksis/core/templates/core/group/child_groups.html
index 900df71a59f24817bbec128b5ec15748b5a9d752..a9b93355b8d775b32d3c20123980828fdcae0fd7 100644
--- a/aleksis/core/templates/core/group/child_groups.html
+++ b/aleksis/core/templates/core/group/child_groups.html
@@ -14,7 +14,7 @@
   {% if not page %}
     <div class="alert info">
       <p>
-        <i class="material-icons left">info</i>
+        <i class="material-icons left iconify" data-icon="mdi:information-outline"></i>
         {% blocktrans %}
           You can use this to assign child groups to groups. Please use the filters below to select groups you want to
           change and click "Next".
@@ -27,11 +27,11 @@
       {% form form=filter.form %}{% endform %}
 
       <button type="submit" class="btn green waves-effect waves-light">
-        <i class="material-icons left">refresh</i>
+        <i class="material-icons left iconify" data-icon="mdi:refresh"></i>
         {% trans "Update selection" %}
       </button>
       <a href="{% url "groups_child_groups" %}" class="btn red waves-effect waves-light">
-        <i class="material-icons left">clear</i>
+        <i class="material-icons left iconify" data-icon="mdi:close"></i>
         {% trans "Clear all filters" %}
       </a>
     </form>
@@ -50,14 +50,14 @@
         {% csrf_token %}
         <button class="btn btn-primary waves-effect waves-light" type="submit" name="page" value="1">
           {% trans "Start assigning child groups for this groups" %}
-          <i class="material-icons right">arrow_forward</i>
+          <i class="material-icons left iconify" data-icon="mdi:arrow-right"></i>
         </button>
       </form>
       </p>
     {% else %}
       <div class="alert warning">
         <p>
-          <i class="material-icons left">warning</i>
+          <i class="material-icons left iconify" data-icon="mdi:pencil-outline"></i>
           {% blocktrans %}
             Please select some groups in order to go on with assigning.
           {% endblocktrans %}
diff --git a/aleksis/core/templates/core/group/full.html b/aleksis/core/templates/core/group/full.html
index 65d94ad13a7e563302e9ae283fe4df24c6135353..3c6e5488d6174e30847eabcfda2e97b244112938 100644
--- a/aleksis/core/templates/core/group/full.html
+++ b/aleksis/core/templates/core/group/full.html
@@ -20,21 +20,21 @@
     <p>
       {% if can_change_group %}
         <a href="{% url 'edit_group_by_id' group.id %}" class="btn waves-effect waves-light">
-          <i class="material-icons left">edit</i>
+          <i class="material-icons iconify left" data-icon="mdi:pencil-outline"></i>
           {% trans "Edit" %}
         </a>
       {% endif %}
 
       {% if can_delete_group %}
         <a href="{% url 'delete_group_by_id' group.id %}" class="btn waves-effect waves-light red">
-          <i class="material-icons left">delete</i>
+          <i class="material-icons iconify left" data-icon="mdi:delete-outline"></i>
           {% trans "Delete" %}
         </a>
       {% endif %}
 
       {% if can_change_group_preferences %}
         <a href="{% url "preferences_group" group.id %}" class="btn waves-effect waves-light">
-          <i class="material-icons left">settings</i>
+          <i class="material-icons iconify left" data-icon="mdi:cog-outline"></i>
           {% trans "Change preferences" %}
         </a>
       {% endif %}
@@ -44,7 +44,7 @@
   <table>
     <tr>
       <th>
-        <i class="material-icons center" title="{% trans "Group type" %}">category</i>
+        <i class="material-icons iconify center" data-icon="mdi:shape-outline" title="{% trans "Group type" %}"></i>
       </th>
       <td>
         {{ group.group_type }}
@@ -52,7 +52,7 @@
     </tr>
     <tr>
       <th>
-        <i class="material-icons center" title="{% trans "Parent groups" %}">vertical_align_top</i>
+        <i class="material-icons iconify center" data-icon="mdi:format-vertical-align-top" title="{% trans "Parent groups" %}"></i>
       </th>
       <td>
         {{ group.parent_groups.all|join:", " }}
diff --git a/aleksis/core/templates/core/group/list.html b/aleksis/core/templates/core/group/list.html
index 9fe2c925f79f423cba0e8d195fb0299cca1c906b..38391cad82a3ff007b02bdca0f6cdda06d53ca2c 100644
--- a/aleksis/core/templates/core/group/list.html
+++ b/aleksis/core/templates/core/group/list.html
@@ -10,7 +10,7 @@
 
 {% block content %}
   <a class="btn green waves-effect waves-light" href="{% url 'create_group' %}">
-    <i class="material-icons left">add</i>
+    <i class="material-icons iconify left" data-icon="mdi:add"></i>
     {% trans "Create group" %}
   </a>
 
@@ -20,7 +20,7 @@
     {% trans "Search" as caption %}
     {% include "core/partials/save_button.html" with caption=caption icon="search" %}
     <button type="reset" class="btn red waves-effect waves-light">
-      <i class="material-icons left">clear</i>
+      <i class="material-icons iconify left" data-icon="mdi:close"></i>
       {% trans "Clear" %}
     </button>
   </form>