diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index c78d160e8..51b108ccb 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -378,7 +378,7 @@ CPButtonImageOffset   = 3.0;
 
 - (void)setImage:(CPImage)anImage
 {
-    [self setValue:anImage forThemeAttribute:@"image"];
+    [self setValue:anImage forThemeAttribute:@"image" inState:CPThemeStateNormal];
 }
 
 - (CPImage)image
diff --git a/Tests/Manual/SmartFoldersDemo/BadgedOutlineView.j b/Tests/Manual/SmartFoldersDemo/BadgedOutlineView.j
index 62c3142e1..70fc51c7e 100644
--- a/Tests/Manual/SmartFoldersDemo/BadgedOutlineView.j
+++ b/Tests/Manual/SmartFoldersDemo/BadgedOutlineView.j
@@ -72,7 +72,7 @@ var CPSourceListDataSource_sourceList_itemHasBadge_                   = 1 << 1,
 
     //Make sure that the item has a badge
     if (![self itemHasBadge:rowItem])
-        return CGSizeZero();
+        return CGSizeMakeZero();
 
     var badgeString = [CPString stringWithFormat:@"%d", [self badgeValueForItem:rowItem]];