diff --git a/static/buttons.less b/static/buttons.less
index cf616903a..42e04e414 100644
--- a/static/buttons.less
+++ b/static/buttons.less
@@ -31,12 +31,18 @@
   font-size: @font-size - 2px;
   height: auto;
   line-height: 1.3em;
+  &.icon:before {
+    font-size: @font-size - 2px;
+  }
 }
 .btn.btn-sm,
 .btn-group-sm > .btn {
   padding: @component-padding/4 @component-padding/2;
   height: auto;
   line-height: 1.3em;
+  &.icon:before {
+    font-size: @font-size + 1px;
+  }
 }
 .btn.btn-lg,
 .btn-group-lg > .btn {
@@ -44,6 +50,9 @@
   padding: @component-padding - 2px  @component-padding + 2px;
   height: auto;
   line-height: 1.3em;
+  &.icon:before {
+    font-size: @font-size + 6px;
+  }
 }
 
 .btn-group > .btn {
@@ -63,6 +72,18 @@
   border-bottom-right-radius: @component-border-radius;
 }
 
+// Icon buttons
+.btn.icon {
+  &:before {
+    width: initial;
+    height: initial;
+    margin-right: .3125em;
+  }
+  &:empty:before {
+    margin-right: 0;
+  }
+}
+
 .btn-toolbar {
   > .btn-group + .btn-group, > .btn-group + .btn, > .btn + .btn {
     float: none;