diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j
index 838a60ceb..8ad2e3b41 100644
--- a/AppKit/CPSearchField.j
+++ b/AppKit/CPSearchField.j
@@ -73,7 +73,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
             @"image-search": [CPNull null],
             @"image-find": [CPNull null],
             @"image-cancel": [CPNull null],
-            @"image-cancel-pressed": [CPNull null]
+            @"image-cancel-pressed": [CPNull null],
+            @"image-search-left-margin" : 0,
+            @"image-cancel-right-margin" : 0
         };
 }
 
@@ -268,7 +270,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
 
-    return CGRectMake(5, (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
+    return CGRectMake([self currentValueForThemeAttribute:@"image-search-left-margin"], (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
 }
 
 /*!
@@ -280,7 +282,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
 
-    return CGRectMake(CGRectGetWidth(rect) - size.width - 5, (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
+    return CGRectMake(CGRectGetWidth(rect) - size.width - [self currentValueForThemeAttribute:@"image-cancel-right-margin"], (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
 }
 
 // Managing Menu Templates
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index bd056b1af..ebe6e440d 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -1243,20 +1243,27 @@ var themedButtonValues = nil,
 
         overrides =
         [
+            [@"image-search-left-margin",   5],
+            [@"image-cancel-right-margin",  5],
+
             [@"image-search",           imageSearch],
             [@"image-find",             imageFind],
             [@"image-cancel",           imageCancel],
             [@"image-cancel-pressed",   imageCancelPressed],
 
-            [@"image-search",           smallImageSearch,               CPThemeStateControlSizeSmall],
-            [@"image-find",             smallImageFind,                 CPThemeStateControlSizeSmall],
-            [@"image-cancel",           smallImageCancel,               CPThemeStateControlSizeSmall],
-            [@"image-cancel-pressed",   smallImageCancelPressed,        CPThemeStateControlSizeSmall],
+            [@"image-search",               smallImageSearch,               CPThemeStateControlSizeSmall],
+            [@"image-find",                 smallImageFind,                 CPThemeStateControlSizeSmall],
+            [@"image-cancel",               smallImageCancel,               CPThemeStateControlSizeSmall],
+            [@"image-cancel-pressed",       smallImageCancelPressed,        CPThemeStateControlSizeSmall],
+            [@"image-search-left-margin",   8,                              CPThemeStateControlSizeSmall],
+            [@"image-cancel-right-margin",  8,                              CPThemeStateControlSizeSmall],
 
-            [@"image-search",           miniImageSearch,                CPThemeStateControlSizeMini],
-            [@"image-find",             miniImageFind,                  CPThemeStateControlSizeMini],
-            [@"image-cancel",           miniImageCancel,                CPThemeStateControlSizeMini],
-            [@"image-cancel-pressed",   miniImageCancelPressed,         CPThemeStateControlSizeMini],
+            [@"image-search",               miniImageSearch,                CPThemeStateControlSizeMini],
+            [@"image-find",                 miniImageFind,                  CPThemeStateControlSizeMini],
+            [@"image-cancel",               miniImageCancel,                CPThemeStateControlSizeMini],
+            [@"image-cancel-pressed",       miniImageCancelPressed,         CPThemeStateControlSizeMini],
+            [@"image-search-left-margin",   8,                              CPThemeStateControlSizeMini],
+            [@"image-cancel-right-margin",  8,                              CPThemeStateControlSizeMini],
         ];
 
     [self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 877757dfd..f873f40e7 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -824,6 +824,9 @@ var themedButtonValues = nil,
 
         overrides =
         [
+            [@"image-search-left-margin",   5],
+            [@"image-cancel-right-margin",  5],
+
             [@"image-search",           imageSearch],
             [@"image-find",             imageFind],
             [@"image-cancel",           imageCancel],