diff --git a/aleksis/core/templates/account/password_change.html b/aleksis/core/templates/account/password_change.html
index be331751b31187a792b72cf97a178ddddf4de42b..3bcf728890412e39f69929db3d85c945343a5126 100644
--- a/aleksis/core/templates/account/password_change.html
+++ b/aleksis/core/templates/account/password_change.html
@@ -8,7 +8,7 @@
 {% block content %}
   <div class="alert warning">
     <p>
-      <i class="material-icons left">warning</i>
+      <i class="material-icons iconify left" data-icon="mdi:alert-outline"></i>
       {% trans "Forgot your current password? Click here to reset it:" %} <a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>.
     </p>
   </div>
@@ -17,7 +17,7 @@
     {% csrf_token %}
     {% form form=form %}{% endform %}
     {% trans "Change password" as caption %}
-    {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
+    {% include "core/partials/save_button.html" with caption=caption icon="mdi:exclamation" %}
   </form>
 
 {% endblock %}
diff --git a/aleksis/core/templates/account/password_change_disabled.html b/aleksis/core/templates/account/password_change_disabled.html
index 131df489102ec8d257f584892ceb94f04d8e93b1..996ecfa9fa6368ab45772be4064dc058ac59567f 100644
--- a/aleksis/core/templates/account/password_change_disabled.html
+++ b/aleksis/core/templates/account/password_change_disabled.html
@@ -9,7 +9,7 @@
   <div class="container">
     <div class="card red">
       <div class="card-content white-text">
-        <div class="material-icons small left">error_outline</div>
+        <div class="material-icons iconify small left" data-icon="mdi:alert-octagon-outline"></div>
         <span class="card-title">{% blocktrans %}Changing of password disabled.{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
diff --git a/aleksis/core/templates/account/password_reset.html b/aleksis/core/templates/account/password_reset.html
index 4e93262643e0e28919e405c9b2f0465bf2a2bcf8..6253e0df3643b9fb6434bee35944583c40056b15 100644
--- a/aleksis/core/templates/account/password_reset.html
+++ b/aleksis/core/templates/account/password_reset.html
@@ -15,13 +15,13 @@
             <div class="card-title">{% trans "Reset password" %}</div>
               <p class="margin-bottom">
                 {% blocktrans %}Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it.{% endblocktrans %}
-              </p> 
+              </p>
               {% csrf_token %}
               {% form form=form %}{% endform %}
-            </div>  
+            </div>
           <div class="card-action-light">
             {% trans "Reset password" as caption %}
-            {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
+            {% include "core/partials/save_button.html" with caption=caption icon="mdi:exclamation" %}
           </div>
         </form>
       </div>
diff --git a/aleksis/core/templates/account/password_reset_done.html b/aleksis/core/templates/account/password_reset_done.html
index ddd8b3871c242e8ee2eb9b22cc472778a3b096b9..f97816fea191b4435d53ea6ea61884186883ccbb 100644
--- a/aleksis/core/templates/account/password_reset_done.html
+++ b/aleksis/core/templates/account/password_reset_done.html
@@ -11,7 +11,7 @@
     <div class="card green">
       <div class="card-content white-text">
         <div class="card-title">
-          <i class="material-icons small left">check_circle</i>
+          <i class="material-icons iconify small left" data-icon="mdi:check-circle-outline"></i>
           {% blocktrans %}Password reset mail sent{% endblocktrans %}
         </div>
         <p>
diff --git a/aleksis/core/templates/account/password_reset_from_key.html b/aleksis/core/templates/account/password_reset_from_key.html
index 4b2b91a28c875e7c1337fd0543646eae881da356..7afae12f4b0141d0a8a9af2ba2ecb33e893c41a0 100644
--- a/aleksis/core/templates/account/password_reset_from_key.html
+++ b/aleksis/core/templates/account/password_reset_from_key.html
@@ -11,7 +11,7 @@
       <div class="card red">
         <div class="card-content white-text">
           <div class="card-title">
-            <i class="material-icons small left">error_outline</i>
+            <i class="material-icons iconify small left" data-icon="mdi:alert-octagon-outline"></i>
             {% blocktrans %}Bad token{% endblocktrans %}
           </div>
           <p>
@@ -44,7 +44,7 @@
                 {% form form=form %}{% endform %}
               <div class="card-action-light">
                 {% trans "Change password" as caption %}
-                {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
+                {% include "core/partials/save_button.html" with caption=caption icon="mdi:exclamation" %}
               </div>
             </div>
           </form>
@@ -52,7 +52,7 @@
       </div>
       <div class="alert success">
         <p>
-          <i class="material-icons left">success</i>
+          <i class="material-icons iconify left" data-icon="mdi:check"></i>
           {% blocktrans %}
             Your password is now changed!
           {% endblocktrans %}
diff --git a/aleksis/core/templates/account/password_reset_from_key_done.html b/aleksis/core/templates/account/password_reset_from_key_done.html
index b32538e53ee5b1b0f2115e645d0f955d235ba958..8fdd9232f065d093549358c485b523a40d83a996 100644
--- a/aleksis/core/templates/account/password_reset_from_key_done.html
+++ b/aleksis/core/templates/account/password_reset_from_key_done.html
@@ -9,7 +9,7 @@
   <div class="container">
     <div class="card green">
       <div class="card-content white-text">
-        <div class="material-icons small left">success</div>
+        <i class="material-icons iconify small left" data-icon="mdi:check"></i>
         <span class="card-title">{% blocktrans %}Password changed!{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
diff --git a/aleksis/core/templates/account/password_set.html b/aleksis/core/templates/account/password_set.html
index 08819c1e0904f53e62f11d86bd2e82ccef7b2469..2c550502354719da4959adb7c9b12739378b1c23 100644
--- a/aleksis/core/templates/account/password_set.html
+++ b/aleksis/core/templates/account/password_set.html
@@ -10,7 +10,7 @@
     {% csrf_token %}
     {% form form=form %}{% endform %}
     {% trans "Set password" as caption %}
-    {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
+    {% include "core/partials/save_button.html" with caption=caption icon="mdi:exclamation" %}
   </form>
 
 {% endblock %}