From 047746767816429bd844bd3179f8e837f022ace9 Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Mon, 27 Jun 2022 21:33:13 +0200
Subject: [PATCH] Use new icon set everywhere

---
 aleksis/apps/alsijil/menus.py                 | 22 ++++++-------
 .../alsijil/absences/register_confirm.html    | 14 ++++-----
 .../alsijil/class_register/groups.html        | 16 +++++-----
 .../alsijil/class_register/lesson.html        | 20 ++++++------
 .../alsijil/class_register/person.html        | 17 +++++-----
 .../alsijil/class_register/persons.html       |  8 ++---
 .../alsijil/class_register/students_list.html | 10 +++---
 .../alsijil/class_register/week_view.html     | 31 +++++++++----------
 .../templates/alsijil/excuse_type/list.html   |  2 +-
 .../alsijil/excuse_type/warning.html          |  2 +-
 .../templates/alsijil/extra_mark/list.html    |  2 +-
 .../templates/alsijil/group_role/assign.html  |  2 +-
 .../alsijil/group_role/assigned_list.html     |  6 ++--
 .../templates/alsijil/group_role/list.html    |  2 +-
 .../group_role/partials/assigned_roles.html   |  6 ++--
 .../partials/assignment_options.html          |  6 ++--
 .../templates/alsijil/group_role/warning.html |  2 +-
 .../alsijil/partials/lesson/heading.html      |  4 +--
 .../alsijil/partials/lesson/prev_next.html    |  7 +++--
 .../alsijil/partials/lesson/tabs/notes.html   | 14 ++++++---
 .../partials/lesson/tabs/seating_plan.html    | 12 +++----
 .../alsijil/partials/lesson_status.html       | 16 +++++-----
 .../alsijil/partials/lesson_status_icon.html  |  8 ++---
 .../alsijil/partials/objects_table.html       |  4 +--
 .../alsijil/partials/persons_with_stats.html  |  6 ++--
 .../alsijil/print/full_register.html          | 12 +++----
 26 files changed, 126 insertions(+), 125 deletions(-)

