diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j
index 130e4f395..6bbb426c0 100644
--- a/Tools/nib2cib/NSButton.j
+++ b/Tools/nib2cib/NSButton.j
@@ -93,10 +93,11 @@ _CPButtonBezelStyleHeights[CPHUDBezelStyle] = 20;
                     _bezelStyle = CPHUDBezelStyle;
             }
 
-            if ([cell isBordered])
+            if ([cell isBordered] && _frame.size.height === 32.0)
             {
                 CPLog.info("Adjusting CPButton height from " +_frame.size.height+ " / " + _bounds.size.height+" to " + 24);
                 _frame.size.height = 24.0;
+                _frame.origin.y += 4.0;
                 _bounds.size.height = 24.0;
             }
         }