diff --git a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd
index ef95c237f..cc5464512 100755
Binary files a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd and b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-center.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-center.png
index d2db37444..39a0bb883 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-center.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-center.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-center.png
index 44bafedc2..15d80d800 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-left.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-left.png
index 2e4b4cffb..208848182 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-right.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-right.png
index b45c2e146..6cd0f0838 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-disabled-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-center.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-center.png
index 3bf8be6a2..7e8d49711 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-center.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-left.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-left.png
index 75c5ee3d6..e51504da9 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-left.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-right.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-right.png
index 5d71c7272..dc17dcd9e 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-right.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-focused-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-left.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-left.png
index bdc11d31d..acc3a01f5 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-left.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-right.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-right.png
index 52987fd2b..0f5244861 100644
Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-right.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-no-border-right.png differ
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 384c61f57..050cb63d4 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -745,7 +745,7 @@ var themedButtonValues = nil,
 
             [@"bezel-color-calendar", [CPColor whiteColor]],
             [@"bezel-color-calendar", [CPColor colorWithCalibratedRed:87.0 / 255.0 green:128.0 / 255.0 blue:216.0 / 255.0 alpha:1.0],   CPThemeStateSelected],
-            [@"bezel-color-calendar", [CPColor colorWithCalibratedRed:87.0 / 255.0 green:128.0 / 255.0 blue:216.0 / 255.0 alpha:0.5],   CPThemeStateSelected |CPThemeStateDisabled],
+            [@"bezel-color-calendar", [CPColor colorWithCalibratedRed:87.0 / 255.0 green:128.0 / 255.0 blue:216.0 / 255.0 alpha:0.5],   CPThemeStateSelected | CPThemeStateDisabled],
             [@"bezel-color-clock",    clockImageColor],
             [@"bezel-color-clock",    clockImageColorDisabled,                                                                          CPThemeStateDisabled],
 
@@ -1008,10 +1008,19 @@ var themedButtonValues = nil,
         bezelNoBorderColor = PatternColor(
             "combobox-bezel-no-border{state}{position}.png",
             {
-                states: ["", "focused", "disabled"],
-                width: 6.0,
-                height: 29.0,
-                rightWidth: 24.0,
+                states: ["", "disabled"],
+                width: 4.0,
+                height: 25.0,
+                rightWidth: 25.0,
+                orientation: PatternIsHorizontal
+            }),
+
+        bezelNoBorderFocusedColor = PatternColor(
+            "combobox-bezel-no-border-focused{position}.png",
+            {
+                width: 9.0,
+                height: 31.0,
+                rightWidth: 27.0,
                 orientation: PatternIsHorizontal
             }),
 
@@ -1022,16 +1031,20 @@ var themedButtonValues = nil,
             [@"bezel-color",        bezelColor["disabled"],          CPThemeStateBezeled | CPComboBoxStateButtonBordered | CPThemeStateDisabled],
 
             [@"bezel-color",        bezelNoBorderColor["@"],         CPThemeStateBezeled],
-            [@"bezel-color",        bezelNoBorderColor["focused"],   CPThemeStateBezeled | CPThemeStateEditing],
+            [@"bezel-color",        bezelNoBorderFocusedColor,       CPThemeStateBezeled | CPThemeStateEditing],
             [@"bezel-color",        bezelNoBorderColor["disabled"],  CPThemeStateBezeled | CPThemeStateDisabled],
 
             [@"border-inset",       CGInsetMake(3.0, 3.0, 3.0, 3.0),    CPThemeStateBezeled],
 
-            [@"bezel-inset",        CGInsetMake(0.0, 1.0, 0.0, 1.0),    CPThemeStateBezeled | CPThemeStateEditing],
+            [@"bezel-inset",        CGInsetMake(0.0, 1.0, 0.0, 1.0),    CPThemeStateBezeled | CPThemeStateEditing | CPComboBoxStateButtonBordered],
+            [@"bezel-inset",        CGInsetMake(3.0, 4.0, 3.0, 4.0),    CPThemeStateBezeled | CPThemeStateDisabled | CPComboBoxStateButtonBordered],
+
+            [@"bezel-inset",        CGInsetMake(0.0, 4.0, 0.0, 1.0),    CPThemeStateBezeled | CPThemeStateEditing],
+            [@"bezel-inset",        CGInsetMake(3.0, 5.0, 3.0, 4.0),    CPThemeStateBezeled | CPThemeStateDisabled],
 
             // The right border inset has to make room for the focus ring and popup button
             [@"content-inset",      CGInsetMake(9.0, 26.0, 7.0, 10.0),    CPThemeStateBezeled | CPComboBoxStateButtonBordered],
-            [@"content-inset",      CGInsetMake(9.0, 24.0, 7.0, 10.0),    CPThemeStateBezeled],
+            [@"content-inset",      CGInsetMake(9.0, 26.0, 7.0, 10.0),    CPThemeStateBezeled],
             [@"content-inset",      CGInsetMake(9.0, 24.0, 7.0, 10.0),    CPThemeStateBezeled | CPThemeStateEditing],
 
             [@"popup-button-size",  CGSizeMake(21.0, 23.0), CPThemeStateBezeled | CPComboBoxStateButtonBordered],
diff --git a/AppKit/_CPPopUpList.j b/AppKit/_CPPopUpList.j
index 67cfb7fb8..dc8a74227 100644
--- a/AppKit/_CPPopUpList.j
+++ b/AppKit/_CPPopUpList.j
@@ -858,7 +858,7 @@ var _CPPopUpListDataSourceKey   = @"_CPPopUpListDataSourceKey",
     if (self = [super initWithContentRect:aContentRect styleMask:aStyleMask])
         _constrainsToUsableScreen = NO;
 
-	[self _trapNextMouseDown];
+    [self _trapNextMouseDown];
 
     return self;
 }
@@ -875,20 +875,20 @@ var _CPPopUpListDataSourceKey   = @"_CPPopUpListDataSourceKey",
 
 - (void)orderFront:(id)sender
 {
-	[self _trapNextMouseDown];
-	[super orderFront:sender];
+    [self _trapNextMouseDown];
+    [super orderFront:sender];
 }
 
 - (void)_mouseWasClicked:(CPEvent)anEvent
 {
-	var mouseWindow = [anEvent window],
-		rect = [[[self delegate] dataSource] bounds],
-		point = [[[self delegate] dataSource] convertPoint:[anEvent locationInWindow] fromView:nil];
+    var mouseWindow = [anEvent window],
+        rect = [[[self delegate] dataSource] bounds],
+        point = [[[self delegate] dataSource] convertPoint:[anEvent locationInWindow] fromView:nil];
 
-	if (mouseWindow != self && !CGRectContainsPoint(rect, point))
-		[[self delegate] close];
-	else if ([mouseWindow firstResponder] == [[self delegate] dataSource])
-		[self _trapNextMouseDown];
+    if (mouseWindow != self && !CGRectContainsPoint(rect, point))
+        [[self delegate] close];
+    else if ([mouseWindow firstResponder] == [[self delegate] dataSource])
+        [self _trapNextMouseDown];
 }
 
 - (void)_trapNextMouseDown