diff --git a/UI/Content/Overrides/bootstrap.less b/UI/Content/Overrides/bootstrap.less
index b33d1110a..d7dac284c 100644
--- a/UI/Content/Overrides/bootstrap.less
+++ b/UI/Content/Overrides/bootstrap.less
@@ -16,6 +16,14 @@
 
 .btn {
   min-width : 80px;
+
+  &.btn-mini{
+    min-width: 0px;
+  }
+
+  &.btn-icon-only{
+    min-width: 15px;
+  }
 }
 
 .slide-button {
diff --git a/UI/Shared/Toolbar/Button/ButtonView.js b/UI/Shared/Toolbar/Button/ButtonView.js
index 4f86e034d..be8639a45 100644
--- a/UI/Shared/Toolbar/Button/ButtonView.js
+++ b/UI/Shared/Toolbar/Button/ButtonView.js
@@ -30,6 +30,10 @@ define(
                     this.$el.addClass('active');
                     this.invokeCallback();
                 }
+
+                if(!this.model.get('title')){
+                    this.$el.addClass('btn-icon-only');
+                }
             },
 
             onClick: function () {
diff --git a/UI/Shared/Toolbar/Radio/RadioButtonView.js b/UI/Shared/Toolbar/Radio/RadioButtonView.js
index f6e0533c3..42b39d369 100644
--- a/UI/Shared/Toolbar/Radio/RadioButtonView.js
+++ b/UI/Shared/Toolbar/Radio/RadioButtonView.js
@@ -24,6 +24,10 @@ define(
                     this.$el.addClass('active');
                     this.invokeCallback();
                 }
+
+                if(!this.model.get('title')){
+                    this.$el.addClass('btn-icon-only');
+                }
             },
 
             onClick: function () {