diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j
index c9f6ba148..2170aa7e5 100644
--- a/AppKit/CPSearchField.j
+++ b/AppKit/CPSearchField.j
@@ -28,15 +28,6 @@ CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;
 
-var CPSearchFieldSearchImage = nil,
-    CPSearchFieldFindImage = nil,
-    CPSearchFieldCancelImage = nil,
-    CPSearchFieldCancelPressedImage = nil;
-
-var SEARCH_BUTTON_DEFAULT_WIDTH = 25.0,
-    CANCEL_BUTTON_DEFAULT_WIDTH = 22.0,
-    BUTTON_DEFAULT_HEIGHT = 22.0;
-
 var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
 
 var RECENT_SEARCH_PREFIX = @"   ";
@@ -70,16 +61,14 @@ var RECENT_SEARCH_PREFIX = @"   ";
     return @"searchfield"
 }
 
-+ (void)initialize
++ (CPDictionary)themeAttributes
 {
-    if (self !== [CPSearchField class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    return [CPDictionary dictionaryWithJSObject:{
+        @"image-search": [CPNull null],
+        @"image-find": [CPNull null],
+        @"image-cancel": [CPNull null],
+        @"image-cancel-pressed": [CPNull null]
+    }];
 }
 
 - (id)initWithFrame:(CGRect)frame
@@ -170,7 +159,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)resetSearchButton
 {
     var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
+        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];
 
     [button setBordered:NO];
     [button setImageScaling:CPImageScaleAxesIndependently];
@@ -216,8 +205,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
     var button = [self cancelButton];
     [button setBordered:NO];
     [button setImageScaling:CPImageScaleAxesIndependently];
-    [button setImage:CPSearchFieldCancelImage];
-    [button setAlternateImage:CPSearchFieldCancelPressedImage];
+    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
+    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
     [button setAutoresizingMask:CPViewMinXMargin];
     [button setTarget:self];
     [button setAction:@selector(cancelOperation:)];
@@ -258,7 +247,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
+    var size = [[self valueForThemeAttribute:@"image-search"] size] || CPSizeMakeZero();
+
+    return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
 }
 
 /*!
@@ -268,7 +259,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
+    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CPSizeMakeZero();
+
+    return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
 }
 
 // Managing Menu Templates
diff --git a/AppKit/Resources/CPWindowResizeIndicator.png b/AppKit/Resources/CPWindowResizeIndicator.png
deleted file mode 100644
index e966196a6..000000000
Binary files a/AppKit/Resources/CPWindowResizeIndicator.png and /dev/null differ
diff --git a/AppKit/Resources/FIXME_ImageShadow.png b/AppKit/Resources/FIXME_ImageShadow.png
deleted file mode 100644
index 5ce568219..000000000
Binary files a/AppKit/Resources/FIXME_ImageShadow.png and /dev/null differ
diff --git a/AppKit/Resources/HUDTheme/WindowClose.png b/AppKit/Resources/HUDTheme/WindowClose.png
deleted file mode 100644
index dd9d7d72b..000000000
Binary files a/AppKit/Resources/HUDTheme/WindowClose.png and /dev/null differ
diff --git a/AppKit/Resources/HUDTheme/WindowCloseActive.png b/AppKit/Resources/HUDTheme/WindowCloseActive.png
deleted file mode 100644
index 5f54a8218..000000000
Binary files a/AppKit/Resources/HUDTheme/WindowCloseActive.png and /dev/null differ
diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldCancelPressed.png b/AppKit/Themes/Aristo2/Resources/search-field-cancel-pressed.png
similarity index 100%
rename from AppKit/Resources/CPSearchField/CPSearchFieldCancelPressed.png
rename to AppKit/Themes/Aristo2/Resources/search-field-cancel-pressed.png
diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldCancel.png b/AppKit/Themes/Aristo2/Resources/search-field-cancel.png
similarity index 100%
rename from AppKit/Resources/CPSearchField/CPSearchFieldCancel.png
rename to AppKit/Themes/Aristo2/Resources/search-field-cancel.png
diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldFind.png b/AppKit/Themes/Aristo2/Resources/search-field-find.png
similarity index 100%
rename from AppKit/Resources/CPSearchField/CPSearchFieldFind.png
rename to AppKit/Themes/Aristo2/Resources/search-field-find.png
diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldSearch.png b/AppKit/Themes/Aristo2/Resources/search-field-search.png
similarity index 100%
rename from AppKit/Resources/CPSearchField/CPSearchFieldSearch.png
rename to AppKit/Themes/Aristo2/Resources/search-field-search.png
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 119e08ec8..161a15aed 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -640,9 +640,22 @@ var themedButtonValues = nil,
 
 + (CPSearchField)themedSearchField
 {
-    var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)];
+    var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)],
+
+        imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
+        imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
+        imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
+        imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+
+        overrides = [
+            [@"image-search", imageSearch],
+            [@"image-find", imageFind],
+            [@"image-cancel", imageCancel],
+            [@"image-cancel-pressed", imageCancelPressed]
+        ];
+
+    [self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
 
-    [self registerThemeValues:nil forView:searchField inherit:themedRoundedTextFieldValues];
     return searchField;
 }