diff --git a/AppKit/Themes/Aristo3/ThemeDescriptors.j b/AppKit/Themes/Aristo3/ThemeDescriptors.j
index 72df3562b..22aa52c67 100644
--- a/AppKit/Themes/Aristo3/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo3/ThemeDescriptors.j
@@ -2623,22 +2623,21 @@ var themedButtonValues                      = nil,
      [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:0.0 alpha:0.6],           [CPThemeStateTableDataView, CPThemeStateGroupRow, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]],
      [@"font",               [CPFont boldSystemFontOfSize:CPFontCurrentSystemSize],      [CPThemeStateTableDataView, CPThemeStateGroupRow]],
 
-     [@"min-size",                   CGSizeMake(-1.0, 22.0)], // was 29
+     [@"min-size",                   CGSizeMake(-1.0, 22.0)],
      [@"nib2cib-adjustment-frame",   CGRectMake(2.0, 0.0, -4.0, 0.0)],      // For labels
      [@"nib2cib-adjustment-frame",   CGRectMake(0.0, 0.0, 0.0, 0.0),                     CPThemeStateBezeled],  // for bordered fields, frame = alignment
 
      // CPThemeStateControlSizeSmall
-     [@"content-inset",              CGInsetMake(7.0, 7.0, 5.0, 8.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled]],
-     [@"content-inset",              CGInsetMake(7.0, 7.0, 5.0, 8.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateEditing]],
-
-     [@"min-size",                   CGSizeMake(-1.0, 25.0),                             CPThemeStateControlSizeSmall],
+     [@"content-inset",              CGInsetMake(2.0, 4.0, 2.0, 4.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled]],
+     [@"content-inset",              CGInsetMake(2.0, 4.0, 2.0, 4.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateEditing]],
+     [@"min-size",                   CGSizeMake(-1.0, 19.0),                             CPThemeStateControlSizeSmall],
      [@"nib2cib-adjustment-frame",   CGRectMake(2.0, 0.0, -4.0, 0.0),                    CPThemeStateControlSizeSmall],
      [@"nib2cib-adjustment-frame",   CGRectMake(-3.0, 4.0, 7.0, 7.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled]],
 
      // CPThemeStateControlSizeMini
-     [@"content-inset",              CGInsetMake(6.0, 7.0, 5.0, 7.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled]],
-     [@"content-inset",              CGInsetMake(6.0, 7.0, 5.0, 7.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateEditing]],
-     [@"min-size",                   CGSizeMake(-1.0, 22.0),                             CPThemeStateControlSizeMini],
+     [@"content-inset",              CGInsetMake(1.0, 3.0, 1.0, 3.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled]],
+     [@"content-inset",              CGInsetMake(1.0, 3.0, 1.0, 3.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateEditing]],
+     [@"min-size",                   CGSizeMake(-1.0, 17.0),                             CPThemeStateControlSizeMini],
      [@"nib2cib-adjustment-frame",   CGRectMake(2.0, 0.0, -4.0, 0.0),                    CPThemeStateControlSizeMini],
      [@"nib2cib-adjustment-frame",   CGRectMake(-4.0, 4.0, 8.0, 7.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled]],
 
diff --git a/Tests/Manual/ThemeKitchenSinkA3/AppController.j b/Tests/Manual/ThemeKitchenSinkA3/AppController.j
index c50889efe..31d731175 100644
--- a/Tests/Manual/ThemeKitchenSinkA3/AppController.j
+++ b/Tests/Manual/ThemeKitchenSinkA3/AppController.j
@@ -106,8 +106,6 @@
     var tabView = [[CPTabView alloc] initWithFrame:bounds];
     [tabView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    // Requested Order: "Controls", "Sizes", "Data & Rules", "Outline"
-
     // --- TAB 1: Controls ---
     var item1 = [[CPTabViewItem alloc] initWithIdentifier:@"Controls"];
     [item1 setLabel:@"Controls"];
@@ -644,14 +642,14 @@
     [parentView addSubview:label];
     y += 35.0;
 
-    var popUp = [[CPPopUpButton alloc] initWithFrame:CGRectMake(xPos, y, width, 24)];
+    var popUp = [[CPPopUpButton alloc] initWithFrame:CGRectMake(xPos, y, width, 0)];
     [popUp addItemWithTitle:@"Item 1"];
     [popUp addItemWithTitle:@"Item 2"];
     [popUp setControlSize:aSize];
     [parentView addSubview:popUp];
     y += rowHeight;
 
-    var tf = [[CPTextField alloc] initWithFrame:CGRectMake(xPos, y, width, 24)];
+    var tf = [[CPTextField alloc] initWithFrame:CGRectMake(xPos, y, width, 0)];
     [tf setStringValue:@"Input"];
     [tf setBezeled:YES];
     [tf setEditable:YES];