diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-center.png b/AppKit/Themes/Aristo/Resources/popup-bezel-center.png
new file mode 100644
index 000000000..a563df475
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/popup-bezel-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-center.png
new file mode 100644
index 000000000..3a36a79c9
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-left.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-left.png
new file mode 100644
index 000000000..47a28bae8
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right-pullsdown.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right-pullsdown.png
index 78249fb48..38f4d6193 100644
Binary files a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right-pullsdown.png and b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right-pullsdown.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right.png
index 49e583a19..6b95b4b6c 100644
Binary files a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right.png and b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-left.png b/AppKit/Themes/Aristo/Resources/popup-bezel-left.png
new file mode 100644
index 000000000..8da12300f
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/popup-bezel-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-right-pullsdown.png b/AppKit/Themes/Aristo/Resources/popup-bezel-right-pullsdown.png
index dde750ff5..63083a979 100644
Binary files a/AppKit/Themes/Aristo/Resources/popup-bezel-right-pullsdown.png and b/AppKit/Themes/Aristo/Resources/popup-bezel-right-pullsdown.png differ
diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-right.png b/AppKit/Themes/Aristo/Resources/popup-bezel-right.png
index cd89b2fa2..c55ae9757 100644
Binary files a/AppKit/Themes/Aristo/Resources/popup-bezel-right.png and b/AppKit/Themes/Aristo/Resources/popup-bezel-right.png differ
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index defde6714..f7556a5c7 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -517,17 +517,17 @@ var themedButtonValues = nil,
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0) pullsDown:NO],
         color = PatternColor(
             [
-                ["button-bezel-left.png", 4.0, 24.0],
-                ["button-bezel-center.png", 1.0, 24.0],
-                ["popup-bezel-right.png", 27.0, 24.0]
+                ["popup-bezel-left.png", 3.0, 24.0],
+                ["popup-bezel-center.png", 1.0, 24.0],
+                ["popup-bezel-right.png", 21.0, 24.0]
             ],
             PatternIsHorizontal),
 
         disabledColor = PatternColor(
             [
-                ["button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
-                ["popup-bezel-disabled-right.png", 27.0, 24.0]
+                ["popup-bezel-disabled-left.png", 3.0, 24.0],
+                ["popup-bezel-disabled-center.png", 1.0, 24.0],
+                ["popup-bezel-disabled-right.png", 21.0, 24.0]
             ],
             PatternIsHorizontal),
 
@@ -536,7 +536,7 @@ var themedButtonValues = nil,
             [@"bezel-color",        color,          CPThemeStateBordered],
             [@"bezel-color",        disabledColor,  CPThemeStateBordered | CPThemeStateDisabled],
 
-            [@"content-inset",      CGInsetMake(0, 27.0 + 5.0, 0, 5.0), CPThemeStateBordered],
+            [@"content-inset",      CGInsetMake(0, 21.0 + 5.0, 0, 5.0), CPThemeStateBordered],
             [@"font",               [CPFont boldSystemFontOfSize:12.0]],
             [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
             [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]],
@@ -561,16 +561,16 @@ var themedButtonValues = nil,
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0) pullsDown:YES],
         color = PatternColor(
             [
-                ["button-bezel-left.png", 4.0, 24.0],
-                ["button-bezel-center.png", 1.0, 24.0],
+                ["popup-bezel-left.png", 4.0, 24.0],
+                ["popup-bezel-center.png", 1.0, 24.0],
                 ["popup-bezel-right-pullsdown.png", 27.0, 24.0]
             ],
             PatternIsHorizontal),
 
         disabledColor = PatternColor(
             [
-                ["button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["popup-bezel-disabled-left.png", 4.0, 24.0],
+                ["popup-bezel-disabled-center.png", 1.0, 24.0],
                 ["popup-bezel-disabled-right-pullsdown.png", 27.0, 24.0]
             ],
             PatternIsHorizontal),