diff --git a/allianceauth/corputils/auth_hooks.py b/allianceauth/corputils/auth_hooks.py
index e9f64452..e7e419b5 100644
--- a/allianceauth/corputils/auth_hooks.py
+++ b/allianceauth/corputils/auth_hooks.py
@@ -8,7 +8,7 @@ class CorpStats(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
                               _('Corporation Stats'),
-                              'fa fa-share-alt fa-fw',
+                              'fas fa-share-alt fa-fw',
                               'corputils:view',
                               navactive=['corputils:'])
 
diff --git a/allianceauth/fleetactivitytracking/auth_hooks.py b/allianceauth/fleetactivitytracking/auth_hooks.py
index 1a98479c..b54b63cd 100644
--- a/allianceauth/fleetactivitytracking/auth_hooks.py
+++ b/allianceauth/fleetactivitytracking/auth_hooks.py
@@ -6,7 +6,7 @@ from allianceauth.services.hooks import MenuItemHook, UrlHook
 
 @hooks.register('menu_item_hook')
 def register_menu():
-    return MenuItemHook(_('Fleet Activity Tracking'), 'fa fa-users fa-lightbulb-o fa-fw', 'fatlink:view',
+    return MenuItemHook(_('Fleet Activity Tracking'), 'fas fa-users fa-fw', 'fatlink:view',
                         navactive=['fatlink:'])
 
 
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
index 9eff7993..91da8bce 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
@@ -36,7 +36,7 @@
                                     <tr>                                                                
                                         <td class="text-right">
                                             {% if member.is_leader %}
-                                                <i class="fa fa-star"></i>&nbsp;
+                                                <i class="fas fa-star"></i>&nbsp;
                                             {% endif %}
                                             <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">                                            
                                         </td>
@@ -69,7 +69,7 @@
                                 {% endfor %}
                             </tbody>
                         </table>
-                        <p class="text-muted"><i class="fa fa-star"></i>: Group leader</p>
+                        <p class="text-muted"><i class="fas fa-star"></i>: Group leader</p>
                     </div>
                 {% else %}
                     <div class="alert alert-warning text-center">
diff --git a/allianceauth/hrapplications/auth_hooks.py b/allianceauth/hrapplications/auth_hooks.py
index 28f8677a..3f735451 100644
--- a/allianceauth/hrapplications/auth_hooks.py
+++ b/allianceauth/hrapplications/auth_hooks.py
@@ -8,7 +8,7 @@ class ApplicationsMenu(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
                               _('Applications'),
-                              'fa fa-file-o fa-fw',
+                              'far fa-file fa-fw',
                               'hrapplications:index',
                               navactive=['hrapplications:'])
 
diff --git a/allianceauth/optimer/auth_hooks.py b/allianceauth/optimer/auth_hooks.py
index 8773c758..f93faa98 100644
--- a/allianceauth/optimer/auth_hooks.py
+++ b/allianceauth/optimer/auth_hooks.py
@@ -7,7 +7,7 @@ from . import urls
 class OpTimerboardMenu(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self, _('Fleet Operations'),
-                              'fa fa-exclamation  fa-fw',
+                              'fas fa-exclamation  fa-fw',
                               'optimer:view',
                               navactive=['optimer:'])
 
diff --git a/allianceauth/permissions_tool/auth_hooks.py b/allianceauth/permissions_tool/auth_hooks.py
index 31905ed8..bc004b45 100644
--- a/allianceauth/permissions_tool/auth_hooks.py
+++ b/allianceauth/permissions_tool/auth_hooks.py
@@ -8,7 +8,7 @@ class PermissionsTool(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
                               'Permissions Audit',
-                              'fa fa-key fa-id-card',
+                              'fas fa-id-card fa-fw',
                               'permissions_tool:overview',
                               order=400,
                               navactive=['permissions_tool:'])
diff --git a/allianceauth/permissions_tool/tests.py b/allianceauth/permissions_tool/tests.py
index 455ad98f..76573bbc 100644
--- a/allianceauth/permissions_tool/tests.py
+++ b/allianceauth/permissions_tool/tests.py
@@ -41,7 +41,7 @@ class PermissionsToolViewsTestCase(WebTest):
         response_content = response.content.decode('utf-8')
 
         self.assertInHTML('<li><a class="active" href="/permissions/overview/">'
-                          '<i class="fa fa-key fa-id-card"></i> Permissions Audit</a></li>', response_content)
+                          '<i class="fas fa-id-card fa-fw"></i> Permissions Audit</a></li>', response_content)
 
     def test_permissions_overview(self):
         self.app.set_user(self.member)
