diff --git a/Pipfile b/Pipfile
index 8c8fdd7f..7f12c84e 100644
--- a/Pipfile
+++ b/Pipfile
@@ -77,7 +77,6 @@ zipp = "~=3.4.0"
 "zope.schema" = "~=6.0.1"
 sentry-sdk = "*"
 diff-match-patch = "*"
-fontawesome-free = "*"
 
 [dev-packages]
 selenium = "~=3.141.0"
@@ -97,6 +96,6 @@ python_version = "3.9"
 extras = [ "psutil",]
 version = "*"
 
-[dev-packages.pypom]
+[dev-packages.PyPOM]
 extras = [ "splinter",]
 version = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 89e5ef76..773e6152 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "d1245bb2d6b190a05b316c77a27c9b45f7fadbea14217ad308748f90643aa96e"
+            "sha256": "4f5b2f535c10a1b2bcbb4f73aa01ccef700c679685311e740e47686b3942673c"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -266,13 +266,6 @@
             "index": "pypi",
             "version": "==0.2.0"
         },
-        "fontawesome-free": {
-            "hashes": [
-                "sha256:e910e6a9fb98987a66982f80de6673c06255498f6473038c3b139f7962bb6317"
-            ],
-            "index": "pypi",
-            "version": "==5.15.2"
-        },
         "gunicorn": {
             "hashes": [
                 "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index 1c7677bc..af823a99 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -72,7 +72,6 @@ INSTALLED_APPS = (
     'reversion',
     'captcha',
     'widget_tweaks',
-    'fontawesome-free',
 )
 
 MIDDLEWARE = (
diff --git a/gulpfile.js b/gulpfile.js
index 164b9705..404aaed5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,13 +17,19 @@ const gulpif = require('gulp-if');
 
 sass.compiler = require('node-sass');
 
+function fonts(done) {
+    return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*')
+        .pipe(gulp.dest('pipeline/built_assets/fonts'))
+        .pipe(browsersync.stream());
+}
+
 function styles(done) {
     const bs_select = ["bootstrap-select.css", "ajax-bootstrap-select.css"]
     return gulp.src(['pipeline/source_assets/scss/**/*.scss',
                     'node_modules/fullcalendar/main.css',
                     'node_modules/bootstrap-select/dist/css/bootstrap-select.css',
                     'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.css',
-                    'node_modules/flatpickr/dist/flatpickr.css'])
+                    'node_modules/flatpickr/dist/flatpickr.css',])
     .pipe(sourcemaps.init())
     .pipe(sass().on('error', sass.logError))
     .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.css')))
@@ -89,5 +95,5 @@ function watchFiles() {
   gulp.watch("**/templates/*.html", browserSyncReload);
 }
 
-exports.build = gulp.parallel(styles, scripts);
+exports.build = gulp.parallel(styles, scripts, fonts);
 exports.watch = gulp.parallel(watchFiles, browserSync);
diff --git a/package-lock.json b/package-lock.json
index c240da85..35a30b68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "license": "Custom",
       "dependencies": {
         "@forevolve/bootstrap-dark": "^1.0.0-alpha.1075",
+        "@fortawesome/fontawesome-free": "^5.15.2",
         "ajax-bootstrap-select": "^1.4.5",
         "autocompleter": "^6.0.3",
         "autoprefixer": "^9.8.0",
@@ -48,6 +49,15 @@
         "popper.js": "^1.16.1"
       }
     },
+    "node_modules/@fortawesome/fontawesome-free": {
+      "version": "5.15.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz",
+      "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@gulp-sourcemaps/identity-map": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
@@ -9387,6 +9397,11 @@
         "popper.js": "^1.16.1"
       }
     },
+    "@fortawesome/fontawesome-free": {
+      "version": "5.15.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz",
+      "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA=="
+    },
     "@gulp-sourcemaps/identity-map": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
diff --git a/package.json b/package.json
index fd1a2d16..d9bbb520 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "license": "Custom",
   "dependencies": {
     "@forevolve/bootstrap-dark": "^1.0.0-alpha.1075",
+    "@fortawesome/fontawesome-free": "^5.15.2",
     "ajax-bootstrap-select": "^1.4.5",
     "autocompleter": "^6.0.3",
     "autoprefixer": "^9.8.0",
diff --git a/pipeline/source_assets/scss/screen.scss b/pipeline/source_assets/scss/screen.scss
index f68453bb..f31357cd 100644
--- a/pipeline/source_assets/scss/screen.scss
+++ b/pipeline/source_assets/scss/screen.scss
@@ -6,8 +6,6 @@
 @import "node_modules/bootstrap/scss/root";
 @import "node_modules/bootstrap/scss/type";
 @import "node_modules/bootstrap/scss/images";
-//@import "node_modules/bootstrap/scss/code";
-//@import "node_modules/bootstrap/scss/grid";
 @import "node_modules/bootstrap/scss/tables";
 @import "node_modules/bootstrap/scss/forms";
 @import "node_modules/bootstrap/scss/buttons";
@@ -19,23 +17,21 @@
 @import "node_modules/bootstrap/scss/nav";
 @import "node_modules/bootstrap/scss/navbar";
 @import "node_modules/bootstrap/scss/card";
-//@import "node_modules/bootstrap/scss/breadcrumb";
 @import "node_modules/bootstrap/scss/pagination";
 @import "node_modules/bootstrap/scss/badge";
-//@import "node_modules/bootstrap/scss/jumbotron";
 @import "node_modules/bootstrap/scss/alert";
-//@import "node_modules/bootstrap/scss/progress";
 @import "node_modules/bootstrap/scss/media";
 @import "node_modules/bootstrap/scss/list-group";
 @import "node_modules/bootstrap/scss/close";
-//@import "node_modules/bootstrap/scss/toasts";
 @import "node_modules/bootstrap/scss/modal";
 @import "node_modules/bootstrap/scss/tooltip";
 @import "node_modules/bootstrap/scss/popover";
-//@import "node_modules/bootstrap/scss/carousel";
 @import "node_modules/bootstrap/scss/spinners";
 @import "node_modules/bootstrap/scss/utilities";
-//@import "node_modules/bootstrap/scss/print";
+//FontAwesome
+$fa-font-path: '/static/fonts';
+@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "node_modules/@fortawesome/fontawesome-free/scss/solid";
 
 @media screen and
   (prefers-reduced-motion: reduce),
diff --git a/templates/base.html b/templates/base.html
index 7ec15a58..b2b054a8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,8 +19,6 @@
 
     <link rel="stylesheet" type="text/css" href="{% static 'css/dark_screen.css' %}" {% if not request.user.dark_theme %}media="(prefers-color-scheme: dark)"{% endif %}>
     <link rel="stylesheet" type="text/css" href="{% static 'css/screen.css' %}">
-    <link href="{% static 'fontawesome_free/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
-    <link href="{% static 'fontawesome_free/css/solid.css' %}" rel="stylesheet" type="text/css">
     {% block css %}
     {% endblock %}