diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss
index f3dae6a48..034a19162 100644
--- a/app/assets/stylesheets/_consul_settings.scss
+++ b/app/assets/stylesheets/_consul_settings.scss
@@ -74,6 +74,7 @@ $outline-focus:     3px solid #ffbf47 !default;
 
 $input-height:      $line-height * 2 !default;
 
+$font-icon-margin: rem-calc(4) !default;
 $icon-width: $line-height * 2 !default;
 
 $off-screen-left: -1000rem !default;
diff --git a/app/assets/stylesheets/admin/budgets/drafting.scss b/app/assets/stylesheets/admin/budgets/drafting.scss
index aa7cde254..28819e763 100644
--- a/app/assets/stylesheets/admin/budgets/drafting.scss
+++ b/app/assets/stylesheets/admin/budgets/drafting.scss
@@ -23,6 +23,10 @@
   .preview-link {
     @include has-fa-icon(eye, regular);
     @include hollow-button;
+
+    &::before {
+      margin-right: $font-icon-margin;
+    }
   }
 
   .publish-link {
diff --git a/app/assets/stylesheets/admin/budgets/help.scss b/app/assets/stylesheets/admin/budgets/help.scss
index e3bf1d6c0..0a055801f 100644
--- a/app/assets/stylesheets/admin/budgets/help.scss
+++ b/app/assets/stylesheets/admin/budgets/help.scss
@@ -36,7 +36,6 @@
   &::after {
     bottom: $padding / 2;
     color: $white;
-    margin-right: 0;
     position: absolute;
     right: calc(#{$padding} + #{$quote-padding});
   }
diff --git a/app/assets/stylesheets/admin/table_actions.scss b/app/assets/stylesheets/admin/table_actions.scss
index ff9bf0683..4129b20f4 100644
--- a/app/assets/stylesheets/admin/table_actions.scss
+++ b/app/assets/stylesheets/admin/table_actions.scss
@@ -22,7 +22,6 @@
 
     &::before {
       font-size: 1.6em;
-      margin-right: 0 !important;
     }
   }
 
diff --git a/app/assets/stylesheets/budgets/ballot/investment.scss b/app/assets/stylesheets/budgets/ballot/investment.scss
index a09be82ab..19c490bdf 100644
--- a/app/assets/stylesheets/budgets/ballot/investment.scss
+++ b/app/assets/stylesheets/budgets/ballot/investment.scss
@@ -33,10 +33,6 @@
     position: absolute;
     right: $close-icon-margin;
     top: $close-icon-margin;
-
-    &::before {
-      margin-right: 0;
-    }
   }
 
   &:hover {
diff --git a/app/assets/stylesheets/budgets/investments-list.scss b/app/assets/stylesheets/budgets/investments-list.scss
index 8846ff592..5d19f4a45 100644
--- a/app/assets/stylesheets/budgets/investments-list.scss
+++ b/app/assets/stylesheets/budgets/investments-list.scss
@@ -71,7 +71,6 @@
     &::after {
       font-size: 2em;
       margin-left: auto;
-      margin-right: 0;
       transform: translateY(-25%);
     }
   }
diff --git a/app/assets/stylesheets/budgets/investments/ballot.scss b/app/assets/stylesheets/budgets/investments/ballot.scss
index e2d141cda..c98c861ec 100644
--- a/app/assets/stylesheets/budgets/investments/ballot.scss
+++ b/app/assets/stylesheets/budgets/investments/ballot.scss
@@ -6,5 +6,9 @@
     color: $brand-secondary;
     font-weight: bold;
     margin-top: $line-height;
+
+    &::before {
+      margin-right: $font-icon-margin;
+    }
   }
 }
diff --git a/app/assets/stylesheets/budgets/phases.scss b/app/assets/stylesheets/budgets/phases.scss
index 4f06a78ae..2cf816322 100644
--- a/app/assets/stylesheets/budgets/phases.scss
+++ b/app/assets/stylesheets/budgets/phases.scss
@@ -204,7 +204,6 @@
       &::after {
         font-weight: bold;
         margin-left: 0.5em;
-        margin-right: 0;
       }
     }
   }
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 313d06903..9c9398e60 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1470,6 +1470,7 @@ table {
 
   &::before {
     font-size: rem-calc(24);
+    margin-right: $font-icon-margin;
   }
 }
 
@@ -1863,6 +1864,7 @@ table {
 
     .show-children::before,
     .collapse-children::before {
+      margin-right: $font-icon-margin;
       transform: translateY(-1px);
     }
 
@@ -1891,6 +1893,7 @@ table {
     }
 
     &::before {
+      margin-right: $font-icon-margin;
       transform: translateY(-1px);
     }
   }
@@ -2456,6 +2459,10 @@ table {
       @include has-fa-icon(times, solid);
       color: $color-alert;
     }
+
+    &::before {
+      margin-right: $font-icon-margin;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/mixins/icons.scss b/app/assets/stylesheets/mixins/icons.scss
index e7cf32e2c..c524f70ae 100644
--- a/app/assets/stylesheets/mixins/icons.scss
+++ b/app/assets/stylesheets/mixins/icons.scss
@@ -1,7 +1,6 @@
 %font-icon {
   @extend %fa-icon;
   font-family: "Font Awesome 5 Free";
-  margin-right: rem-calc(4);
   vertical-align: middle;
 }
 
diff --git a/app/assets/stylesheets/notification_item.scss b/app/assets/stylesheets/notification_item.scss
index a6d2ee1e5..d4bbc5aab 100644
--- a/app/assets/stylesheets/notification_item.scss
+++ b/app/assets/stylesheets/notification_item.scss
@@ -7,8 +7,8 @@
     @include has-fa-icon(circle, solid, after);
 
     &::before {
-      @include breakpoint(medium) {
-        margin-right: 0;
+      @include breakpoint(small only) {
+        margin-right: $font-icon-margin;
       }
     }
 
@@ -18,7 +18,6 @@
 
       color: #ecf00b;
       font-size: $circle-icon-size;
-      margin-right: 0;
       position: absolute;
       left: $notification-icon-size - rem-calc(5);
       top: $menu-link-top-padding - $circle-icon-size / 2;
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 167ca4003..9cbebc07b 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -1215,7 +1215,6 @@
 
       &::after {
         margin-left: $line-height / 4;
-        margin-right: 0;
       }
     }
   }