Merge branch 'amid2887-master' into 2.1.2-wip

diff --cc less/buttons.less
index 223d7439b83a627834cde12ac4efc9343414246a,ada76ea22319e1b5bf94a51264f20232d783a9aa..1f9ceda9f2797bbcc00e2a0b4666b23a446cd77d
--- 1/less/buttons.less
--- 2/less/buttons.less
+++ b/less/buttons.less
@@@ -73,21 -73,24 +73,23 @@@
  
  // Large
  .btn-large {
 -  padding: 9px 14px;
 -  font-size: @baseFontSize + 2px;
 -  line-height: normal;
 -  .border-radius(5px);
 +  padding: @paddingLarge;
 +  font-size: @fontSizeLarge;
 +  .border-radius(@borderRadiusLarge);
  }
- .btn-large [class^="icon-"] {
+ .btn-large [class^="icon-"],
+ .btn-large [class*=" icon-"] {
    margin-top: 2px;
  }
  
  // Small
  .btn-small {
 -  padding: 3px 9px;
 -  font-size: @baseFontSize - 2px;
 -  line-height: @baseLineHeight - 2px;
 +  padding: @paddingSmall;
 +  font-size: @fontSizeSmall;
 +  .border-radius(@borderRadiusSmall);
  }
- .btn-small [class^="icon-"] {
+ .btn-small [class^="icon-"],
+ .btn-small [class*=" icon-"] {
    margin-top: 0;
  }