diff --git a/server/templates/user/Gruntfile.js b/server/templates/user/Gruntfile.js
index 1f66275f..49cd2447 100644
--- a/server/templates/user/Gruntfile.js
+++ b/server/templates/user/Gruntfile.js
@@ -51,7 +51,7 @@ module.exports = function(grunt) {
             dest: '<%= config.dev %>/_static_/js/lib' 
           },  
           // Fontawewsome
-          { expand: true, flatten: true, src: 'node_modules/font-awesome/fonts/*', dest:'<%= config.dev %>/_static_/fonts' },
+          { expand: true, flatten: true, src: 'node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/*', dest:'<%= config.dev %>/_static_/webfonts' },
           // Index & Templates, no changes for development environment
           { expand: true, flatten: true, src: config.src.html, dest:'<%= config.dev %>' },
           { expand: true, flatten: true, src: config.src.templates, dest:'<%= config.dev %>/_static_/templates' },
@@ -98,7 +98,7 @@ module.exports = function(grunt) {
             dest:'<%= config.dist %>/templates/uds/<%= config.uds_template %>',
           },
           // Fontawewsome
-          { expand: true, flatten: true, src: 'node_modules/font-awesome/fonts/*', dest:'<%= config.dist %>/static/fonts' },
+          { expand: true, flatten: true, src: 'node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/*', dest:'<%= config.dist %>/static/webfonts' },
           // Templates (angular, for now goes to static, but maybe it needs to go to other "django templates" folder)
           { expand: true, flatten: true, src: config.src.templates, dest:'<%= config.dist %>/static/templates' },
           /// Images
diff --git a/server/templates/user/package.json b/server/templates/user/package.json
index 240540b5..4f74f50d 100644
--- a/server/templates/user/package.json
+++ b/server/templates/user/package.json
@@ -17,11 +17,11 @@
     "typescript": "^2.7.2"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free-webfonts": "^1.0.4",
     "angular": "^1.6.9",
     "angular-cookies": "^1.6.9",
     "angular-route": "^1.6.9",
     "bootstrap": "^4.0.0",
-    "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
     "popper.js": "^1.12.9"
   },
diff --git a/server/templates/user/src/css/_typography.scss b/server/templates/user/src/css/_typography.scss
index f19f4c37..d011a505 100644
--- a/server/templates/user/src/css/_typography.scss
+++ b/server/templates/user/src/css/_typography.scss
@@ -1,6 +1,9 @@
 /* TYPOGRAPHY */
-/* Google Fonts */
 //@import url("https://fonts.googleapis.com/css?family=Lato:400,300,300italic,400italic,700,700italic,900,900italic");
 //@import url("https://fonts.googleapis.com/css?family=Raleway:400,300,500,600,700,800,900");
 
-@import "font-awesome/scss/font-awesome";
+// @import "@fortawesome/fontawesome-free-webfonts/scss/fa-regular";
+@import "@fortawesome/fontawesome-free-webfonts/scss/fa-solid";
+
+@import "@fortawesome/fontawesome-free-webfonts/scss/fontawesome";
+
diff --git a/server/templates/user/src/login.html b/server/templates/user/src/login.html
index 492b8ce8..00d646d7 100644
--- a/server/templates/user/src/login.html
+++ b/server/templates/user/src/login.html
@@ -151,7 +151,7 @@
                     </div>
                   </div>
                   
-                  <button id="do_login" class="btn btn-lg btn-primary btn-block" data-ng-click="login.doLogin()"><span class="fa fa-sign-in"></span><trans>Sign in</trans></button>
+                  <button id="do_login" class="btn btn-lg btn-primary btn-block" data-ng-click="login.doLogin()"><i class="fas fa-sign-in-alt"></i> <trans>Sign in</trans></button>
 
                 <div id="nonStandard" style="display: none">
                   <div id="nonStandardLogin" class="form">
diff --git a/server/templates/user/yarn.lock b/server/templates/user/yarn.lock
index f37e6780..afcb0fec 100644
--- a/server/templates/user/yarn.lock
+++ b/server/templates/user/yarn.lock
@@ -2,6 +2,10 @@
 # yarn lockfile v1
 
 
+"@fortawesome/fontawesome-free-webfonts@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f"
+
 "@types/angular-cookies@^1.4.5":
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/@types/angular-cookies/-/angular-cookies-1.4.5.tgz#f5ccf5f42a7b9f4d13e77afb8722034ea9f40bd3"
@@ -512,10 +516,6 @@ findup-sync@~0.1.2:
     glob "~3.2.9"
     lodash "~2.4.1"
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-
 for-in@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"