diff --git a/plinth/modules/wireguard/templates/wireguard.html b/plinth/modules/wireguard/templates/wireguard.html
index 2e474ed34..e100f5dfc 100644
--- a/plinth/modules/wireguard/templates/wireguard.html
+++ b/plinth/modules/wireguard/templates/wireguard.html
@@ -5,6 +5,7 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block configuration %}
   <h3>{% trans "As a Server" %}</h3>
@@ -87,7 +88,7 @@
         <a title="{% trans 'Add a new peer' %}"
            role="button" class="btn btn-default btn-add-client"
            href="{% url 'wireguard:add-client' %}">
-          <span class="fa fa-plus" aria-hidden="true"></span>
+          {% icon 'plus' %}
           {% trans "Add Allowed Client" %}
         </a>
     </div>
@@ -98,7 +99,7 @@
         {% csrf_token %}
         <button type="submit" class="btn btn-primary btn-start-server"
                 title="{% trans 'Start WireGuard Server' %}">
-          <span class="fa fa-rocket" aria-hidden="true"></span>
+          {% icon 'rocket' %}
           {% trans "Start WireGuard Server" %}
         </button>
       </form>
@@ -151,7 +152,7 @@
     <a title="{% trans 'Add a new server' %}"
        role="button" class="btn btn-default btn-add-server"
        href="{% url 'wireguard:add-server' %}">
-      <span class="fa fa-plus" aria-hidden="true"></span>
+      {% icon 'plus' %}
       {% trans "Add Connection to Server" %}
     </a>
   </div>
diff --git a/plinth/modules/wireguard/templates/wireguard_show_client.html b/plinth/modules/wireguard/templates/wireguard_show_client.html
index 0cb0c5d5e..3f979116e 100644
--- a/plinth/modules/wireguard/templates/wireguard_show_client.html
+++ b/plinth/modules/wireguard/templates/wireguard_show_client.html
@@ -4,6 +4,7 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block content %}
 
@@ -72,12 +73,12 @@
   <div class="btn-toolbar">
     <a class="btn btn-default btn-edit-client"
        href="{% url 'wireguard:edit-client' client.public_key|urlencode:'' %}">
-      <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
+      {% icon 'pencil-square-o' %}
       {% trans "Edit" %}
     </a>
     <a class="btn btn-default btn-delete-client"
        href="{% url 'wireguard:delete-client' client.public_key|urlencode:'' %}">
-      <span class="fa fa-trash-o" aria-hidden="true"></span>
+      {% icon 'trash-o' %}
       {% trans "Delete" %}
     </a>
   </div>
diff --git a/plinth/modules/wireguard/templates/wireguard_show_server.html b/plinth/modules/wireguard/templates/wireguard_show_server.html
index f0f306c95..8bfe0fe78 100644
--- a/plinth/modules/wireguard/templates/wireguard_show_server.html
+++ b/plinth/modules/wireguard/templates/wireguard_show_server.html
@@ -4,6 +4,7 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block content %}
 
@@ -80,12 +81,12 @@
   <div class="btn-toolbar">
     <a class="btn btn-default btn-edit-server"
        href="{% url 'wireguard:edit-server' interface %}">
-      <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
+      {% icon 'pencil-square-o' %}
       {% trans "Edit" %}
     </a>
     <a class="btn btn-default btn-delete-server"
        href="{% url 'wireguard:delete-server' interface %}">
-      <span class="fa fa-trash-o" aria-hidden="true"></span>
+      {% icon 'trash-o' %}
       {% trans "Delete" %}
     </a>
   </div>