diff --git a/src/TomahawkTrayIcon.cpp b/src/TomahawkTrayIcon.cpp
index 7fd9955ed..08abee130 100644
--- a/src/TomahawkTrayIcon.cpp
+++ b/src/TomahawkTrayIcon.cpp
@@ -49,7 +49,8 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     m_contextMenu = new QMenu();
     setContextMenu( m_contextMenu );
 
-    m_stopContinueAfterTrackAction = new QAction( tr( "&Stop Playback after current Track" ), this );
+    m_stopContinueAfterTrackAction = new QAction( this );
+    onStopContinueAfterTrackChanged();
 
     ActionCollection *ac = ActionCollection::instance();
     m_contextMenu->addAction( ac->getAction( "playPause" ) );
@@ -61,7 +62,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     m_contextMenu->addSeparator();
     m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
 
-    connect( m_stopContinueAfterTrackAction, SIGNAL( triggered(bool) ), this, SLOT( stopContinueAfterTrackActionTriggered() ) );
+    connect( m_stopContinueAfterTrackAction, SIGNAL( triggered() ), SLOT( stopContinueAfterTrackActionTriggered() ) );
 
 #ifdef Q_WS_MAC
     // On mac you can close the windows while leaving the app open. We then need a way to show the main window again
@@ -78,10 +79,10 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
 
     connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) );
     connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlay() ) );
-    connect( AudioEngine::instance(), SIGNAL( resumed() ), this, SLOT( onResume() ) );
-    connect( AudioEngine::instance(), SIGNAL( stopped() ), this, SLOT( onStop() ) );
-    connect( AudioEngine::instance(), SIGNAL( paused() ),  this, SLOT( onPause() ) );
-    connect( AudioEngine::instance(), SIGNAL( stopAfterTrack_changed() ) , this, SLOT( stopContinueAfterTrack_StatusChanged() ) );
+    connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onResume() ) );
+    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onStop() ) );
+    connect( AudioEngine::instance(), SIGNAL( paused() ),  SLOT( onPause() ) );
+    connect( AudioEngine::instance(), SIGNAL( stopAfterTrackChanged() ), SLOT( onStopContinueAfterTrackChanged() ) );
 
     connect( &m_animationTimer, SIGNAL( timeout() ), SLOT( onAnimationTimer() ) );
     connect( this, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ), SLOT( onActivated( QSystemTrayIcon::ActivationReason ) ) );
@@ -236,7 +237,7 @@ TomahawkTrayIcon::onPlay()
 {
     m_stopContinueAfterTrackAction->setEnabled( true );
     onResume();
-    stopContinueAfterTrack_StatusChanged();
+    onStopContinueAfterTrackChanged();
 }
 
 
@@ -256,7 +257,7 @@ TomahawkTrayIcon::onResume()
 
 
 void
-TomahawkTrayIcon::stopContinueAfterTrack_StatusChanged()
+TomahawkTrayIcon::onStopContinueAfterTrackChanged()
 {
     if ( !AudioEngine::instance()->currentTrack().isNull() )
     {
diff --git a/src/TomahawkTrayIcon.h b/src/TomahawkTrayIcon.h
index d1504e835..d1c73f41c 100644
--- a/src/TomahawkTrayIcon.h
+++ b/src/TomahawkTrayIcon.h
@@ -49,8 +49,7 @@ private slots:
     void onStop();
     void onResume();
     
-    void stopContinueAfterTrack_StatusChanged();
-    
+    void onStopContinueAfterTrackChanged();
     void stopContinueAfterTrackActionTriggered();
 
     void menuAboutToShow();
diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp
index e69f723bd..bc6908e30 100644
--- a/src/libtomahawk/ActionCollection.cpp
+++ b/src/libtomahawk/ActionCollection.cpp
@@ -32,7 +32,7 @@ ActionCollection* ActionCollection::instance()
 }
 
 
-ActionCollection::ActionCollection( QObject *parent )
+ActionCollection::ActionCollection( QObject* parent )
     : QObject( parent )
 {
     s_instance = this;
@@ -79,11 +79,11 @@ ActionCollection::initActions()
     m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this );
 
     // connect actions to AudioEngine
-//     AudioEngine *ae = AudioEngine::instance();
-//     connect( m_actionCollection[ "playPause" ],     SIGNAL( triggered() ), ae,   SLOT( playPause() ), Qt::UniqueConnection );
-//     connect( m_actionCollection[ "stop" ],          SIGNAL( triggered() ), ae,   SLOT( stop() ),      Qt::UniqueConnection );
-//     connect( m_actionCollection[ "previousTrack" ], SIGNAL( triggered() ), ae,   SLOT( previous() ),  Qt::UniqueConnection );
-//     connect( m_actionCollection[ "nextTrack" ],     SIGNAL( triggered() ), ae,   SLOT( next() ),      Qt::UniqueConnection );
+    AudioEngine *ae = AudioEngine::instance();
+    connect( m_actionCollection[ "playPause" ],     SIGNAL( triggered() ), ae,   SLOT( playPause() ), Qt::UniqueConnection );
+    connect( m_actionCollection[ "stop" ],          SIGNAL( triggered() ), ae,   SLOT( stop() ),      Qt::UniqueConnection );
+    connect( m_actionCollection[ "previousTrack" ], SIGNAL( triggered() ), ae,   SLOT( previous() ),  Qt::UniqueConnection );
+    connect( m_actionCollection[ "nextTrack" ],     SIGNAL( triggered() ), ae,   SLOT( next() ),      Qt::UniqueConnection );
 }
 
 
diff --git a/src/libtomahawk/ActionCollection.h b/src/libtomahawk/ActionCollection.h
index 2eb327622..378b13cba 100644
--- a/src/libtomahawk/ActionCollection.h
+++ b/src/libtomahawk/ActionCollection.h
@@ -38,7 +38,7 @@ public:
 
     static ActionCollection* instance();
 
-    ActionCollection( QObject *parent);
+    ActionCollection( QObject *parent );
     ~ActionCollection();
 
     void initActions();
diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index dc882e46b..5be4c1adc 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -783,7 +783,7 @@ AudioEngine::setStopAfterTrack( const query_ptr& query )
     if ( m_stopAfterTrack != query )
     {
         m_stopAfterTrack = query;
-        emit stopAfterTrack_changed();
+        emit stopAfterTrackChanged();
     }
 }
 
diff --git a/src/libtomahawk/audio/AudioEngine.h b/src/libtomahawk/audio/AudioEngine.h
index ce14a397d..c5e3aeac8 100644
--- a/src/libtomahawk/audio/AudioEngine.h
+++ b/src/libtomahawk/audio/AudioEngine.h
@@ -109,7 +109,7 @@ signals:
     void paused();
     void resumed();
 
-    void stopAfterTrack_changed();
+    void stopAfterTrackChanged();
 
     void seeked( qint64 ms );