diff --git a/AppKit/Themes/Aristo/Resources/token-center.png b/AppKit/Themes/Aristo/Resources/token-center.png
index 9ec12f972..b2249fc56 100644
Binary files a/AppKit/Themes/Aristo/Resources/token-center.png and b/AppKit/Themes/Aristo/Resources/token-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/token-highlighted-center.png b/AppKit/Themes/Aristo/Resources/token-highlighted-center.png
index 2f2ab1c7e..a6c0668eb 100644
Binary files a/AppKit/Themes/Aristo/Resources/token-highlighted-center.png and b/AppKit/Themes/Aristo/Resources/token-highlighted-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/token-highlighted-left.png b/AppKit/Themes/Aristo/Resources/token-highlighted-left.png
index 60bc6b4b2..f53519633 100644
Binary files a/AppKit/Themes/Aristo/Resources/token-highlighted-left.png and b/AppKit/Themes/Aristo/Resources/token-highlighted-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/token-highlighted-right.png b/AppKit/Themes/Aristo/Resources/token-highlighted-right.png
index 2aabf627c..6cd745a5d 100644
Binary files a/AppKit/Themes/Aristo/Resources/token-highlighted-right.png and b/AppKit/Themes/Aristo/Resources/token-highlighted-right.png differ
diff --git a/AppKit/Themes/Aristo/Resources/token-left.png b/AppKit/Themes/Aristo/Resources/token-left.png
index 00cf12196..2293aa0e7 100644
Binary files a/AppKit/Themes/Aristo/Resources/token-left.png and b/AppKit/Themes/Aristo/Resources/token-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/token-right.png b/AppKit/Themes/Aristo/Resources/token-right.png
index da8582333..a213fe09d 100644
Binary files a/AppKit/Themes/Aristo/Resources/token-right.png and b/AppKit/Themes/Aristo/Resources/token-right.png differ
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 02d5f629e..d4706ae26 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -921,21 +921,21 @@ var themedButtonValues = nil,
 
 + (_CPTokenFieldToken)themedTokenFieldToken
 {
-    var token = [[_CPTokenFieldToken alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 18.0)],
+    var token = [[_CPTokenFieldToken alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 19.0)],
 
         bezelColor = PatternColor(
             [
-                ["token-left.png", 11.0, 18.0],
-                ["token-center.png", 1.0, 18.0],
-                ["token-right.png", 11.0, 18.0]
+                ["token-left.png", 11.0, 19.0],
+                ["token-center.png", 1.0, 19.0],
+                ["token-right.png", 11.0, 19.0]
             ],
             PatternIsHorizontal),
 
         bezelHighlightedColor = PatternColor(
             [
-                ["token-highlighted-left.png", 11.0, 18.0],
-                ["token-highlighted-center.png", 1.0, 18.0],
-                ["token-highlighted-right.png", 11.0, 18.0]
+                ["token-highlighted-left.png", 11.0, 19.0],
+                ["token-highlighted-center.png", 1.0, 19.0],
+                ["token-highlighted-right.png", 11.0, 19.0]
             ],
             PatternIsHorizontal),
 
@@ -951,11 +951,11 @@ var themedButtonValues = nil,
             [@"text-color",     textHighlightedColor,               CPThemeStateHighlighted],
 
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled],
-            [@"content-inset",  CGInsetMake(2.0, 24.0, 2.0, 16.0),  CPThemeStateBezeled],
+            [@"content-inset",  CGInsetMake(1.0, 24.0, 2.0, 16.0),  CPThemeStateBezeled],
 
             // Minimum height == maximum height since tokens are fixed height.
-            [@"min-size",       CGSizeMake(0.0, 18.0)],
-            [@"max-size",       CGSizeMake(-1.0, 18.0)],
+            [@"min-size",       CGSizeMake(0.0, 19.0)],
+            [@"max-size",       CGSizeMake(-1.0, 19.0)],
 
             [@"vertical-alignment", CPCenterTextAlignment],
         ];