diff --git a/site/plugins/admin/assets/scss/components/sidebar.scss b/site/plugins/admin/assets/scss/components/sidebar.scss
index 97dc5926..cbcf68c4 100644
--- a/site/plugins/admin/assets/scss/components/sidebar.scss
+++ b/site/plugins/admin/assets/scss/components/sidebar.scss
@@ -75,7 +75,7 @@
         margin-right: 1px;
     }
 
-    .flextype-user > .nav .nav-item .nav-link i {
+    .flextype-user > .nav .nav-item .nav-link svg {
         position: relative;
         top: 2px;
     }
@@ -85,10 +85,11 @@
         opacity: 1;
     }
 
-    .nav .nav-item .nav-link i {
+    .nav .nav-item .nav-link svg {
         font-size: 18px;
         margin-right: 15px;
-        width: 15px;
+        width: 22px;
+        height: 18px;
         text-align: center;
         vertical-align: middle;
         float: left;
diff --git a/site/plugins/admin/assets/scss/components/users.scss b/site/plugins/admin/assets/scss/components/users.scss
index 3bb9a9af..a6959420 100644
--- a/site/plugins/admin/assets/scss/components/users.scss
+++ b/site/plugins/admin/assets/scss/components/users.scss
@@ -1,8 +1,7 @@
 .profile {
     text-align: center;
 
-    .fas {
-        display: block;
+    svg {
         font-size: 148px;
         margin-bottom: 30px;
     }
diff --git a/site/plugins/admin/assets/scss/objects/form-control.scss b/site/plugins/admin/assets/scss/objects/form-control.scss
index 588b6eb6..326d46c3 100644
--- a/site/plugins/admin/assets/scss/objects/form-control.scss
+++ b/site/plugins/admin/assets/scss/objects/form-control.scss
@@ -508,17 +508,19 @@ textarea.form-control.code-editor {
     padding: .25rem 1.1rem;
     font-size: 14px;
 
-    > i {
-        width: 24px;
+    > svg {
         font-size: 14px;
+        margin-right: 8px;
+        width: 24px!important;
     }
 }
 
 .nav-pills {
     .nav-link {
-        > i {
-            width: 24px;
+        > svg {
             font-size: 14px;
+            margin-right: 8px;
+            width: 24px!important;
         }
 
     }
diff --git a/site/plugins/admin/gulpfile.js b/site/plugins/admin/gulpfile.js
index c1b75b49..e3f83e2a 100755
--- a/site/plugins/admin/gulpfile.js
+++ b/site/plugins/admin/gulpfile.js
@@ -83,7 +83,8 @@ gulp.task('js', function(){
                    'node_modules/messenger-hubspot/build/js/messenger.min.js',
                    'node_modules/messenger-hubspot/build/js/messenger-theme-flat.js',
                    'node_modules/clipboard/dist/clipboard.min.js',
-                   'node_modules/bs-custom-file-input/dist/bs-custom-file-input.min.js'
+                   'node_modules/bs-custom-file-input/dist/bs-custom-file-input.min.js',
+                   'node_modules/@fortawesome/fontawesome-free/js/all.min.js'
                 ])
     .pipe(sourcemaps.init())
     .pipe(concat('admin-build.min.js'))
diff --git a/site/plugins/admin/package.json b/site/plugins/admin/package.json
index adbb8b01..3e1e4495 100755
--- a/site/plugins/admin/package.json
+++ b/site/plugins/admin/package.json
@@ -7,6 +7,7 @@
         "bs-custom-file-input": "~1.3.2",
         "clipboard": "~2.0.4",
         "codemirror": "~5.49.2",
+        "@fortawesome/fontawesome-free": "5.11.2",
         "del": "~3.0.0",
         "es6-promise": "~4.2.5",
         "gulp": "~3.9.1",
diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index 14c2aca2..62eb3a0f 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -13,7 +13,6 @@
     	<title>FLEXTYPE</title>
 
         <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
-        <script src="https://kit.fontawesome.com/588226d8c5.js" crossorigin="anonymous"></script>
 
         {% set admin_build = base_url() ~ '/site/plugins/admin/assets/dist/css/admin-build.min.css' %}
         {% set admin_elegant = base_url() ~ '/site/plugins/admin/assets/dist/css/elegant.css' %}
diff --git a/site/plugins/admin/views/templates/users/profile.html b/site/plugins/admin/views/templates/users/profile.html
index dca93ecd..623972ae 100644
--- a/site/plugins/admin/views/templates/users/profile.html
+++ b/site/plugins/admin/views/templates/users/profile.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="profile">
-    <i class="fas fa-user-circle"></i>
+    <i class="fas fa-user-circle"></i><br>
     {{ tr('admin_username') }}: {{ username }} <br>
     {{ tr('admin_role') }}: {{ rolename }}<br>
     <br>