diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f55106b2..190864d93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Updated coveralls gem to a supported version
 - Updated summernote to 0.8.18
 - Updated angular-summernote to 0.8.1
+- Updated FontAwesome from v4 to v5
 
 ## v4.5.6 2020 September 1st
 
diff --git a/app/frontend/packs/application.js b/app/frontend/packs/application.js
index ae09dc633..723db47c5 100644
--- a/app/frontend/packs/application.js
+++ b/app/frontend/packs/application.js
@@ -65,6 +65,8 @@ import 'hone/dist/hone';
 import 'tether/dist/js/tether';
 import 'angular-bind-html-compile/angular-bind-html-compile';
 import 'angular-ui-tour/app/angular-ui-tour';
+import '@fortawesome/fontawesome-free';
+import '@fortawesome/fontawesome-free/js/v4-shims';
 
 require('../src/javascript/app.js');
 require('../src/javascript/router.js');
diff --git a/app/frontend/packs/application.scss b/app/frontend/packs/application.scss
index bcb87d3ce..46df1223d 100644
--- a/app/frontend/packs/application.scss
+++ b/app/frontend/packs/application.scss
@@ -5,7 +5,8 @@
 @import '~angular-xeditable/dist/css/xeditable';
 @import '~angular-loading-bar/build/loading-bar';
 @import '~nvd3/build/nv.d3';
-@import '~font-awesome/css/font-awesome';
+@import '~@fortawesome/fontawesome-free/css/all';
+@import '~@fortawesome/fontawesome-free/css/v4-shims';
 @import '~medium-editor/dist/css/medium-editor';
 @import '~medium-editor/dist/css/themes/default';
 @import '~bootstrap-switch/dist/css/bootstrap3/bootstrap-switch';
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 8fa831aea..765cd21dc 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -4,7 +4,6 @@ const jsErb = require('./loaders/js_erb');
 const sass = require('./loaders/sass');
 const sassErb = require('./loaders/sass_erb');
 const html = require('./loaders/html');
-const fonts = require('./loaders/fonts');
 const webpack = require('webpack');
 const path = require('path');
 
@@ -24,7 +23,6 @@ environment.loaders.prepend('html-erb', htmlErb);
 environment.loaders.prepend('sass-erb', sassErb);
 environment.loaders.append('html', html);
 environment.loaders.append('sass', sass);
-environment.loaders.append('fonts', fonts);
 
 environment.splitChunks();
 
diff --git a/config/webpack/loaders/fonts.js b/config/webpack/loaders/fonts.js
deleted file mode 100644
index 2033ebb89..000000000
--- a/config/webpack/loaders/fonts.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  test: /\.(woff|woff2|eot|ttf|otf)$/i,
-  loader: 'file-loader'
-};
diff --git a/package.json b/package.json
index b566107b6..5d1f38ffb 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-promise": "~4.2.1",
     "eslint-plugin-standard": "~4.0.1",
-    "file-loader": "^6.1.0",
     "html-loader": "^1.3.0",
     "rails-erb-loader": "^5.5.2",
     "resolve-url-loader": "^3.1.1",
@@ -32,6 +31,7 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free": "5.14.0",
     "@rails/webpacker": "5.2.1",
     "@uirouter/angularjs": "0.4",
     "AngularDevise": "https://github.com/cloudspace/angular_devise.git#1.0.2",
@@ -69,7 +69,6 @@
     "codemirror": "^4.8.0",
     "d3": "3.5",
     "elasticsearch-browser": "3.1",
-    "font-awesome": "4.3.0",
     "fullcalendar": "2.3.1",
     "holderjs": "2.6",
     "jasny-bootstrap": "3.1",
diff --git a/yarn.lock b/yarn.lock
index b1cfc7c35..1b306b788 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -859,6 +859,11 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
+"@fortawesome/fontawesome-free@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f"
+  integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA==
+
 "@npmcli/move-file@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
@@ -3632,7 +3637,7 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-loader@^6.0.0, file-loader@^6.1.0:
+file-loader@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.0.tgz#65b9fcfb0ea7f65a234a1f10cdd7f1ab9a33f253"
   integrity sha512-26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg==
@@ -3770,11 +3775,6 @@ follow-redirects@^1.0.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
   integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
-font-awesome@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.3.0.tgz#44eeb790cdf986642786f33fce784764f1841c40"
-  integrity sha1-RO63kM35hmQnhvM/znhHZPGEHEA=
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"