diff --git a/src/TomahawkTrayIcon.cpp b/src/TomahawkTrayIcon.cpp
index 6c75a8552..edcf2483c 100644
--- a/src/TomahawkTrayIcon.cpp
+++ b/src/TomahawkTrayIcon.cpp
@@ -40,6 +40,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     , m_currentAnimationFrame( 0 )
     , m_showWindowAction( 0 )
     , m_stopContinueAfterTrackAction( 0 )
+    , m_loveTrackAction( 0 )
 {
 #ifdef Q_WS_MAC
     QIcon icon( RESPATH "icons/tomahawk-icon-128x128-grayscale.png" );
@@ -54,12 +55,14 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     m_contextMenu = new QMenu();
     setContextMenu( m_contextMenu );
 
+    m_loveTrackAction = new QAction( this );
     m_stopContinueAfterTrackAction = new QAction( this );
-    onStopContinueAfterTrackChanged();
 
     ActionCollection *ac = ActionCollection::instance();
     m_contextMenu->addAction( ac->getAction( "playPause" ) );
     m_contextMenu->addAction( ac->getAction( "stop" ) );
+    m_contextMenu->addSeparator();
+    m_contextMenu->addAction( m_loveTrackAction );
     m_contextMenu->addAction( m_stopContinueAfterTrackAction );
     m_contextMenu->addSeparator();
     m_contextMenu->addAction( ac->getAction( "previousTrack" ) );
@@ -67,8 +70,6 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     m_contextMenu->addSeparator();
     m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
 
-    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
     m_contextMenu->addSeparator();
@@ -82,6 +83,9 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     m_contextMenu->addSeparator();
     m_contextMenu->addAction( ac->getAction( "quit" ) );
 
+    connect( m_loveTrackAction, SIGNAL( triggered() ), SLOT( loveTrackTriggered() ) );
+    connect( m_stopContinueAfterTrackAction, SIGNAL( triggered() ), SLOT( stopContinueAfterTrackActionTriggered() ) );
+
     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() ), SLOT( onResume() ) );
@@ -152,8 +156,29 @@ TomahawkTrayIcon::menuAboutToShow()
 void
 TomahawkTrayIcon::setResult( const Tomahawk::result_ptr& result )
 {
+    if ( m_currentTrack )
+    {
+        disconnect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), this, SLOT( onSocialActionsLoaded() ) );
+    }
+
     m_currentTrack = result;
     refreshToolTip();
+
+    if ( result )
+        connect( result->toQuery().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ), Qt::UniqueConnection );
+
+    onSocialActionsLoaded();
+    onStopContinueAfterTrackChanged();
+}
+
+
+void
+TomahawkTrayIcon::onStopContinueAfterTrackChanged()
+{
+    if ( m_currentTrack && m_currentTrack->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
+        m_stopContinueAfterTrackAction->setText( tr( "&Continue Playback after current Track" ) );
+    else
+        m_stopContinueAfterTrackAction->setText( tr( "&Stop Playback after current Track" ) );
 }
 
 
@@ -241,18 +266,20 @@ TomahawkTrayIcon::onPause()
 void
 TomahawkTrayIcon::onPlay()
 {
+    m_loveTrackAction->setEnabled( true );
     m_stopContinueAfterTrackAction->setEnabled( true );
 
     onResume();
-    onStopContinueAfterTrackChanged();
 }
 
 
 void
 TomahawkTrayIcon::onStop()
 {
+    m_loveTrackAction->setEnabled( false );
     m_stopContinueAfterTrackAction->setEnabled( false );
 
+    setResult( Tomahawk::result_ptr() );
     onPause();
 }
 
@@ -265,26 +292,41 @@ TomahawkTrayIcon::onResume()
 
 
 void
-TomahawkTrayIcon::onStopContinueAfterTrackChanged()
+TomahawkTrayIcon::loveTrackTriggered()
 {
-    m_stopContinueAfterTrackAction->setText( tr( "&Stop Playback after current Track" ) );
+    if ( !m_currentTrack )
+        return;
 
-    if ( !AudioEngine::instance()->currentTrack().isNull() )
-    {
-        if ( AudioEngine::instance()->currentTrack()->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
-            m_stopContinueAfterTrackAction->setText( tr( "&Continue Playback after current Track" ) );
-    }
+    m_currentTrack->toQuery()->setLoved( !m_currentTrack->toQuery()->loved() );
 }
 
 
-void TomahawkTrayIcon::stopContinueAfterTrackActionTriggered()
+void
+TomahawkTrayIcon::stopContinueAfterTrackActionTriggered()
 {
-    if ( !AudioEngine::instance()->currentTrack().isNull() )
+    if ( !m_currentTrack )
+        return;
+
+    if ( !m_currentTrack->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
+        AudioEngine::instance()->setStopAfterTrack( m_currentTrack->toQuery() );
+    else
+        AudioEngine::instance()->setStopAfterTrack( Tomahawk::query_ptr() );
+}
+
+
+void
+TomahawkTrayIcon::onSocialActionsLoaded()
+{
+    m_loveTrackAction->setText( tr( "&Love" ) );
+    m_loveTrackAction->setIcon( QIcon( RESPATH "images/loved.png" ) );
+
+    if ( !m_currentTrack )
+        return;
+
+    if ( m_currentTrack->toQuery()->loved() )
     {
-        if ( !AudioEngine::instance()->currentTrack()->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
-            AudioEngine::instance()->setStopAfterTrack( AudioEngine::instance()->currentTrack()->toQuery() );
-        else
-            AudioEngine::instance()->setStopAfterTrack( Tomahawk::query_ptr() );
+        m_loveTrackAction->setText( tr( "Un-&Love" ) );
+        m_loveTrackAction->setIcon( QIcon( RESPATH "images/not-loved.png" ) );
     }
 }
 
@@ -310,4 +352,3 @@ TomahawkTrayIcon::event( QEvent* e )
 
     return QSystemTrayIcon::event( e );
 }
-
diff --git a/src/TomahawkTrayIcon.h b/src/TomahawkTrayIcon.h
index d1c73f41c..31984492b 100644
--- a/src/TomahawkTrayIcon.h
+++ b/src/TomahawkTrayIcon.h
@@ -49,10 +49,13 @@ private slots:
     void onStop();
     void onResume();
     
+    void onSocialActionsLoaded();
     void onStopContinueAfterTrackChanged();
     void stopContinueAfterTrackActionTriggered();
+    void loveTrackTriggered();
 
     void menuAboutToShow();
+
 private:
     void refreshToolTip();
     ~TomahawkTrayIcon();
@@ -67,6 +70,7 @@ private:
 
     QAction* m_showWindowAction;
     QAction* m_stopContinueAfterTrackAction;
+    QAction* m_loveTrackAction;
 };
 
 #endif // TOMAHAWK_TRAYICON_H