diff --git a/Application/AppController.h b/Application/AppController.h
index f0608fb77..161f8b4d9 100644
--- a/Application/AppController.h
+++ b/Application/AppController.h
@@ -22,9 +22,7 @@
 	
 	IBOutlet NSWindow *mainWindow;
 	
-	IBOutlet NSButton *playButton;
-	IBOutlet NSButton *prevButton;
-	IBOutlet NSButton *nextButton;
+	IBOutlet NSSegmentedControl *playbackButtons;
 	IBOutlet NSButton *infoButton;
 	IBOutlet NSButton *fileButton;
 	IBOutlet NSButton *shuffleButton;
diff --git a/Application/AppController.m b/Application/AppController.m
index 474cf20d9..8884bfb0c 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -215,9 +215,9 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 	
 	[[totalTimeField cell] setBackgroundStyle:NSBackgroundStyleRaised];
 	
-	[playButton setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"")];
-	[prevButton setToolTip:NSLocalizedString(@"PrevButtonTooltip", @"")];
-	[nextButton setToolTip:NSLocalizedString(@"NextButtonTooltip", @"")];
+	[[playbackButtons cell] setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"") forSegment: 1];
+	[[playbackButtons cell] setToolTip:NSLocalizedString(@"PrevButtonTooltip", @"") forSegment: 0];
+	[[playbackButtons cell] setToolTip:NSLocalizedString(@"NextButtonTooltip", @"") forSegment: 2];
 	[infoButton setToolTip:NSLocalizedString(@"InfoButtonTooltip", @"")];
 	[shuffleButton setToolTip:NSLocalizedString(@"ShuffleButtonTooltip", @"")];
 	[repeatButton setToolTip:NSLocalizedString(@"RepeatButtonTooltip", @"")];
@@ -448,17 +448,17 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 
 - (void)clickPlay
 {
-	[playButton performClick:nil];
+	[playbackController playPauseResume:self];
 }
 
 - (void)clickPrev
 {
-	[prevButton performClick:nil];
+	[playbackController prev:nil];
 }
 
 - (void)clickNext
 {
-	[nextButton performClick:nil];
+	[playbackController next:nil];
 }
 
 
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 64d8859f9..0b2643072 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