diff --git a/Application/AppController.m b/Application/AppController.m
index de16643f2..951951cb3 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -206,7 +206,8 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 - (void)awakeFromNib
 {
 	[mainWindow setExcludedFromWindowsMenu:YES];
-	
+	[mainWindow setContentBorderThickness:22.0 forEdge:NSMinYEdge];
+
 	[[totalTimeField cell] setBackgroundStyle:NSBackgroundStyleRaised];
 	
 	[[playbackButtons cell] setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"") forSegment: 1];
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 4ea9e6d3d..ded11cecd 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/ThirdParty/AppleRemote/AppleRemote.m b/ThirdParty/AppleRemote/AppleRemote.m
index d4bdb8dd1..7bd91cc4f 100644
--- a/ThirdParty/AppleRemote/AppleRemote.m
+++ b/ThirdParty/AppleRemote/AppleRemote.m
@@ -62,6 +62,10 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
 
 #pragma public interface
 
+#ifndef NSAppKitVersionNumber10_4
+	#define	NSAppKitVersionNumber10_4 824
+#endif
+
 - (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
 	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
 		// 10.4.x Tiger