diff --git a/plinth/modules/bepasty/templates/bepasty.html b/plinth/modules/bepasty/templates/bepasty.html
index 10357dab0..70f416f40 100644
--- a/plinth/modules/bepasty/templates/bepasty.html
+++ b/plinth/modules/bepasty/templates/bepasty.html
@@ -5,6 +5,7 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block configuration %}
   {{ block.super }}
@@ -14,7 +15,7 @@
   <div class="btn-toolbar">
     <a href="{% url 'bepasty:add' %}" class="btn btn-default"
        role="button" title="{% trans 'Add password' %}">
-      <span class="fa fa-plus" aria-hidden="true"></span>
+      {% icon 'plus' %}
       {% trans 'Add password' %}
     </a>
   </div>
@@ -43,8 +44,10 @@
                 <form class="form form-inline" method="post"
                       action="{% url 'bepasty:remove' password.password %}">
                   {% csrf_token %}
-                  <button class="password-remove btn btn-sm btn-default fa fa-trash-o"
-                          type="submit"></button>
+                  <button class="password-remove btn btn-sm btn-default"
+                          type="submit">
+                    {% icon 'trash-o' %}
+                  </button>
                 </form>
               </td>
             </tr>