diff --git a/aleksis/core/templates/material/fields/colorfield_colorwidget.html b/aleksis/core/templates/material/fields/colorfield_colorwidget.html
index ab8bc7f955126d365be64085b7be740ef70a398f..5fff8c00ac913134abcb8e869464aeb7fe1e6330 100644
--- a/aleksis/core/templates/material/fields/colorfield_colorwidget.html
+++ b/aleksis/core/templates/material/fields/colorfield_colorwidget.html
@@ -2,7 +2,7 @@
 {% part bound_field.field %}
   <div class="row">
     <div class="input-field col s12{% if widget.attrs.required %} required{% endif %}">
-    <i class="material-icons prefix" id="{{ bound_field.html_name }}_preview" style="color: {% firstof bound_field.value field.widget.attrs.default '' %};">color_lens</i>
+    <i class="material-icons iconify prefix" id="{{ bound_field.html_name }}_preview" style="color: {% firstof bound_field.value field.widget.attrs.default '' %};" data-icon="mdi:palette-outline"></i>
       {% part field prefix %}{% endpart %}{% part field control %}
         <input
           type="text"
diff --git a/aleksis/core/templates/material/non_field_errors.html b/aleksis/core/templates/material/non_field_errors.html
index c8a92eb7ef813325580738a7819fccf6da2dfa70..b64aa87982a9285f6ee023cff210bbff1ae6b67a 100644
--- a/aleksis/core/templates/material/non_field_errors.html
+++ b/aleksis/core/templates/material/non_field_errors.html
@@ -1,7 +1,7 @@
 {% if form.non_field_errors %}
   <div class="alert error">
     {% for error in form.non_field_errors %}
-      <div><i class="material-icons left">error</i> {{ error }}</div>
+      <div><i class="material-icons iconify left" data-icon="mdi:alert-octagon-outline"></i> {{ error }}</div>
     {% endfor %}
   </div>
 {% endif %}