diff --git a/allianceauth/services/auth_hooks.py b/allianceauth/services/auth_hooks.py
index f27bad90..8e400337 100644
--- a/allianceauth/services/auth_hooks.py
+++ b/allianceauth/services/auth_hooks.py
@@ -9,7 +9,7 @@ class Services(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
                               _('Services'),
-                              'fa fa-cogs fa-fw',
+                              'fas fa-cogs fa-fw',
                               'services:services', 100)
 
     def render(self, request):
diff --git a/allianceauth/services/modules/openfire/auth_hooks.py b/allianceauth/services/modules/openfire/auth_hooks.py
index 4073d691..0fb1ed12 100644
--- a/allianceauth/services/modules/openfire/auth_hooks.py
+++ b/allianceauth/services/modules/openfire/auth_hooks.py
@@ -76,7 +76,7 @@ class JabberBroadcast(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
                               _('Jabber Broadcast'),
-                              'fa fa-lock fa-fw fa-bullhorn',
+                              'fas fa-bullhorn fa-fw',
                               'openfire:broadcast')
 
     def render(self, request):
@@ -89,7 +89,7 @@ class FleetBroadcastFormatter(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
                               _('Fleet Broadcast Formatter'),
-                              'fa fa-lock fa-fw fa-space-shuttle',
+                              'fas fa-space-shuttle fa-fw',
                               'services:fleet_format_tool')
 
     def render(self, request):
diff --git a/allianceauth/srp/auth_hooks.py b/allianceauth/srp/auth_hooks.py
index 997fb84e..0002e6b9 100644
--- a/allianceauth/srp/auth_hooks.py
+++ b/allianceauth/srp/auth_hooks.py
@@ -7,7 +7,7 @@ from . import urls
 class SrpMenu(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self, _('Ship Replacement'),
-                              'fa fa-money fa-fw',
+                              'far fa-money-bill-alt fa-fw',
                               'srp:management',
                               navactive=['srp:'])
 
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 4ef0d8ae..c7325813 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -131,7 +131,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                                             <div class="checkbox">
                                                 <label style="font-size: 1.5em">
                                                     <input type="checkbox" name="{{srpfleetrequest.id}}">
-                                                    <span class="cr"><i class="cr-icon fa fa-check"></i></span>
+                                                    <span class="cr"><i class="cr-icon fas fa-check"></i></span>
                                                 </label>
                                             </div>                            
                                         </td>
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index f246dbed..fd96ffa8 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -20,7 +20,7 @@
                 </div>
                 <div class="text-right" style="position:absolute;bottom:5px;right:5px;">
                     <a href="https://gitlab.com/allianceauth/allianceauth/issues"><span class="label" style="background-color:#e65328;">
-                        <i class="fa fa-gitlab" aria-hidden="true"></i> Powered by GitLab</span>
+                        <i class="fab fa-gitlab" aria-hidden="true"></i> Powered by GitLab</span>
                     </a>
                 </div>
             </div>
@@ -40,7 +40,7 @@
                             <h5 class="list-group-item-heading">{% trans "Latest Stable" %}</h5>
                             <p class="list-group-item-text">
                                 <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
-                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
+                                    <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_patch_version }}
                                 </a>
                                 {% if not latest_patch %}<br>{% trans "Update available" %}{% endif %}
