diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 524333f78..cca0b1e93 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -1715,7 +1715,7 @@ var themedButtonValues = nil,
             [@"inner-shadow-offset", CPSizeMakeZero()],
             [@"inner-shadow-color", [CPColor blackColor]],
             [@"inner-shadow-size", 6.0],
-            [@"content-margin", CPSizeMake(10.0, 10.0)]
+            [@"content-margin", CPSizeMakeZero()]
         ];
 
     [self registerThemeValues:themeValues forView:box];
diff --git a/Tools/nib2cib/NSMenuItem.j b/Tools/nib2cib/NSMenuItem.j
index bc7b8b740..2b4a6f222 100644
--- a/Tools/nib2cib/NSMenuItem.j
+++ b/Tools/nib2cib/NSMenuItem.j
@@ -22,6 +22,7 @@
 
 @import <AppKit/CPMenuItem.j>
 
+@import "NSButton.j"
 @import "NSEvent.j"
 @import "NSMenu.j"