diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 569d50b07..fe57dab83 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -5,6 +5,8 @@
 @import "font-awesome-sprockets";
 @import "font-awesome/variables";
 @import "font-awesome/path";
+@import "font-awesome/mixins";
+@import "font-awesome/core";
 @import "jquery-ui/autocomplete";
 @import "jquery-ui/datepicker";
 @import "jquery-ui/sortable";
diff --git a/app/assets/stylesheets/mixins/icons.scss b/app/assets/stylesheets/mixins/icons.scss
index f1e5b6a7c..4eb1b09e0 100644
--- a/app/assets/stylesheets/mixins/icons.scss
+++ b/app/assets/stylesheets/mixins/icons.scss
@@ -1,5 +1,5 @@
 %font-icon {
-  display: inline-block;
+  @extend %fa-icon;
   font-family: "Font Awesome 5 Free";
   vertical-align: middle;
 }
@@ -7,7 +7,7 @@
 %svg-icon {
   @supports (mask-image: url()) {
     background: currentcolor;
-    content: "";
+    content: "" !important;
     height: 1em;
     mask-repeat: no-repeat;
     mask-size: 100% 100%;