diff --git a/nsupdate/login/templates/login.html b/nsupdate/login/templates/login.html
index ebe9cf8..b196a5b 100644
--- a/nsupdate/login/templates/login.html
+++ b/nsupdate/login/templates/login.html
@@ -36,7 +36,7 @@
         {% for backend in backends.backends %}
             <div class="btn-group">
                 <a class="btn btn-default" role="button" href="{% url 'social:begin' backend %}">
-                    <i class="fa fa-sign-in fa-fw"></i> {{ backend }}
+                    <i class="fa fa-sign-in-alt fa-fw"></i> {{ backend }}
                 </a>
             </div>
         {% endfor %}
diff --git a/nsupdate/main/templates/main/home.html b/nsupdate/main/templates/main/home.html
index 408da6c..8521de0 100644
--- a/nsupdate/main/templates/main/home.html
+++ b/nsupdate/main/templates/main/home.html
@@ -21,7 +21,7 @@
             <h1>{{ WWW_HOST }} &mdash; {% trans "the Dynamic DNS service you waited for." %}</h1>
         </div>
         <div class="col-sm-4" style="text-align: center">
-            <h1><i class="fa fa-thumbs-o-up fa-3x"></i></h1>
+            <h1><i class="fa fa-thumbs-up fa-3x"></i></h1>
             <h3>{% trans "Free and Nice" %}</h3>
             <p>
                 {{ WWW_HOST }} {% trans "is a free service." %}<br>
@@ -39,7 +39,7 @@
             </p>
         </div>
         <div class="col-sm-4" style="text-align: center">
-            <h1><i class="fa fa-heart-o fa-3x"></i></h1>
+            <h1><i class="fa fa-heart fa-3x"></i></h1>
             <h3>{% trans "Awesome Code" %}</h3>
             <p>
                 {% blocktrans trimmed %}
diff --git a/nsupdate/main/templates/main/includes/tabbed_router_configuration.html b/nsupdate/main/templates/main/includes/tabbed_router_configuration.html
index 59efb2d..d6eb88b 100644
--- a/nsupdate/main/templates/main/includes/tabbed_router_configuration.html
+++ b/nsupdate/main/templates/main/includes/tabbed_router_configuration.html
@@ -98,9 +98,9 @@
             </li>
             <li>{% trans "The response status and content will be:" %}
                 <ul>
-                    <li>Status 200 and "good &lt;your ip&gt;" <i class="fa fa-long-arrow-right"></i> {% trans "new IP accepted" %}</li>
-                    <li>Status 200 and "nochg &lt;your ip&gt;" <i class="fa fa-long-arrow-right"></i> {% trans "IP accepted, but did not change since last update" %}</li>
-                    <li>Status 401: Authorization Required <i class="fa fa-long-arrow-right"></i> {% trans "Incorrect authentication or no http basic auth header received" %}</li>
+                    <li>Status 200 and "good &lt;your ip&gt;" <i class="fa fa-long-arrow-alt-right"></i> {% trans "new IP accepted" %}</li>
+                    <li>Status 200 and "nochg &lt;your ip&gt;" <i class="fa fa-long-arrow-alt-right"></i> {% trans "IP accepted, but did not change since last update" %}</li>
+                    <li>Status 401: Authorization Required <i class="fa fa-long-arrow-alt-right"></i> {% trans "Incorrect authentication or no http basic auth header received" %}</li>
                 </ul>
             </li>
         </ul>
@@ -110,8 +110,8 @@
         <hr>
         <h5>{% trans "Go to:" %}</h5>
         <div class="well well-sm">
-            Internet <i class="fa fa-long-arrow-right"></i>
-            Permit Access <i class="fa fa-long-arrow-right"></i>
+            Internet <i class="fa fa-long-arrow-alt-right"></i>
+            Permit Access <i class="fa fa-long-arrow-alt-right"></i>
             Dynamic DNS
         </div>
         <h5>{% trans "Enter the following data:" %}</h5>
@@ -138,7 +138,7 @@
         <h4>DD-WRT ({% trans "verified with" %} v24-sp2)</h4>
         <h5>{% trans "Go to:" %}</h5>
         <div class="well well-sm">
-            Setup <i class="fa fa-long-arrow-right"></i>
+            Setup <i class="fa fa-long-arrow-alt-right"></i>
             DDNS
         </div>
         <h5>{% trans "Enter the following data:" %}</h5>
@@ -235,7 +235,7 @@ detector = webcheck6
         <p>Homepage: <a href="http://ipfire.org/">http://ipfire.org</a></p>
         <h5>{% trans "Go to:" %}</h5>
         <div class="well well-sm">
-            Services <i class="fa fa-long-arrow-right"></i>
+            Services <i class="fa fa-long-arrow-alt-right"></i>
             Dynamic DNS
         </div>
         <h5>{% trans "Enter the following data (and click ADD afterwards):" %}</h5>
@@ -253,7 +253,7 @@ detector = webcheck6
         <p>Homepage: <a href="http://m0n0.ch/wall/">http://m0n0.ch/wall</a></p>
         <h5>{% trans "Go to:" %}</h5>
         <div class="well well-sm">
-            Services <i class="fa fa-long-arrow-right"></i>Dynamic DNS
+            Services <i class="fa fa-long-arrow-alt-right"></i>Dynamic DNS
         </div>
         <h5>{% trans "Enter the following data:" %}</h5>
         <table class="table">
diff --git a/nsupdate/templates/base.html b/nsupdate/templates/base.html
index 8b1a84a..2a77e09 100644
--- a/nsupdate/templates/base.html
+++ b/nsupdate/templates/base.html
@@ -11,7 +11,7 @@
         <title>{% block title %}{{ WWW_HOST }}{% endblock %}</title>
 
         <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+        <link href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" rel="stylesheet" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
         <link href="{% static 'css/nsupdate.css' %}" rel="stylesheet">
         <link rel="icon" type="image/png" href="{% static 'favicon.png' %}" />
         <!-- note: keep jQuery and bootstrap js here,
@@ -58,7 +58,7 @@
                     <ul class="nav navbar-nav pull-right">
                         {% if not request.user.is_authenticated %}
                             <li{% if nav_register %} class="active"{% endif %}><a href="{% url 'registration_register' %}"><i class="fa fa-asterisk fa-fw"></i> {% trans "Sign up" %}</a></li>
-                            <li{% if nav_login %} class="active"{% endif %}><a href="{% url 'login' %}"><i class="fa fa-sign-in fa-fw"></i> {% trans 'Log in' %}</a></li>
+                            <li{% if nav_login %} class="active"{% endif %}><a href="{% url 'login' %}"><i class="fa fa-sign-in-alt fa-fw"></i> {% trans 'Log in' %}</a></li>
                         {% else %}
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user fa-fw"></i> {{ request.user.username }} <b class="caret"></b></a>
@@ -68,7 +68,7 @@
                                     {% if request.user.is_staff %}
                                         <li><a href="{% url 'admin:index' %}"><i class="fa fa-wrench fa-fw"></i> {% trans 'Admin interface' %}</a></li>
                                     {% endif %}
-                                    <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out fa-fw"></i> {% trans 'Log out' %}</a></li>
+                                    <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out-alt fa-fw"></i> {% trans 'Log out' %}</a></li>
                                 </ul>
                             </li>
                         {% endif %}