diff --git a/administrator/templates/atum/scss/blocks/_form.scss b/administrator/templates/atum/scss/blocks/_form.scss
index 561814910fb93..f989bb8183c71 100644
--- a/administrator/templates/atum/scss/blocks/_form.scss
+++ b/administrator/templates/atum/scss/blocks/_form.scss
@@ -148,7 +148,9 @@ legend {
 }
 
 [class^="icon-"]:not(.input-group-text),
-[class*=" icon-"]:not(.input-group-text) {
+[class*=" icon-"]:not(.input-group-text),
+[class^='#{$fa-css-prefix}-']:not(.input-group-text),
+[class*=' #{$fa-css-prefix}-']:not(.input-group-text) {
   margin-right: 0.5em;
 }
 
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss
index f9ae68d7bc7b2..14b0be38d1be4 100644
--- a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss
@@ -5,13 +5,6 @@
   box-shadow: $dropdown-box-shadow;
   min-width: 100%;
 
-  [class^='icon-'],
-  [class*=' icon-'],
-  [class^='fa '],
-  [class*='fa'] {
-    width: 26px;
-  }
-
   joomla-toolbar-button {
     border: none;
   }
diff --git a/build/media_source/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss
index 99d617df9a9ed..65bc691c575e0 100644
--- a/build/media_source/system/scss/_icomoon.scss
+++ b/build/media_source/system/scss/_icomoon.scss
@@ -1,18 +1,22 @@
 // IcoMoon Conversion
 
 [class^="icon-"]:not(.input-group-text),
-[class*=" icon-"]:not(.input-group-text) {
+[class*=" icon-"]:not(.input-group-text),
+[class^='#{$fa-css-prefix}-']:not(.input-group-text),
+[class*=' #{$fa-css-prefix}-']:not(.input-group-text) {
     display: inline-block;
     width: 14px;
     height: 14px;
     line-height: 14px;
 }
+
 [class^="icon-"]::before,
 [class*=" icon-"]::before {
     font-family: "Font Awesome 5 Free";
     font-style: normal;
     speak: none;
 }
+
 [class^="icon-"].disabled,
 [class*=" icon-"].disabled {
     font-weight: normal;