diff --git a/plinth/modules/pagekite/templates/pagekite_configure.html b/plinth/modules/pagekite/templates/pagekite_configure.html
index 1c420f62d..69229661d 100644
--- a/plinth/modules/pagekite/templates/pagekite_configure.html
+++ b/plinth/modules/pagekite/templates/pagekite_configure.html
@@ -6,6 +6,7 @@
 {% load bootstrap %}
 {% load i18n %}
 {% load static %}
+{% load plinth_extras %}
 
 {% block configuration %}
   {{ block.super }}
@@ -15,7 +16,7 @@
   <div class="btn-toolbar">
     <a href="{% url 'pagekite:add-custom-service' %}" class="btn btn-default"
        role="button" title="{% trans 'Add Custom Service' %}">
-      <span class="fa fa-plus" aria-hidden="true"></span>
+      {% icon 'plus' %}
       {% trans 'Add Custom Service' %}
     </a>
   </div>
@@ -45,7 +46,7 @@
             </div>
             <button type="submit" class="btn btn-default"
                     title="{% trans "Delete this service" %}">
-              <span class="fa fa-trash-o" aria-hidden="true"></span>
+              {% icon 'trash-o' %}
             </button>
           </form>
         </div>
diff --git a/plinth/modules/pagekite/templates/pagekite_custom_services.html b/plinth/modules/pagekite/templates/pagekite_custom_services.html
index 4122c7692..b6e3ad9a3 100644
--- a/plinth/modules/pagekite/templates/pagekite_custom_services.html
+++ b/plinth/modules/pagekite/templates/pagekite_custom_services.html
@@ -6,13 +6,14 @@
 {% load bootstrap %}
 {% load i18n %}
 {% load static %}
+{% load plinth_extras %}
 
 {% block content %}
   <h3>{% trans 'Add custom PageKite service' %}</h3>
 
   <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>