diff --git a/plinth/modules/users/templates/users_firstboot.html b/plinth/modules/users/templates/users_firstboot.html
index 5eae7ae3c..6d91229de 100644
--- a/plinth/modules/users/templates/users_firstboot.html
+++ b/plinth/modules/users/templates/users_firstboot.html
@@ -6,6 +6,7 @@
 {% load bootstrap %}
 {% load i18n %}
 {% load static %}
+{% load plinth_extras %}
 
 {% block content %}
   <h2>{% trans "Administrator Account" %}</h2>
@@ -30,7 +31,7 @@
   {% else %}
     <div class="alert alert-danger d-flex align-items-center" role="alert">
       <div class="me-2">
-        <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+        {% icon 'exclamation-triangle' %}
         <span class="visually-hidden">{% trans "Caution:" %}</span>
       </div>
       <div>
diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html
index a06ea9021..8ea3ab843 100644
--- a/plinth/modules/users/templates/users_list.html
+++ b/plinth/modules/users/templates/users_list.html
@@ -5,6 +5,7 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block configuration %}
 
@@ -13,7 +14,7 @@
   <div class="btn-toolbar">
     <a href="{% url 'users:create' %}" class="btn btn-primary"
        role="button" title="{% trans 'Create User' %}">
-      <span class="fa fa-plus" aria-hidden="true"></span>
+      {% icon 'plus' %}
       {% trans 'Create User' %}
     </a>
   </div>
@@ -30,8 +31,7 @@
             </a>
 
             {% if not user.is_active %}
-              <span class="fa fa-ban primary"
-                    aria-hidden="true"></span>
+              {% icon 'ban' %}
             {% endif %}
 
           </div>