diff --git a/AppKit/CPStepper.j b/AppKit/CPStepper.j
index fd7370bfc..0608402e1 100644
--- a/AppKit/CPStepper.j
+++ b/AppKit/CPStepper.j
@@ -55,11 +55,15 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
+    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMakeZero()];
+
     [stepper setDoubleValue:aValue];
     [stepper setMinValue:aMinValue];
     [stepper setMaxValue:aMaxValue];
 
+    // _sizeToFit will put the good size for the stepper depending of the current theme
+    [stepper _sizeToFit];
+
     return stepper;
 }
 
@@ -155,7 +159,7 @@
 
 - (void)setFrame:(CGRect)aFrame
 {
-    var upSize = [self valueForThemeAttribute:@"up-button-size"],
+     var upSize = [self valueForThemeAttribute:@"up-button-size"],
         downSize = [self valueForThemeAttribute:@"down-button-size"],
         minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
         frame = _CGRectMakeCopy(aFrame);
@@ -184,6 +188,11 @@
     [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }
 
+- (void)_sizeToFit
+{
+    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
+}
+
 /*!
     Set if CPStepper should autorepeat.
     @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index af88adbdd..52fc04d43 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -631,7 +631,7 @@ var themedButtonValues = nil,
         [@"content-inset",      CGInsetMake(8.0, 7.0, 5.0, 8.0),    CPThemeStateBezeled],
         [@"content-inset",      CGInsetMake(8.0, 7.0, 5.0, 8.0),    CPThemeStateBezeled | CPThemeStateEditing],
         [@"bezel-inset",        CGInsetMake(3.0, 4.0, 3.0, 4.0),    CPThemeStateBezeled],
-        [@"bezel-inset",        CGInsetMake(1.0, 1.0, 1.0, 1.0),    CPThemeStateBezeled | CPThemeStateEditing],
+        [@"bezel-inset",        CGInsetMake(0.0, 1.0, 0.0, 1.0),    CPThemeStateBezeled | CPThemeStateEditing],
 
         [@"text-color",         placeholderColor,                   CPTextFieldStatePlaceholder],
 
@@ -928,16 +928,16 @@ var themedButtonValues = nil,
             [@"bezel-inset",        CGInsetMake(0.0, 1.0, 1.0, 1.0),    CPThemeStateBezeled | CPThemeStateEditing],
 
             // The right border inset has to make room for the focus ring and popup button
-            [@"content-inset",      CGInsetMake(8.0, 26.0, 7.0, 8.0),    CPThemeStateBezeled | CPComboBoxStateButtonBordered],
-            [@"content-inset",      CGInsetMake(8.0, 24.0, 7.0, 8.0),    CPThemeStateBezeled],
-            [@"content-inset",      CGInsetMake(8.0, 24.0, 7.0, 8.0),    CPThemeStateBezeled | CPThemeStateEditing],
+            [@"content-inset",      CGInsetMake(10.0, 26.0, 7.0, 8.0),    CPThemeStateBezeled | CPComboBoxStateButtonBordered],
+            [@"content-inset",      CGInsetMake(10.0, 24.0, 7.0, 8.0),    CPThemeStateBezeled],
+            [@"content-inset",      CGInsetMake(10.0, 24.0, 7.0, 8.0),    CPThemeStateBezeled | CPThemeStateEditing],
 
             [@"popup-button-size",  CGSizeMake(21.0, 23.0), CPThemeStateBezeled | CPComboBoxStateButtonBordered],
             [@"popup-button-size",  CGSizeMake(17.0, 23.0), CPThemeStateBezeled],
 
             // Because combo box uses a three-part bezel, the height is fixed
-            [@"min-size",           CGSizeMake(0, 29.0)],
-            [@"max-size",           CGSizeMake(-1, 29.0)]
+            [@"min-size",           CGSizeMake(0, 31.0)],
+            [@"max-size",           CGSizeMake(-1, 31.0)]
         ];
 
     [self registerThemeValues:overrides forView:combo inherit:themedTextFieldValues];