diff --git a/server/documents/collections/table.html.eco b/server/documents/collections/table.html.eco
index 10ac90ce2..ba6f31b3b 100755
--- a/server/documents/collections/table.html.eco
+++ b/server/documents/collections/table.html.eco
@@ -59,15 +59,6 @@ themes      : ['Default', 'Classic']
           <td>Yes</td>
         </tr>
       </tbody>
-      <tfoot>
-        <tr>
-          <th colspan="4">
-            <div class="ui primary labeled icon button">
-              <i class="user icon"></i> Add User
-            </div>
-          </th>
-        </tr>
-      </tfoot>
     </table>
   </div>
   <div class="another example">
diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less
index 89c3f6530..a973c1c53 100755
--- a/src/definitions/elements/button.less
+++ b/src/definitions/elements/button.less
@@ -52,7 +52,6 @@
   box-shadow: @boxShadow;
 
   user-select: none;
-  box-sizing: border-box;
   transition: @transition;
 
   -webkit-tap-highlight-color: @tapColor;
@@ -704,26 +703,10 @@
   padding-right: @horizontalPadding !important;
 }
 
-/* Right Labeled */
-.ui[class*="right labeled"].icon.button {
-  padding-right: @labeledIconPadding !important;
-  padding-left: @horizontalPadding !important;
-}
-.ui[class*="right labeled"].icon.button > .icon {
-  left: auto;
-  right: 0em;
-  border-radius: 0em @borderRadius @borderRadius 0em;
-  box-shadow: @labeledIconRightShadow;
-}
-
-
+/* Left Labeled */
 .ui.labeled.icon.buttons > .button > .icon,
 .ui.labeled.icon.button > .icon {
   position: absolute;
-  top: 0em;
-  left: 0em;
-  box-sizing: border-box;
-
   width: @labeledIconWidth;
   height: 100%;
 
@@ -735,6 +718,27 @@
   line-height: 1;
   box-shadow: @labeledIconLeftShadow;
 }
+
+/* Left Labeled */
+.ui.labeled.icon.buttons > .button > .icon,
+.ui.labeled.icon.button > .icon {
+  top: 0em;
+  left: 0em;
+}
+
+/* Right Labeled */
+.ui[class*="right labeled"].icon.button {
+  padding-right: @labeledIconPadding !important;
+  padding-left: @horizontalPadding !important;
+}
+.ui[class*="right labeled"].icon.button > .icon {
+  left: auto;
+  right: 0em;
+  border-radius: 0em @borderRadius @borderRadius 0em;
+  box-shadow: @labeledIconRightShadow;
+}
+
+
 .ui.labeled.icon.buttons > .button > .icon:before,
 .ui.labeled.icon.button > .icon:before,
 .ui.labeled.icon.buttons > .button > .icon:after,
@@ -872,7 +876,6 @@
 
   border-radius: 500em;
   box-shadow: @orBoxShadow;
-  box-sizing: border-box;
 }
 
 /* Fluid Or */
@@ -1069,7 +1072,6 @@
 .ui.fluid.vertical.buttons > .button {
   display: block;
   width: auto;
-  box-sizing: border-box;
 }
 
 .ui.\32.vertical.buttons > .button,