diff --git a/aleksis/apps/alsijil/menus.py b/aleksis/apps/alsijil/menus.py
index 96ed7ef5a..fcf14e7cc 100644
--- a/aleksis/apps/alsijil/menus.py
+++ b/aleksis/apps/alsijil/menus.py
@@ -5,7 +5,7 @@ MENUS = {
         {
             "name": _("Class register"),
             "url": "#",
-            "icon": "chrome_reader_mode",
+            "svg_icon": "mdi:book-open-outline",
             "root": True,
             "validators": [
                 "menu_generator.validators.is_authenticated",
@@ -15,7 +15,7 @@ MENUS = {
                 {
                     "name": _("Current lesson"),
                     "url": "lesson_period",
-                    "icon": "alarm",
+                    "svg_icon": "mdi:alarm",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -26,7 +26,7 @@ MENUS = {
                 {
                     "name": _("Current week"),
                     "url": "week_view",
-                    "icon": "view_week",
+                    "svg_icon": "mdi:view-week-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -37,7 +37,7 @@ MENUS = {
                 {
                     "name": _("My groups"),
                     "url": "my_groups",
-                    "icon": "people",
+                    "svg_icon": "mdi:account-multiple-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -48,7 +48,7 @@ MENUS = {
                 {
                     "name": _("My overview"),
                     "url": "overview_me",
-                    "icon": "insert_chart",
+                    "svg_icon": "mdi:chart-box-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -59,7 +59,7 @@ MENUS = {
                 {
                     "name": _("My students"),
                     "url": "my_students",
-                    "icon": "people",
+                    "svg_icon": "mdi:account-school-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -70,7 +70,7 @@ MENUS = {
                 {
                     "name": _("Assign group role"),
                     "url": "assign_group_role_multiple",
-                    "icon": "assignment_ind",
+                    "svg_icon": "mdi:clipboard-account-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -81,7 +81,7 @@ MENUS = {
                 {
                     "name": _("All lessons"),
                     "url": "all_register_objects",
-                    "icon": "list",
+                    "svg_icon": "mdi:format-list-text",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -103,7 +103,7 @@ MENUS = {
                 {
                     "name": _("Excuse types"),
                     "url": "excuse_types",
-                    "icon": "label",
+                    "svg_icon": "mdi:label-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -114,7 +114,7 @@ MENUS = {
                 {
                     "name": _("Extra marks"),
                     "url": "extra_marks",
-                    "icon": "label",
+                    "svg_icon": "mdi:label-variant-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
@@ -125,7 +125,7 @@ MENUS = {
                 {
                     "name": _("Manage group roles"),
                     "url": "group_roles",
-                    "icon": "assignment_ind",
+                    "svg_icon": "mdi:clipboard-plus-outline",
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
diff --git a/aleksis/apps/alsijil/templates/alsijil/absences/register_confirm.html b/aleksis/apps/alsijil/templates/alsijil/absences/register_confirm.html
index dc0693570..2c427ef2f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/absences/register_confirm.html
+++ b/aleksis/apps/alsijil/templates/alsijil/absences/register_confirm.html
@@ -18,11 +18,11 @@
       </div>
       <div class="collection">
         <div class="collection-item">
-          <i class="material-icons left">date_range</i>
+          <i class="material-icons iconify left" data-icon="mdi:calendar-range"></i>
           {{ form_data.date_start }}, {{ form_data.from_period }}. – {{ form_data.date_end }}, {{ form_data.to_period }}.
           {% if form_data.date_start != form_data.date_end %}
             <figure class="alert warning">
-              <i class="material-icons left">warning</i>
+              <i class="material-icons iconify left" data-icon="mdi:alert-outline"></i>
               {% blocktrans %}
                 As the length of this absence is longer than one day,
                 please double check the correctness of your entry.
@@ -31,12 +31,12 @@
           {% endif %}
         </div>
         <div class="collection-item">
-          <i class="material-icons left">list</i>
+          <i class="material-icons iconify left" data-icon="mdi:format-list-bulleted"></i>
           {% blocktrans with count=affected_lessons %} {{ count }} affected lessons {% endblocktrans %}
           {% if affected_lessons == 0 %}
             <div class="alert error">
               <div>
-                <i class="material-icons left">error</i>
+                <i class="material-icons iconify left" data-icon="mdi:alert-octagon-outline"></i>
                 {% blocktrans %}
                   There are no affected lessons. Registering this absence won't have any effect.
                 {% endblocktrans %}
@@ -45,7 +45,7 @@
           {% endif %}
         </div>
         <div class="collection-item">
-          <i class="material-icons left">label</i>
+          <i class="material-icons iconify left" data-icon="mdi:label-outline"></i>
           {% if form_data.absent %}
             <span class="chip red white-text">{% trans "Absent" %}</span>
             {% if form_data.excused and form_data.excuse_type %}
@@ -59,7 +59,7 @@
         </div>
         {% if form_data.remarks %}
           <div class="collection-item">
-            <i class="material-icons left">edit</i>
+            <i class="material-icons iconify left" data-icon="mdi:pencil-outline"></i>
             {{ form_data.remarks }}
           </div>
         {% endif %}
@@ -75,7 +75,7 @@
     <input type="hidden" name="confirmed" value="1">
     {% include "core/partials/save_button.html" %}
     <a class="btn red waves-effect waves-light" href="{% url "register_absence" person.pk %}">
-      <i class="material-icons left">cancel</i>
+      <i class="material-icons iconify left" data-icon="mdi:close"></i>
       {% trans "Cancel" %}
     </a>
   </form>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html b/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html
index 8c6254cdb..43a6eeeb9 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html
@@ -31,23 +31,23 @@
         <td>
           <div class="right">
             <a class="btn primary-color waves-effect waves-light" href="{% url "students_list" group.pk %}">
-              <i class="material-icons left">people</i>
+              <i class="material-icons iconify left" data-icon="mdi:account-multiple-outline"></i>
               {% trans "Students list" %}
             </a>
             <a class="btn secondary-color waves-effect waves-light" href="{% url "week_view" "group" group.pk %}">
-              <i class="material-icons left">view_week</i>
+              <i class="material-icons iconify left" data-icon="mdi:view-week-outline"></i>
               {% trans "Week view" %}
             </a>
             {% has_perm "alsijil.view_assigned_grouproles_rule" user group as can_view_assigned_group_roles %}
             {% if can_view_assigned_group_roles %}
               <a class="btn primary waves-effect waves-light" href="{% url 'assigned_group_roles' group.pk %}">
-                <i class="material-icons left">assignment_ind</i>
+                <i class="material-icons iconify left" data-icon="mdi:clipboard-account-outline"></i>
                 {% trans "Roles" %}
               </a>
             {% endif %}
             <a class="btn primary waves-effect waves-light" href="{% url "full_register_group" group.pk %}"
                target="_blank">
-              <i class="material-icons left">print</i>
+              <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
               {% trans "Generate printout" %}
             </a>
           </div>
@@ -72,13 +72,13 @@
           </p>
           <p>
             <a class="btn primary-color waves-effect waves-light" href="{% url "week_view" "group" group.pk %}">
-              <i class="material-icons left">people</i>
+              <i class="material-icons iconify left" data-icon="mdi:account-multiple-outline"></i>
               {% trans "Students list" %}
             </a>
           </p>
           <p>
             <a class="btn secondary-color waves-effect waves-light" href="{% url "week_view" "group" group.pk %}">
-              <i class="material-icons left">view_week</i>
+              <i class="material-icons iconify left" data-icon="mdi:view-week-outline"></i>
               {% trans "Week view" %}
             </a>
           </p>
@@ -86,7 +86,7 @@
           {% if can_view_assigned_group_roles %}
             <p>
               <a class="btn primary waves-effect waves-light" href="{% url 'assigned_group_roles' group.pk %}">
-                <i class="material-icons left">assignment_ind</i>
+                <i class="material-icons iconify left" data-icon="mdi:clipboard-account-outline"></i>
                 {% trans "Roles" %}
               </a>
             </p>
@@ -94,7 +94,7 @@
           <p>
             <a class="btn primary waves-effect waves-light" href="{% url "full_register_group" group.pk %}"
                target="_blank">
-              <i class="material-icons left">print</i>
+              <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
               {% trans "Generate printout" %}
             </a>
           </p>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 6de367aee..fd3765680 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -17,14 +17,14 @@
   <ul class="tabs tabs-transparent tabs-icons tabs-fixed-width">
     <li class="tab">
       <a href="#lesson-documentation">
-        <i class="material-icons">speaker_notes</i>
+        <i class="material-icons iconify" data-icon="mdi:message-bulleted"></i>
         {% trans "Period" %}
       </a>
     </li>
     {% if register_object.label_ != "lesson_period" or not register_object.get_substitution.cancelled or not request.site.preferences.alsijil__block_personal_notes_for_cancelled %}
       <li class="tab">
         <a href="#personal-notes">
-          <i class="material-icons">people</i>
+          <i class="material-icons iconify" data-icon="mdi:account-multiple-outline"></i>
           {% trans "Persons" %}
         </a>
       </li>
@@ -32,7 +32,7 @@
     {% if with_seating_plan %}
       <li class="tab">
         <a href="#seating-plan">
-          <i class="material-icons">event_seat</i>
+          <i class="material-icons iconify" data-icon="mdi:seat-outline"></i>
           {% trans "Seating plan" %}
         </a>
       </li>
@@ -42,7 +42,7 @@
       {% if prev_lesson.get_lesson_documentation and can_view_prev_lesson_documentation %}
         <li class="tab">
           <a href="#previous-lesson">
-            <i class="material-icons">history</i>
+            <i class="material-icons iconify" data-icon="mdi:history"></i>
             {% trans "Previous" %}
           </a>
         </li>
@@ -50,7 +50,7 @@
     {% endif %}
     <li class="tab">
       <a href="#more">
-        <i class="material-icons">more_horiz</i>
+        <i class="material-icons iconify" data-icon="mdi:dots-horizontal"></i>
         {% trans "More" %}
       </a>
     </li>
@@ -69,7 +69,7 @@
         {% if back_to_week_url %}
           <a href="{{ back_to_week_url }}"
              class="btn secondary-color waves-light waves-effect margin-bottom {% if prev_lesson_person or next_lesson_person %}hide-on-extra-large-only{% endif %}">
-            <i class="material-icons left">chevron_left</i> {% trans "Week view" %}
+            <i class="material-icons iconify left" data-icon="mdi:chevron-left"></i> {% trans "Week view" %}
           </a>
         {% endif %}
 
@@ -78,7 +78,7 @@
             {% if back_to_week_url %}
               <a href="{{ back_to_week_url }}"
                  class="btn-flat secondary-color-text waves-light waves-effect left hide-on-med-and-down hide-on-large-only show-on-extra-large">
-                <i class="material-icons left">chevron_left</i> {% trans "Week view" %}
+                <i class="material-icons iconify left" data-icon="mdi:chevron-left"></i> {% trans "Week view" %}
               </a>
             {% endif %}
 
@@ -89,7 +89,7 @@
                href="{% url "lesson_period" prev_lesson_person.week.year prev_lesson_person.week.week prev_lesson_person.id %}"
                 {% endif %}
             >
-              <i class="material-icons left">navigate_before</i>
+              <i class="material-icons iconify left" data-icon="mdi:chevron-left"></i>
               <span class="hide-on-small-only">{% trans "My previous lesson" %}</span>
               <span class="hide-on-med-and-up">{% trans "Previous" %}</span>
             </a>
@@ -100,7 +100,7 @@
                href="{% url "lesson_period" next_lesson_person.week.year next_lesson_person.week.week next_lesson_person.id %}"
                 {% endif %}
             >
-              <i class="material-icons right">navigate_next</i>
+              <i class="material-icons iconify right" data-icon="mdi:chevron-right"></i>
               <span class="hide-on-small-only">{% trans "My next lesson" %}</span>
               <span class="hide-on-med-and-up">{% trans "Next" %}</span>
             </a>
@@ -155,7 +155,7 @@
           <div class="card">
             <div class="card-content center-align">
               <p>
-                <i class="material-icons medium orange-text">warning</i>
+                <i class="material-icons iconify medium orange-text" data-icon="mdi:alert-outline"></i>
               </p>
               <p class="card-title">
                 {% blocktrans %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index d11b192fb..78792a793 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -15,7 +15,7 @@
   {% if has_students %}
     <a href="{% url "my_students" %}"
        class="btn-flat primary-color-text waves-light waves-effect">
-      <i class="material-icons left">chevron_left</i> {% trans "Back" %}
+      <i class="material-icons iconify left" data-icon="mdi:chevron-left"></i> {% trans "Back" %}
     </a>
   {% endif %}
   <span id="heading">
@@ -26,7 +26,7 @@
   {% has_perm "alsijil.register_absence_rule" user person as can_register_absence %}
   {% if can_register_absence %}
     <a class="btn primary-color waves-effect waves-light right" href="{% url "register_absence" person.pk %}">
-      <i class="material-icons left">rate_review</i>
+      <i class="material-icons iconify left" data-icon="mdi:message-draw"></i>
       {% trans "Register absence" %}
     </a>
   {% endif %}
@@ -70,13 +70,13 @@
         </figure>
         <div class="modal-footer">
           <button type="button" class="btn-flat secondary-color-text waves-effect waves-ripple" id="remove-filters">
-            <i class="material-icons left">clear</i>{% trans "Clear all filters" %}
+            <i class="material-icons iconify left" data-icon="mdi:close"></i>{% trans "Clear all filters" %}
           </button>
           <button type="button" class="modal-close btn-flat red-text waves-effect waves-ripple waves-red">
-            <i class="material-icons left">cancel</i>{% trans "Close" %}
+            <i class="material-icons iconify left" data-icon="mdi:close-circle-outline"></i>{% trans "Close" %}
           </button>
           <button type="submit" class="modal-close btn-flat primary-color-text waves-effect waves-ripple waves-light">
-            <i class="material-icons left">filter_alt</i>{% trans "Filter" %}
+            <i class="material-icons iconify left" data-icon="mdi:filter-outline"></i>{% trans "Filter" %}
           </button>
         </div>
       </form>
@@ -88,7 +88,8 @@
               {% if can_mark_all_as_excused %} medium-high-right {% endif %}"
               data-target="filter-modal"
               type="button">
-            {% trans "Filter results" %} ({{ num_filters }})<i class="material-icons right">filter_alt</i>
+            {% trans "Filter results" %} ({{ num_filters }})
+            <i class="material-icons iconify right" data-icon="mdi:filter-outline"></i>
           </button>
         </div>
         <form action="" method="post" class="">
@@ -100,7 +101,7 @@
               </div>
               <div class="col s12 m3">
                 <button type="submit" class="btn waves-effect waves-light medium-high full-width-s">
-                  Run <i class="material-icons right">send</i>
+                  Run <i class="material-icons iconify right" data-icon="mdi:send-outline"></i>
                 </button>
               </div>
             {% endif %}
@@ -121,7 +122,7 @@
         {% for school_term, stat in stats %}
           <li {% if forloop.first %}class="active"{% endif %}>
             <div class="collapsible-header">
-              <i class="material-icons">date_range</i>{{ school_term }}</div>
+              <i class="material-icons iconify" data-icon="mdi:calendar-range"></i>{{ school_term }}</div>
             <div class="collapsible-body">
               <table>
                 <tr>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html b/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html
index f2c839491..6873ddc84 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html
@@ -23,11 +23,11 @@
           <div class="hundred-percent">
             <span class="right show-on-active hide-on-small-and-down">
               <a class="btn primary-color waves-effect waves-light" href="{% url "week_view" "group" group.pk %}">
-                <i class="material-icons left">view_week</i>
+                <i class="material-icons iconify left" data-icon="mdi:view-week-outline"></i>
                 {% trans "Week view" %}
               </a>
               <a class="btn waves-effect waves-light" href="{% url "full_register_group" group.pk %}" target="_blank">
-                <i class="material-icons left">print</i>
+                <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
                 {% trans "Generate printout" %}
               </a>
             </span>
@@ -39,14 +39,14 @@
             <p class="show-on-active hide-on-med-and-up">
               <a class="btn primary-color waves-effect waves-light hundred-percent"
                  href="{% url "week_view" "group" group.pk %}">
-                <i class="material-icons left">view_week</i>
+                <i class="material-icons iconify left" data-icon="mdi:view-week-outline"></i>
                 {% trans "Week view" %}
               </a>
             </p>
             <p class="show-on-active hide-on-med-and-up">
               <a class="btn waves-effect waves-light hundred-percent" href="{% url "full_register_group" group.pk %}"
                  target="_blank">
-                <i class="material-icons left">print</i>
+                <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
                 {% trans "Generate printout" %}
               </a>
             </p>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/students_list.html b/aleksis/apps/alsijil/templates/alsijil/class_register/students_list.html
index 245addc83..72bb8071f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/students_list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/students_list.html
@@ -7,16 +7,16 @@
 {% block page_title %}
   <a href="{% url "my_groups" %}"
      class="btn-flat primary-color-text waves-light waves-effect">
-    <i class="material-icons left">chevron_left</i> {% trans "Back" %}
+    <i class="material-icons iconify left" data-icon="mdi:chevron-left"></i> {% trans "Back" %}
   </a>
   {% blocktrans with group=group %}Students list: {{ group }}{% endblocktrans %}
   <span class="right show-on-active hide-on-small-and-down">
     <a class="btn primary-color waves-effect waves-light" href="{% url "week_view" "group" group.pk %}">
-      <i class="material-icons left">view_week</i>
+      <i class="material-icons iconify left" data-icon="mdi:view-week-outline"></i>
       {% trans "Week view" %}
     </a>
     <a class="btn waves-effect waves-light" href="{% url "full_register_group" group.pk %}" target="_blank">
-      <i class="material-icons left">print</i>
+      <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
       {% trans "Generate printout" %}
     </a>
   </span>
@@ -31,14 +31,14 @@
   <p class="show-on-active hide-on-med-and-up">
     <a class="btn primary-color waves-effect waves-light hundred-percent"
        href="{% url "week_view" "group" group.pk %}">
-      <i class="material-icons left">view_week</i>
+       <i class="material-icons iconify left" data-icon="mdi:view-week-outline"></i>
       {% trans "Week view" %}
     </a>
   </p>
   <p class="show-on-active hide-on-med-and-up">
     <a class="btn waves-effect waves-light hundred-percent" href="{% url "full_register_group" group.pk %}"
        target="_blank">
-      <i class="material-icons left">print</i>
+      <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
       {% trans "Generate printout" %}
     </a>
   </p>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
index 4742b4320..ce38ee671 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
@@ -17,20 +17,20 @@
       <ul class="tabs tabs-transparent tabs-icons tabs-fixed-width">
         <li class="tab col">
           <a class="active" href="#week-overview">
-            <i class="material-icons">speaker_notes</i>
+            <i class="material-icons iconify" data-icon="mdi:message-bulleted"></i>
             {% trans "Lesson documentations" %}
           </a>
         </li>
         <li class="tab col">
           <a href="#personal-notes">
-            <i class="material-icons">people</i>
+            <i class="material-icons iconify" data-icon="mdi:account-multiple-outline"></i>
             {% trans "Persons" %}
           </a>
         </li>
         {% if group_roles %}
           <li class="tab col">
             <a href="#group-roles">
-              <i class="material-icons">assignment_ind</i>
+              <i class="material-icons iconify" data-icon="mdi:clipboard-account-outline"></i>
               {% trans "Group roles" %}
             </a>
           </li>
@@ -50,16 +50,14 @@
         {% csrf_token %}
         {% form form=select_form %}{% endform %}
         <button type="submit" class="btn waves-effect waves-light primary-color">
-          <i class="material-icons left">check</i>
+          <i class="material-icons iconify left" data-icon="mdi:check"></i>
           {% blocktrans %}Select{% endblocktrans %}
         </button>
       </form>
     </div>
     <div class="col s12 m4 l2 right">
       <button type="button" class="btn waves-effect waves-light hundred-percent" id="toggle-button">
-        <i class="material-icons left">
-          filter_alt
-        </i> {% trans "Toggle filters" %}
+        <i class="material-icons iconify left" data-icon="mdi:filter-outline"></i> {% trans "Toggle filters" %}
       </button>
     </div>
   </div>
@@ -74,11 +72,11 @@
   {% if group %}
     <p class="hide-on-med-and-down">
       <a class="btn primary-color waves-effect waves-light" href="{% url "students_list" group.pk %}">
-        <i class="material-icons left">people</i>
+        <i class="material-icons iconify left" data-icon="mdi:account-multiple-outline"></i>
         {% trans "Students list" %}
       </a>
       <a class="btn waves-effect waves-light" href="{% url "full_register_group" group.pk %}" target="_blank">
-        <i class="material-icons left">print</i>
+        <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
         {% trans "Generate printout" %}
       </a>
     </p>
@@ -86,14 +84,14 @@
     <p class="hide-on-med-and-up">
       <a class="btn primary-color waves-effect waves-light hundred-percent"
          href="{% url "students_list" group.pk %}">
-        <i class="material-icons left">people</i>
+        <i class="material-icons iconify left" data-icon="mdi:account-multiple-outline"></i>
         {% trans "Students list" %}
       </a>
     </p>
     <p class="hide-on-med-and-up">
       <a class="btn waves-effect waves-light hundred-percent" href="{% url "full_register_group" group.pk %}"
          target="_blank">
-        <i class="material-icons left">print</i>
+        <i class="material-icons iconify left" data-icon="mdi:printer-outline"></i>
         {% trans "Generate printout" %}
       </a>
     </p>
@@ -212,7 +210,7 @@
                 <li class="">
                   <div class="collapsible-header flow-text">
                     {{ advanced_weekday.name }}, {{ advanced_weekday.date }} <i
-                    class="material-icons collapsible-icon-right">expand_more</i>
+                    class="material-icons iconify collapsible-icon-right" data-icon="mdi:unfold-more-horizontal"></i>
                   </div>
                   <div class="collapsible-body">
                     <div class="collection">
@@ -290,9 +288,8 @@
                 <p class="subtitle">
                   <span>{{ advanced_weekday.date }}</span>
                   <button class="btn-superflat right waves-effect unfold-trigger">
-                    {% trans "Unfold" %} <i class="material-icons">
-                    expand_less
-                  </i>
+                    {% trans "Unfold" %}
+                    <i class="material-icons iconify" data-icon="mdi:unfold-less-horizontal"></i>
                   </button>
                 </p>
                 <div class="horizontal-scroll-container">
@@ -381,7 +378,7 @@
                 {% if can_register_absence %}
                   <a class="btn primary-color waves-effect waves-light right"
                      href="{% url "register_absence" person.person.pk %}">
-                    <i class="material-icons left">rate_review</i>
+                    <i class="material-icons iconify left" data-icon="mdi:message-draw"></i>
                     {% trans "Register absence" %}
                   </a>
                 {% endif %}
@@ -432,7 +429,7 @@
     <div class="card">
       <div class="card-content">
         <span class="card-title">
-          <i class="material-icons red-text left">warning</i>
+          <i class="material-icons iconify red-text left" data-icon="mdi:alert-outline"></i>
           {% blocktrans %}No lessons available{% endblocktrans %}
         </span>
         <p>
diff --git a/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html b/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
index c394784f0..e6235a32f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
@@ -14,7 +14,7 @@
   {% has_perm "alsijil.add_excusetype_rule" user as add_excusetype %}
   {% if add_excusetype %}
     <a class="btn green waves-effect waves-light" href="{% url 'create_excuse_type' %}">
-      <i class="material-icons left">add</i>
+      <i class="material-icons iconify left"data-icon="mdi:plus"></i>
       {% trans "Create excuse type" %}
     </a>
   {% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/excuse_type/warning.html b/aleksis/apps/alsijil/templates/alsijil/excuse_type/warning.html
index 9ff8af6e9..811b90b33 100644
--- a/aleksis/apps/alsijil/templates/alsijil/excuse_type/warning.html
+++ b/aleksis/apps/alsijil/templates/alsijil/excuse_type/warning.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <figure class="alert warning">
-  <i class="material-icons left">warning</i>
+  <i class="material-icons iconify left" data-icon="mdi:alert-outline"></i>
   {% blocktrans %}
     This function should only be used to define alternatives to the default excuse which also will be counted extra.
     Don't use this to create a default excuse or if you don't divide between different types of excuse.
diff --git a/aleksis/apps/alsijil/templates/alsijil/extra_mark/list.html b/aleksis/apps/alsijil/templates/alsijil/extra_mark/list.html
index a1a12b380..9eeb63b1a 100644
--- a/aleksis/apps/alsijil/templates/alsijil/extra_mark/list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/extra_mark/list.html
@@ -10,7 +10,7 @@
 
 {% block content %}
   <a class="btn green waves-effect waves-light" href="{% url 'create_extra_mark' %}">
-    <i class="material-icons left">add</i>
+    <i class="material-icons iconify left" data-icon="mdi:plus"></i>
     {% trans "Create extra mark" %}
   </a>
 
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/assign.html b/aleksis/apps/alsijil/templates/alsijil/group_role/assign.html
index a4a5ac137..194c45e88 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/assign.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/assign.html
@@ -30,7 +30,7 @@
     {% form form=form %}{% endform %}
 
     <button type="submit" class="btn green waves-effect waves-light">
-      <i class="material-icons left">assignment_ind</i>
+      <i class="material-icons iconify left" data-icon="mdi:clipboard-account-outline"></i>
       {% trans "Assign" %}
     </button>
   </form>
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html b/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html
index a5533b444..bed7ae1c9 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html
@@ -24,7 +24,7 @@
     {% has_perm "alsijil.view_my_groups_rule" user as can_view_group_overview %}
     {% if can_view_group_overview %}
       <a class="btn waves-effect waves-light" href="{% url "my_groups" %}">
-        <i class="material-icons left">arrow_back</i>
+        <i class="material-icons iconify left" data-icon="mdi:arrow-left"></i>
         {% trans "Back to my groups" %}
       </a>
     {% endif %}
@@ -32,7 +32,7 @@
     {% has_perm "alsijil.assign_grouprole_for_group_rule" user object as can_assign_group_role %}
     {% if can_assign_group_role %}
       <a class="btn green waves-effect waves-light" href="{% url "assign_group_role" object.pk %}">
-        <i class="material-icons left">assignment_ind</i>
+        <i class="material-icons iconify left" data-icon="mdi:clipboard-account-outline"></i>
         {% trans "Assign a role to a person" %}
       </a>
     {% endif %}
@@ -79,7 +79,7 @@
             <td>
               <a class="btn waves-effect waves-light dropdown-trigger" href="#"
                  data-target="dropdown-{{ assignment.pk }}-d2">
-                <i class="material-icons left">list</i>
+                <i class="material-icons iconify left" data-icon="mdi:format-list-bulleted"></i>
                 {% trans "Actions" %}
               </a>
               {% include "alsijil/group_role/partials/assignment_options.html" with assignment=assignment back_url=back_url suffix="-d2" %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/list.html b/aleksis/apps/alsijil/templates/alsijil/group_role/list.html
index 73606d95b..3b10aadb2 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/list.html
@@ -12,7 +12,7 @@
   {% has_perm "alsijil.add_grouprole_rule" user as add_group_role %}
   {% if add_group_role %}
     <a class="btn green waves-effect waves-light" href="{% url 'create_group_role' %}">
-      <i class="material-icons left">add</i>
+      <i class="material-icons iconify left" data-icon="mdi:plus"></i>
       {% trans "Create group role" %}
     </a>
   {% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html
index fddec1113..f1955e749 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html
@@ -8,7 +8,7 @@
           {% if can_assign_group_role %}
             <a class="btn waves-effect waves-light right hide-on-med-and-up"
                href="{% url "assign_group_role" group.pk role.pk %}?next={{ back_url }}">
-              <i class="material-icons center">add</i>
+              <i class="material-icons iconify center" data-icon="mdi:plus"></i>
             </a>
           {% endif %}
 
@@ -21,7 +21,7 @@
           {% if can_assign_group_role %}
             <a class="btn waves-effect waves-light right hide-on-small-only"
                href="{% url "assign_group_role" group.pk role.pk %}?next={{ back_url }}">
-              <i class="material-icons center">add</i>
+              <i class="material-icons iconify center" data-icon="mdi:plus"></i>
             </a>
           {% endif %}
 
@@ -37,7 +37,7 @@
 </div>
 
 <figure class="alert primary">
-  <i class="material-icons left">info</i>
+  <i class="material-icons iconify left" data-icon="information-outline"></i>
   {% blocktrans %}
     You can get some additional actions for each group role assignment if you click on the name of the
     corresponding person.
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html
index 6c6928934..3fcd3f57b 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html
@@ -10,7 +10,7 @@
   {% if can_edit %}
     <li>
       <a href="{% url "edit_group_role_assignment" assignment.pk %}?next={{ back_url }}">
-        <i class="material-icons left">edit</i> {% trans "Edit" %}
+        <i class="material-icons iconify left" data-icon="mdi:pencil-outline"></i> {% trans "Edit" %}
       </a>
     </li>
   {% endif %}
@@ -18,7 +18,7 @@
   {% if not assignment.date_end and can_stop %}
     <li>
       <a href="#">
-        <i class="material-icons left">stop</i> {% trans "Stop" %}
+        <i class="material-icons iconify left" data-icon="mdi:stop"></i> {% trans "Stop" %}
       </a>
     </li>
   {% endif %}
@@ -26,7 +26,7 @@
   {% if can_delete %}
     <li>
       <a href="{% url "delete_group_role_assignment" assignment.pk %}?next={{ back_url }}" class="red-text">
-        <i class="material-icons left">delete</i> {% trans "Delete" %}
+        <i class="material-icons iconify left" data-icon="mdi:delete-outline"></i> {% trans "Delete" %}
       </a>
     </li>
   {% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/warning.html b/aleksis/apps/alsijil/templates/alsijil/group_role/warning.html
index 9ff8af6e9..811b90b33 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/warning.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/warning.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <figure class="alert warning">
-  <i class="material-icons left">warning</i>
+  <i class="material-icons iconify left" data-icon="mdi:alert-outline"></i>
   {% blocktrans %}
     This function should only be used to define alternatives to the default excuse which also will be counted extra.
     Don't use this to create a default excuse or if you don't divide between different types of excuse.
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/heading.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/heading.html
index 07c14a649..4b768265a 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/heading.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/heading.html
@@ -10,14 +10,14 @@
      href="{% url "lesson_period" prev_lesson.week.year prev_lesson.week.week prev_lesson.id %}"
       {% endif %}
   >
-    <i class="material-icons center">navigate_before</i>
+    <i class="material-icons iconify center" data-icon="mdi:chevron-left"></i>
   </a>
   <a class="btn-flat waves-effect waves-light primary-color-text right alsijil-header-nav-button hide-on-med-and-up {% if not next_lesson %}disabled{% endif %}"
       {% if next_lesson %}
      href="{% url "lesson_period" next_lesson.week.year next_lesson.week.week next_lesson.id %}"
       {% endif %}
   >
-    <i class="material-icons center">navigate_next</i>
+    <i class="material-icons iconify center" data-icon="mdi:chevron-right"></i>
   </a>
 
   <span class="alsijil-time-head">
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/prev_next.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/prev_next.html
index dcddcfcc1..a12cf71e8 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/prev_next.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/prev_next.html
@@ -5,7 +5,8 @@
     {% if not blocked_because_holidays and with_save %}
       {% if can_edit_lesson_documentation or can_edit_register_object_personalnote %}
         <button type="submit" class="btn waves-effect waves-light green margin-bottom">
-          <i class="material-icons left">save</i> {% trans "Save" %}
+          <i class="material-icons iconify left" data-icon="mdi:content-save-outline"></i>
+          {% trans "Save" %}
         </button>
       {% endif %}
     {% endif %}
@@ -15,7 +16,7 @@
        href="{% url "lesson_period" prev_lesson.week.year prev_lesson.week.week prev_lesson.id %}"
         {% endif %}
     >
-      <i class="material-icons left">arrow_back</i>
+      <i class="material-icons iconify left" data-icon="mdi:arrow-left"></i>
       {% blocktrans with subject=register_object.get_subject.short_name %}
         Previous {{ subject }} lesson
       {% endblocktrans %}
@@ -26,7 +27,7 @@
        href="{% url "lesson_period" next_lesson.week.year next_lesson.week.week next_lesson.id %}"
         {% endif %}
     >
-      <i class="material-icons right">arrow_forward</i>
+      <i class="material-icons iconify right" data-icon="mdi:arrow-right"></i>
       {% blocktrans with subject=register_object.get_subject.short_name %}
         Next {{ subject }} lesson
       {% endblocktrans %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html
index 42dcac323..c1a1e0030 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html
@@ -7,7 +7,7 @@
   {% if can_edit_lesson_documentation or can_edit_register_object_personalnote %}
     <button type="submit"
             class="btn waves-effect waves-light green margin-bottom hundred-percent hide-on-med-and-up">
-      <i class="material-icons left">save</i> {% trans "Save" %}
+      <i class="material-icons iconify left" data-icon="mdi:content-save-outline"></i> {% trans "Save" %}
     </button>
   {% endif %}
 {% endif %}
@@ -105,14 +105,18 @@
                 {% endfor %}
               </p>
             </td>
-            <td><i class="material-icons center">{{ form.absent.value|yesno:"check,clear" }}</i></td>
             <td>
-              <i class="material-icons center">{{ form.late.value|yesno:"check,clear" }}</i>
+              <i class="material-icons iconify center" data-icon="mdi:{{ form.absent.value|yesno:"check,close" }}"></i>
+            </td>
+            <td>
+              <i class="material-icons iconify center" data-icon="mdi:{{ form.late.value|yesno:"check,close" }}"></i>
               <span class="alsijil-tardiness-text">
                 {% if form.late.value %}{{ form.late.value|to_time|time:"i\m" }}{% endif %}
               </span>
             </td>
-            <td><i class="material-icons center">{{ form.excused.value|yesno:"check,clear" }}</i></td>
+            <td>
+              <i class="material-icons iconify center" data-icon="mdi:{{ form.excused.value|yesno:"check,close" }}"></i>
+              </td>
             <td>{% firstof form.instance.excuse_type "–" %}</td>
             <td>
               {% for extra_mark in form.instance.extra_marks.all %}
@@ -133,7 +137,7 @@
   {% if can_edit_lesson_documentation or can_edit_register_object_personalnote %}
     <button type="submit"
             class="btn waves-effect waves-light green margin-bottom hundred-percent hide-on-med-and-up">
-      <i class="material-icons left">save</i> {% trans "Save" %}
+      <i class="material-icons iconify left" data-icon="mdi:content-save-outline"></i> {% trans "Save" %}
     </button>
   {% endif %}
 {% endif %}
\ No newline at end of file
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/seating_plan.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/seating_plan.html
index 4207f94e0..de5e9f44f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/seating_plan.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/seating_plan.html
@@ -10,7 +10,7 @@
       </div>
       {% if seating_plan_parent %}
         <figure class="alert primary">
-          <i class="material-icons left">info</i>
+          <i class="material-icons iconify left" data-icon="information-outline"></i>
           {% blocktrans with child_group=first_group %}
             This seating plan is taken from the parent group of {{ child_group }}.
             If you want, you can take it over for your group and then customize it.
@@ -26,14 +26,14 @@
           {% if can_edit %}
             <a class="btn orange waves-effect waves-light"
                href="{% url "edit_seating_plan" seating_plan.pk %}?next={{ back_url }}#seating-plan">
-              <i class="material-icons left">edit</i>
+              <i class="material-icons iconify left" data-icon="mdi:pencil-outline"></i>
               {% trans "Edit seating plan" %}
             </a>
           {% endif %}
           {% if can_copy and seating_plan_parent %}
             <a class="btn orange waves-effect waves-light"
                href="{% url "copy_seating_plan" seating_plan.pk %}?next={{ back_url }}#seating-plan">
-              <i class="material-icons left">content_copy</i>
+              <i class="material-icons iconify left" data-icon="mdi:content-copy"></i>
               {% trans "Copy plan and edit" %}
             </a>
           {% endif %}
@@ -52,7 +52,7 @@
     <div class="card">
       <div class="card-content">
         <div class="card-title">
-          <i class="material-icons left small orange-text">warning</i>
+          <i class="material-icons iconify left small orange-text" data-icon="mdi:alert-outline"></i>
           {% trans "There is no seating plan for this lesson." %}
         </div>
         {% has_perm "stoelindeling.create_seatingplan_rule" user first_group as can_add %}
@@ -60,7 +60,7 @@
           <div class="row margin-bottom">
             <div class="col s12">
               <a class="btn waves-effect waves-light" href="{% url "create_seating_plan" %}?group={{ first_group.pk }}&subject={{ register_object.get_subject.pk }}&room={{ register_object.get_room.pk }}&next={{ back_url }}#seating-plan">
-                <i class="material-icons left">add</i>
+                <i class="material-icons iconify left" data-icon="mdi:plus"></i>
                 {% blocktrans with group=first_group.name subject=register_object.get_subject.name room=register_object.get_room.name %}
                   Create a new seating plan for {{ group }} ({{ subject }}) in {{ room }}
                 {% endblocktrans %}
@@ -74,7 +74,7 @@
             <div class="row">
               <div class="col s12">
                 <a class="btn waves-effect waves-light" href="{% url "create_seating_plan" %}?group={{ parent_group.pk }}&subject={{ register_object.get_subject.pk }}&room={{ register_object.get_room.pk }}&next={{ back_url }}#seating-plan">
-                  <i class="material-icons left">add</i>
+                  <i class="material-icons iconify left" data-icon="mdi:plus"></i>
                   {% blocktrans with group=parent_group.name room=register_object.get_room.name %}
                     Create a new seating plan for {{ group }} in {{ room }}
                   {% endblocktrans %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status.html
index 41c80fd25..acd8d283d 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status.html
@@ -3,7 +3,7 @@
 {% now_datetime as now_dt %}
 
 {% if has_documentation or register_object.has_documentation %}
-  {% include "alsijil/partials/lesson_status_icon.html" with text=_("Data complete") icon="check_circle" color="green" %}
+  {% include "alsijil/partials/lesson_status_icon.html" with text=_("Data complete") icon="mdi:check-circle-outline" color="green" %}
 {% elif not register_object.period %}
   {% if week %}
     {% period_to_time_start week register_object.raw_period_from_on_day as time_start %}
@@ -14,23 +14,23 @@
   {% endif %}
 
   {% if now_dt > time_end %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Missing data") icon="warning" color="red" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Missing data") icon="mdi:alert-outline" color="red" %}
   {% elif now_dt > time_start and now_dt < time_end %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Pending") icon="more_horiz" color="orange" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Pending") icon="mdi:dots-horizontal" color="orange" %}
   {% else %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Event") icon="event" color="purple" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Event") icon="mdi:calendar" color="purple" %}
   {% endif %}
 {% else %}
   {% period_to_time_start week register_object.period as time_start %}
   {% period_to_time_end week register_object.period as time_end %}
 
   {% if substitution.cancelled or register_object.get_substitution.cancelled %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Lesson cancelled") icon="cancel" color="red" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Lesson cancelled") icon="mdi:close" color="red" %}
   {% elif now_dt > time_end %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Missing data") icon="warning" color="red" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Missing data") icon="mdi:alert-outline" color="red" %}
   {% elif now_dt > time_start and now_dt < time_end %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Pending") icon="more_horiz" color="orange" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Pending") icon="mdi:dots-horizontal" color="orange" %}
   {% elif substitution or register_object.get_substitution %}
-    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Substitution") icon="update" color="orange" %}
+    {% include "alsijil/partials/lesson_status_icon.html" with text=_("Substitution") icon="mdi:update" color="orange" %}
   {% endif %}
 {% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html
index 046b3ffbd..2c016c685 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html
@@ -1,14 +1,12 @@
 {% if chip %}
   <span class="{% if chip %}chip{% endif %} {{ color }} white-text {{ css_class }}">
-    <i class="material-icons left">
-      {{ icon }}
-    </i>
+    <i class="material-icons iconify left" data-icon="{{ icon }}"></i>
     {{ text }}
   </span>
 {% else %}
-  <i class="material-icons {{ color }}{% firstof color_suffix "-text" %} tooltipped {{ css_class }}"
+  <i class="material-icons iconify {{ color }}{% firstof color_suffix "-text" %} tooltipped {{ css_class }}"
+     data-icon="{{ icon }}"
      data-position="bottom"
      data-tooltip="{{ text }}" title="{{ text }}">
-    {{ icon }}
   </i>
 {% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html b/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
index f13e60439..e2053816e 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
@@ -5,7 +5,7 @@
     <form action="" method="get">
       {% form form=filter_form %}{% endform %}
       <button type="submit" class="btn waves-effect waves-light">
-        <i class="material-icons left">refresh</i>
+        <i class="material-icons iconify left" data-icon="mdi:refresh"></i>
         {% trans "Update filters" %}
       </button>
     </form>
@@ -29,7 +29,7 @@
               <div class="col s12 m4">
                 <button type="submit" class="btn waves-effect waves-primary">
                   {% trans "Execute" %}
-                  <i class="material-icons right">send</i>
+                  <i class="material-icons iconify right" data-icon="mdi:send-outline"></i>
                 </button>
               </div>
             </div>
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html b/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
index efa5bc3a8..bb60dbbd0 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
@@ -2,7 +2,7 @@
 
 {% if not persons %}
   <figure class="alert primary">
-    <i class="material-icons left">warning</i>
+    <i class="material-icons iconify left" data-icon="mdi:alert-outline"></i>
     {% blocktrans %}No students available.{% endblocktrans %}
   </figure>
 {% else %}
@@ -126,7 +126,7 @@
 
       <td>
         <a class="btn primary waves-effect waves-light" href="{% url "overview_person" person.pk %}">
-          <i class="material-icons left">insert_chart</i>
+          <i class="material-icons iconify left" data-icon="mdi:chart-box-outline"></i>
           <span class="hide-on-med-and-down"> {% trans "Show more details" %}</span>
           <span class="hide-on-large-only">{% trans "Details" %}</span>
         </a>
@@ -134,7 +134,7 @@
         {% has_perm "alsijil.register_absence_rule" user person as can_register_absence %}
         {% if can_register_absence %}
           <a class="btn primary-color waves-effect waves-light" href="{% url "register_absence" person.pk %}">
-            <i class="material-icons left">rate_review</i>
+            <i class="material-icons iconify left" data-icon="mdi:message-draw"></i>
             {% trans "Register absence" %}
           </a>
         {% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
index a8f7dd5c3..859f03d53 100644
--- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
@@ -256,29 +256,29 @@
             <img src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}"/>
           {% endif %}
         </td>
-        <td><i class="material-icons">person</i></td>
+        <td><i class="material-icons iconify" data-icon="mdi:account-outline"></i></td>
         <td colspan="2">{{ person.first_name }} {{ person.additional_name }} {{ person.last_name }}</td>
       </tr>
       <tr>
-        <td><i class="material-icons">face</i></td>
+        <td><i class="material-icons iconify" data-icon="mdi:human-non-binary"></i></td>
         <td colspan="2">{{ person.get_sex_display }}</td>
       </tr>
       <tr>
-        <td><i class="material-icons">home</i></td>
+        <td><i class="material-icons iconify" data-icon="mdi:map-marker-outline"></i></td>
         <td>{{ person.street }} {{ person.housenumber }}</td>
         <td>{{ person.postal_code }} {{ person.place }}</td>
       </tr>
       <tr>
-        <td><i class="material-icons">phone</i></td>
+        <td><i class="material-icons iconify" data-icon="mdi:phone-outline"></i></td>
         <td>{{ person.phone_number }}</td>
         <td>{{ person.mobile_number }}</td>
       </tr>
       <tr>
-        <td><i class="material-icons">email</i></td>
+        <td><i class="material-icons iconify" data-icon="mdi:email-outline"></i></td>
         <td colspan="2">{{ person.email }}</td>
       </tr>
       <tr>
-        <td><i class="material-icons">cake</i></td>
+        <td><i class="material-icons iconify" data-icon="mdi:cake"></i></td>
         <td colspan="2">{{ person.date_of_birth|date }}</td>
       </tr>
     </table>
-- 
GitLab