diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 5dc5ec744..8ec37bbb2 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -449,7 +449,7 @@ ViewManager::showRecentPlaysPage()
         raModel->setDescription( tr( "Recently played tracks from all your friends" ) );
 
         PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::RecentlyPlayed, pv->trackView(), pv->trackView()->proxyModel() );
-        pv->trackView()->setItemDelegate( del );
+        pv->trackView()->setPlaylistItemDelegate( del );
 
         pv->setPlayableModel( raModel );
         pv->setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) );
@@ -475,7 +475,7 @@ ViewManager::showInboxPage()
                 new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::Inbox,
                                                inboxView,
                                                inboxView->proxyModel() );
-        inboxView->setItemDelegate( delegate );
+        inboxView->setPlaylistItemDelegate( delegate );
 
         inboxView->proxyModel()->setStyle( PlayableProxyModel::Large );
         inboxView->setPlayableModel( m_inboxModel );
@@ -492,6 +492,7 @@ ViewManager::showInboxPage()
     return show( m_inboxWidget );
 }
 
+
 ViewPage *ViewManager::showNetworkActivityPage()
 {
     if ( !m_networkActivityWidget )
diff --git a/src/libtomahawk/playlist/FlexibleView.cpp b/src/libtomahawk/playlist/FlexibleView.cpp
index 76622c415..a3d73815c 100644
--- a/src/libtomahawk/playlist/FlexibleView.cpp
+++ b/src/libtomahawk/playlist/FlexibleView.cpp
@@ -55,7 +55,7 @@ FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader )
     m_detailedView->setColumnHidden( PlayableModel::Composer, true ); // Hide composer column per default
 
     PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::LovedTracks, m_trackView, m_trackView->proxyModel() );
-    m_trackView->setItemDelegate( del );
+    m_trackView->setPlaylistItemDelegate( del );
     m_trackView->proxyModel()->setStyle( PlayableProxyModel::Large );
 
     m_stack = new QStackedWidget();
diff --git a/src/libtomahawk/widgets/HistoryWidget.cpp b/src/libtomahawk/widgets/HistoryWidget.cpp
index ac7bdc905..fcaaf1490 100644
--- a/src/libtomahawk/widgets/HistoryWidget.cpp
+++ b/src/libtomahawk/widgets/HistoryWidget.cpp
@@ -83,7 +83,7 @@ HistoryWidget::HistoryWidget( const source_ptr& source, QWidget* parent )
         m_model->setDescription( tr( "%1's recently played tracks" ).arg( source->friendlyName() ) );
 
     PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::RecentlyPlayed, trackView(), trackView()->proxyModel() );
-    trackView()->setItemDelegate( del );
+    trackView()->setPlaylistItemDelegate( del );
 
     setPlayableModel( m_model );
     setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) );
diff --git a/src/libtomahawk/widgets/NetworkActivityWidget.cpp b/src/libtomahawk/widgets/NetworkActivityWidget.cpp
index 72b777858..99d0de3f3 100644
--- a/src/libtomahawk/widgets/NetworkActivityWidget.cpp
+++ b/src/libtomahawk/widgets/NetworkActivityWidget.cpp
@@ -58,7 +58,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
     d_func()->ui->tracksViewLeft->setHeaderHidden( true );
     d_func()->ui->tracksViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     PlaylistChartItemDelegate* del = new PlaylistChartItemDelegate( d_func()->ui->tracksViewLeft, d_func()->ui->tracksViewLeft->proxyModel() );
-    d_func()->ui->tracksViewLeft->setItemDelegate( del );
+    d_func()->ui->tracksViewLeft->setPlaylistItemDelegate( del );
     d_func()->ui->tracksViewLeft->setUniformRowHeights( false );
 
     d_func()->playlistInterface = d_func()->ui->tracksViewLeft->playlistInterface();
diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp
index e351d7a96..c22b2d35e 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget.cpp
+++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp
@@ -82,7 +82,7 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
     ui->tracksViewLeft->setHeaderHidden( true );
     ui->tracksViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     PlaylistChartItemDelegate* del = new PlaylistChartItemDelegate( ui->tracksViewLeft, ui->tracksViewLeft->proxyModel() );
-    ui->tracksViewLeft->setItemDelegate( del );
+    ui->tracksViewLeft->setPlaylistItemDelegate( del );
     ui->tracksViewLeft->setUniformRowHeights( false );
 
     TreeProxyModel* artistsProxy = new TreeProxyModel( ui->artistsViewLeft );
diff --git a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp
index 1cc662a52..fb45cdda8 100644
--- a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp
+++ b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp
@@ -79,7 +79,7 @@ LovedTracksItem::activate()
         raModel->setTitle( text() );
 
         PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::LovedTracks, pv->trackView(), pv->trackView()->proxyModel() );
-        pv->trackView()->setItemDelegate( del );
+        pv->trackView()->setPlaylistItemDelegate( del );
 
         pv->setEmptyTip( tr( "Sorry, we could not find any loved tracks!" ) );
         if ( !par )
diff --git a/src/tomahawk/sourcetree/items/SourceItem.cpp b/src/tomahawk/sourcetree/items/SourceItem.cpp
index 8b91771da..bea721981 100644
--- a/src/tomahawk/sourcetree/items/SourceItem.cpp
+++ b/src/tomahawk/sourcetree/items/SourceItem.cpp
@@ -611,7 +611,7 @@ SourceItem::latestAdditionsClicked()
             raModel->setDescription( tr( "Latest additions to %1's collection" ).arg( m_source->friendlyName() ) );
 
         PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::LatestAdditions, pv->trackView(), pv->trackView()->proxyModel() );
-        pv->trackView()->setItemDelegate( del );
+        pv->trackView()->setPlaylistItemDelegate( del );
 
         pv->setPlayableModel( raModel );
         pv->trackView()->sortByColumn( PlayableModel::Age, Qt::DescendingOrder );