diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m
index 69d6a3ccb..af65d74dd 100644
--- a/macosx/BadgeView.m
+++ b/macosx/BadgeView.m
@@ -72,7 +72,7 @@
 
 - (void) drawRect: (NSRect) rect
 {
-    [[NSImage imageNamed: @"NSApplicationIcon"] drawInRect: rect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
+    [[NSApp applicationIconImage] drawInRect: rect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
     
     if (fQuitting)
     {
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 05b41d499..9cda81a3c 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -42,7 +42,6 @@
 #import "BlocklistDownloader.h"
 #import "StatusBarView.h"
 #import "FilterButton.h"
-#import "MenuLabel.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "NSMenuAdditions.h"
diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m
index ab341861b..ed96cbec0 100644
--- a/macosx/FileNameCell.m
+++ b/macosx/FileNameCell.m
@@ -26,7 +26,6 @@
 #import "FileOutlineView.h"
 #import "Torrent.h"
 #import "FileListNode.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 
 #define PADDING_HORIZONAL 2.0f
diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index 8d5838b4b..b959d9086 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -100,7 +100,7 @@
         [paragraphStyle release];
         
         fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0f green: 0.4f blue: 0.8f alpha: 1.0f] retain];
-        fBarBorderColor = [[NSColor colorWithDeviceWhite: 0.0f alpha: 0.2f] retain];
+        fBarBorderColor = [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.2f] retain];
     }
 	return self;
 }