diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss
index 6254cde709560..5b17ae0f3e3c4 100644
--- a/administrator/templates/atum/scss/blocks/_header.scss
+++ b/administrator/templates/atum/scss/blocks/_header.scss
@@ -1,5 +1,4 @@
 // Header
-
 .header {
   position: relative;
   z-index: $zindex-header;
@@ -176,6 +175,7 @@
     }
   }
 
+  .far,
   .fas,
   .fab {
     font-size: 1.5rem;
diff --git a/administrator/templates/atum/scss/blocks/_quickicons.scss b/administrator/templates/atum/scss/blocks/_quickicons.scss
index 24d4f934e3257..1865fdb53c522 100644
--- a/administrator/templates/atum/scss/blocks/_quickicons.scss
+++ b/administrator/templates/atum/scss/blocks/_quickicons.scss
@@ -15,6 +15,7 @@
     transition: all .25s ease;
 
 
+    .far,
     .fas,
     .fab {
       margin: 0 auto;
@@ -34,6 +35,7 @@
       text-decoration: none;
       background: var(--atum-link-color);
 
+      .far,
       .fas,
       .fab {
         color: transparent;
@@ -141,6 +143,7 @@
       &.quickicon-icon {
         margin: .8rem auto 0;
 
+        &.big .far,
         &.big .fas,
         &.big .fab {
           font-size: $quickicon-icon-size-big;
@@ -185,6 +188,7 @@
         color: var(--white);
         background: var(--danger);
 
+        .far::before,
         .fas::before,
         .fab::before {
           color: var(--white);
@@ -196,6 +200,7 @@
       color: var(--success);
       border: 1px solid lighten($success-txt, 20%);
 
+      .far,
       .fas,
       .fab {
         color: transparent;
@@ -207,6 +212,7 @@
         color: var(--white);
         background: var(--success);
 
+        .far::before,
         .fas::before,
         .fab::before {
           color: transparent;
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
index 6a9b4fae6c403..6e6aec3f7d1a9 100644
--- a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
@@ -68,6 +68,7 @@
       margin-bottom: 0;
     }
 
+    .inactive .far,
     .inactive .fas,
     .inactive .fab,
     .inactive [class^=icon-] {
diff --git a/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss b/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
index 760ebd67b6f06..6eeb3b5e84b97 100644
--- a/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
+++ b/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
@@ -3,10 +3,10 @@ $fa-font-path: "../../../../../../media/vendor/fontawesome-free/webfonts" !defau
 
 
 // Font Awesome 5 Free
+@import "../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
+@import "../../../../../../media/vendor/fontawesome-free/scss/brands";
 @import "../../../../../../media/vendor/fontawesome-free/scss/regular";
 @import "../../../../../../media/vendor/fontawesome-free/scss/solid";
-@import "../../../../../../media/vendor/fontawesome-free/scss/brands";
-@import "../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
 
 // B/C for Icomoon
 @import "../../../../../../build/media_source/system/scss/icomoon";
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index 1f6e5633c7613..4e1efd8bab458 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -7,8 +7,9 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
 
 // "Font Awesome 5 Free"
 @import "../../../media/vendor/fontawesome-free/scss/fontawesome";
-@import "../../../media/vendor/fontawesome-free/scss/solid";
 @import "../../../media/vendor/fontawesome-free/scss/brands";
+@import "../../../media/vendor/fontawesome-free/scss/regular";
+@import "../../../media/vendor/fontawesome-free/scss/solid";
 
 // Backend Template stuff
 @import "../../../administrator/templates/atum/scss/mixin";
diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss
index d7f50776a807b..c4f39f6236595 100644
--- a/templates/cassiopeia/scss/template.scss
+++ b/templates/cassiopeia/scss/template.scss
@@ -14,8 +14,9 @@
 
 // "Font Awesome 5 Free"
 @import "../../../media/vendor/fontawesome-free/scss/fontawesome";
-@import "../../../media/vendor/fontawesome-free/scss/solid";
 @import "../../../media/vendor/fontawesome-free/scss/brands";
+@import "../../../media/vendor/fontawesome-free/scss/regular";
+@import "../../../media/vendor/fontawesome-free/scss/solid";
 
 // B/C for Icomoon
 @import "../../../build/media_source/system/scss/icomoon";