diff --git a/plinth/modules/kiwix/templates/kiwix-add-package.html b/plinth/modules/kiwix/templates/kiwix-add-package.html
index 8b5944ad6..164bc2fce 100644
--- a/plinth/modules/kiwix/templates/kiwix-add-package.html
+++ b/plinth/modules/kiwix/templates/kiwix-add-package.html
@@ -5,6 +5,7 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block content %}
 
@@ -22,7 +23,7 @@
   {% if max_filesize %}
     <div class="alert alert-warning 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/kiwix/templates/kiwix.html b/plinth/modules/kiwix/templates/kiwix.html
index e3a30a822..3892774e5 100644
--- a/plinth/modules/kiwix/templates/kiwix.html
+++ b/plinth/modules/kiwix/templates/kiwix.html
@@ -4,6 +4,7 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block configuration %}
   {{ block.super }}
@@ -13,7 +14,7 @@
   <div class="btn-toolbar">
     <a href="{% url 'kiwix:add-package' %}" class="btn btn-default"
        role="button" title="{% trans 'Add a content package' %}">
-      <span class="fa fa-plus" aria-hidden="true"></span>
+      {% icon 'plus' %}
       {% trans 'Add Package' %}
     </a>
   </div>
@@ -35,7 +36,7 @@
               <a href="{% url 'kiwix:delete-package' id %}"
                  class="btn btn-default btn-sm secondary" role="button"
                  title="{% blocktrans with title=package.title %}Delete package {{ title }}{% endblocktrans %}">
-                <span class="fa fa-trash-o" aria-hidden="true"></span>
+                {% icon 'trash-o' %}
               </a>
             </div>
           {% endfor %}