diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fa58f2ef34..dd9b96bc16 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5128,6 +5128,12 @@ a.badge:hover {
   background-color: #1a1a1a;
 }
 
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
 @-webkit-keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;
diff --git a/less/labels-badges.less b/less/labels-badges.less
index 7537b188a5..527cf6497e 100644
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -55,3 +55,12 @@ a {
   &-inverse           { background-color: @grayDark; }
   &-inverse[href]     { background-color: darken(@grayDark, 10%); }
 }
+
+// Quick fix for labels/badges in buttons
+.btn {
+  .label,
+  .badge {
+    position: relative;
+    top: -1px;
+  }
+}
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index a8f62c3ccf..3ded955bf6 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -1011,7 +1011,8 @@
     </form>
   </div><!--/span-->
   <div class="span4">
-
+    <button class="btn">Action <span class="badge">2</span></button>
+    <button class="btn">Action <span class="label">2</span></button>
   </div><!--/span-->
 </div><!--/row-->