@@ -51,7 +51,7 @@
                             <h5 class="list-group-item-heading">{% trans "Latest Pre-Release" %}</h5>
                             <p class="list-group-item-text">
                                 <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
-                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
+                                    <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_beta_version }}
                                 </a>
                                 <br>{% trans "Pre-Release available" %}
diff --git a/allianceauth/templates/allianceauth/side-menu.html b/allianceauth/templates/allianceauth/side-menu.html
index bef3d097..eb43ed9e 100644
--- a/allianceauth/templates/allianceauth/side-menu.html
+++ b/allianceauth/templates/allianceauth/side-menu.html
@@ -7,12 +7,12 @@
             <li>
                 <a class="{% navactive request 'authentication:dashboard' %}"
                    href="{% url 'authentication:dashboard' %}">
-                    <i class="fa fa-dashboard fa-fw"></i> {% trans "Dashboard" %}
+                    <i class="fas fa-tachometer-alt fa-fw"></i> {% trans "Dashboard" %}
                 </a>
             </li>
             <li>
                 <a class="{% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
-                    <i class="fa fa-cogs fa-fw fa-sitemap"></i> {% trans "Groups" %}
+                    <i class="fas fa-sitemap fa-fw"></i> {% trans "Groups" %}
                 </a>
             </li>
 
@@ -20,7 +20,7 @@
                 <li>
                     <a class="{% navactive request 'groupmanagement:management groupmanagement:membership groupmanagement:membership_list' %}"
                        href="{% url 'groupmanagement:management' %}">
-                        <i class="fa fa-lock fa-sitemap fa-fw"></i> {% trans "Group Management" %}
+                        <i class="fas fa-sitemap fa-fw"></i> {% trans "Group Management" %}
                     </a>
                 </li>
             {% endif %}
diff --git a/allianceauth/templates/allianceauth/top-menu.html b/allianceauth/templates/allianceauth/top-menu.html
index 85d459a9..580d2be4 100644
--- a/allianceauth/templates/allianceauth/top-menu.html
+++ b/allianceauth/templates/allianceauth/top-menu.html
@@ -28,7 +28,7 @@
                     </li>
                 {% else %}
                     <li><a href="{% url 'notifications:list' %}">
-                        <i class="fa fa-bell-o"></i></a>
+                        <i class="far fa-bell"></i></a>
                     </li>
                 {% endif %}
                 {% if user.is_authenticated %}
@@ -42,7 +42,7 @@
                 {% if user.is_superuser %}
                     <li>
                         <a class="navbar-brand" style="margin-left: -4px;" href="https://allianceauth.readthedocs.io/" target="_blank">
-                            <i class="fa fa-question-circle fa-fw"></i>
+                            <i class="fas fa-question-circle fa-fw"></i>
                         </a>
                     </li>
                 {% endif %}
diff --git a/allianceauth/templates/bundles/fontawesome.html b/allianceauth/templates/bundles/fontawesome.html
index e7607e0c..8653dfa8 100644
--- a/allianceauth/templates/bundles/fontawesome.html
+++ b/allianceauth/templates/bundles/fontawesome.html
@@ -1,4 +1,5 @@
 {% load staticfiles %}
 <!-- Font Awesome Bundle -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css" rel="stylesheet" type="text/css">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/v4-shims.min.css" rel="stylesheet" type="text/css">
 <!-- End Font Awesome Bundle -->
diff --git a/allianceauth/timerboard/auth_hooks.py b/allianceauth/timerboard/auth_hooks.py
index 0cab88ef..eb1b6a51 100644
--- a/allianceauth/timerboard/auth_hooks.py
+++ b/allianceauth/timerboard/auth_hooks.py
@@ -7,7 +7,7 @@ from . import urls
 class TimerboardMenu(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self, 'Structure Timers',
-                              'fa fa-clock-o fa-fw',
+                              'far fa-clock fa-fw',
                               'timerboard:view',
                               navactive=['timerboard:'])