diff --git a/framework/core/js/lib/helpers/icon.js b/framework/core/js/lib/helpers/icon.js
index 28c558b5d..56a75ef81 100644
--- a/framework/core/js/lib/helpers/icon.js
+++ b/framework/core/js/lib/helpers/icon.js
@@ -6,7 +6,7 @@
  * @return {Object}
  */
 export default function icon(name, attrs = {}) {
-  attrs.className = 'icon fa fa-fw fa-' + name + ' ' + (attrs.className || '');
+  attrs.className = 'icon fa fa-' + name + ' ' + (attrs.className || '');
 
   return <i {...attrs}/>;
 }
diff --git a/framework/core/less/forum/Composer.less b/framework/core/less/forum/Composer.less
index e7d94d25f..4bb7668ce 100644
--- a/framework/core/less/forum/Composer.less
+++ b/framework/core/less/forum/Composer.less
@@ -61,6 +61,7 @@
     }
     .icon {
       font-size: 14px;
+      margin-right: 3px;
     }
   }
 }
diff --git a/framework/core/less/forum/NotificationGrid.less b/framework/core/less/forum/NotificationGrid.less
index a25e0a6b4..59a484450 100644
--- a/framework/core/less/forum/NotificationGrid.less
+++ b/framework/core/less/forum/NotificationGrid.less
@@ -31,6 +31,7 @@
   .icon {
     font-size: 14px;
     margin-right: 2px;
+    .fa-fw();
   }
 }
 .NotificationGrid-checkbox {
diff --git a/framework/core/less/lib/Button.less b/framework/core/less/lib/Button.less
index 03d662bd3..aeb1d8d0b 100755
--- a/framework/core/less/lib/Button.less
+++ b/framework/core/less/lib/Button.less
@@ -224,14 +224,14 @@
   }
 }
 .Button-icon {
-  margin-right: 3px;
+  margin-right: 7px;
 }
 .Button-icon,
 .Button-caret {
   font-size: 14px;
 }
 .Button-caret {
-  margin-left: 3px;
+  margin-left: 7px;
 }
 .Button-badge {
   font-size: 12px;
diff --git a/framework/core/less/lib/Dropdown.less b/framework/core/less/lib/Dropdown.less
index f0c622b19..63d35a159 100755
--- a/framework/core/less/lib/Dropdown.less
+++ b/framework/core/less/lib/Dropdown.less
@@ -49,6 +49,7 @@
         float: left;
         margin-left: -25px;
         margin-top: 2px;
+        .fa-fw();
       }
 
       &.disabled {
diff --git a/framework/core/less/lib/Select.less b/framework/core/less/lib/Select.less
index 38c833a07..73185966a 100755
--- a/framework/core/less/lib/Select.less
+++ b/framework/core/less/lib/Select.less
@@ -16,4 +16,5 @@
   margin-left: -30px;
   pointer-events: none;
   color: @control-color;
+  .fa-fw();
 }