diff --git a/admin/templates/admin/common/confirm_delete.html b/admin/templates/admin/common/confirm_delete.html
index df6392e..015e46c 100644
--- a/admin/templates/admin/common/confirm_delete.html
+++ b/admin/templates/admin/common/confirm_delete.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load bootstrap4 %}
-{% load font_awesome %}
+{% load icons %}
 {% load i18n %}
 
 {% block title %}{%trans "Delete" %}{% endblock %}
diff --git a/admin/templates/admin/common/form.html b/admin/templates/admin/common/form.html
index b65ef30..542eb45 100644
--- a/admin/templates/admin/common/form.html
+++ b/admin/templates/admin/common/form.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load bootstrap4 %}
-{% load font_awesome %}
+{% load icons %}
 {% load i18n %}
 
 {% block title %}{% trans "User" %}{% endblock %}
diff --git a/admin/templates/admin/common/list.html b/admin/templates/admin/common/list.html
index 8d76c0b..d267636 100644
--- a/admin/templates/admin/common/list.html
+++ b/admin/templates/admin/common/list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load font_awesome %}
+{% load icons %}
 {% load i18n %}
 
 {% block title %}{{ title }}{% endblock %}
diff --git a/admin/templates/admin/group_list.html b/admin/templates/admin/group_list.html
index f58614d..82b8890 100644
--- a/admin/templates/admin/group_list.html
+++ b/admin/templates/admin/group_list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load static %}
-{% load font_awesome %}
+{% load icons %}
 {% block title %}{% trans "Users" %}{% endblock %}
 {% block content %}
 <div class="row">
diff --git a/admin/templates/admin/user_form.html b/admin/templates/admin/user_form.html
index b6d7919..db77710 100644
--- a/admin/templates/admin/user_form.html
+++ b/admin/templates/admin/user_form.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load bootstrap4 %}
-{% load font_awesome %}
+{% load icons %}
 {% load i18n %}
 
 {% block title %}{% trans "User" %}{% endblock %}
diff --git a/admin/templates/admin/user_list.html b/admin/templates/admin/user_list.html
index 03863ef..1e544f1 100644
--- a/admin/templates/admin/user_list.html
+++ b/admin/templates/admin/user_list.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load common_tags %}
-{% load font_awesome %}
+{% load icons %}
 {% block title %}{% trans "Users" %}{% endblock %}
 {% block content %}
 <div class="row">
diff --git a/computes/templates/computes/form.html b/computes/templates/computes/form.html
index 35c5da7..189318a 100644
--- a/computes/templates/computes/form.html
+++ b/computes/templates/computes/form.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load bootstrap4 %}
-{% load font_awesome %}
+{% load icons %}
 {% load i18n %}
 
 {% block title %}{% trans "Add Compute" %}{% endblock %}
diff --git a/computes/templates/create_comp_block.html b/computes/templates/create_comp_block.html
index b552d67..37f5d5a 100644
--- a/computes/templates/create_comp_block.html
+++ b/computes/templates/create_comp_block.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load bootstrap4 %}
-{% load font_awesome %}
+{% load icons %}
 <div class="btn-group float-right" role="group" aria-label="Add host button group">
     <a href="{% url 'add_tcp_host' %}" class="btn btn-success">{% trans "TCP" %}</a>
     <a href="{% url 'add_ssh_host' %}" class="btn btn-success">{% trans "SSH" %}</a>
diff --git a/conf/requirements-dev.txt b/conf/requirements-dev.txt
index 2782304..de27d31 100644
--- a/conf/requirements-dev.txt
+++ b/conf/requirements-dev.txt
@@ -3,7 +3,7 @@ coverage==5.1
 Django==2.2.13
 django-bootstrap4==2.0.1
 django-debug-toolbar==2.2
-django-fa==1.0.0
+django-icons==2.0.0
 django-login-required-middleware==0.5.0
 gunicorn==20.0.4
 libsass==0.20.0
diff --git a/conf/requirements.txt b/conf/requirements.txt
index 6978d57..f55bd1f 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -1,7 +1,7 @@
 beautifulsoup4==4.9.1
 Django==2.2.13
 django-bootstrap4==2.0.1
-django-fa==1.0.0
+django-icons==2.0.0
 django-login-required-middleware==0.5.0
 gunicorn==20.0.4
 libsass==0.20.0
diff --git a/templates/navbar.html b/templates/navbar.html
index a170ae9..6b9d11c 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load font_awesome %}
+{% load icons %}
 {% load common_tags %}
 <!-- Fixed navbar -->
 <nav class="navbar navbar-expand-md navbar-dark bg-primary mb-3" aria-label="Main top navbar">
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index 93a6f6f..44eabc8 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -22,7 +22,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'bootstrap4',
-    'fa',
+    'django_icons',
     'accounts',
     'admin',
     'appsettings',