diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html
index 4d552e7be1c49b68f734a03ab676e9f64e5d3b2d..bb8214e3784ea1abd08174e6b4787f2cf8b58d64 100644
--- a/AKPlan/templates/AKPlan/plan_index.html
+++ b/AKPlan/templates/AKPlan/plan_index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load fontawesome %}
+{% load fontawesome_5 %}
 {% load i18n %}
 {% load tags_AKModel %}
 {% load static %}
@@ -109,7 +109,7 @@
 
 {% block content %}
     <div class="float-right">
-        <a href="{% url 'plan:plan_wall' event_slug=event.slug %}" class="btn btn-success">{% fontawesome_icon 'desktop' %}&nbsp;&nbsp;{% trans "AK Wall" %}</a>
+        <a href="{% url 'plan:plan_wall' event_slug=event.slug %}" class="btn btn-success">{% fa5_icon 'desktop' 'fas' %}&nbsp;&nbsp;{% trans "AK Wall" %}</a>
     </div>
 
     <h1>Plan: {{ event }}</h1>
@@ -141,7 +141,7 @@
 {% block footer_custom %}
     {% if event.contact_email %}
         <h4>
-            <a href="mailto:{{ event.contact_email }}">{% fontawesome_icon "envelope" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+            <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" "far" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
         </h4>
     {% endif %}
 {% endblock %}
diff --git a/AKPlan/templates/AKPlan/plan_wall.html b/AKPlan/templates/AKPlan/plan_wall.html
index 8d21d59b24ee0d36281873feb5b6712e9ea34a43..ca0896052cd36fa6aec8f888a11af9d8a7ecbccf 100644
--- a/AKPlan/templates/AKPlan/plan_wall.html
+++ b/AKPlan/templates/AKPlan/plan_wall.html
@@ -1,7 +1,7 @@
 {% load static %}
 {% load i18n %}
 {% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
 {% load tags_AKModel %}
 {% load tz %}
 
@@ -15,7 +15,7 @@
     {# Load Bootstrap CSS and JavaScript as well as font awesome #}
     {% bootstrap_css %}
     {% bootstrap_javascript jquery='slim' %}
-    {% fontawesome_stylesheet %}
+    {% fontawesome_5_static %}
 
     <link rel="stylesheet" href="{% static 'common/css/custom.css' %}">