diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp
index 4b7cf133f..ca4c44305 100644
--- a/src/libtomahawk/playlist/playlistitemdelegate.cpp
+++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp
@@ -9,11 +9,15 @@
 
 #include "playlist/plitem.h"
 #include "playlist/trackproxymodel.h"
+#include "playlist/trackview.h"
+#include "playlist/trackheader.h"
 
-#include "audio/audioengine.h"
+#include "utils/tomahawkutils.h"
+
+#define PLAYING_ICON QString( RESPATH "images/now-playing-speaker.png" )
 
 
-PlaylistItemDelegate::PlaylistItemDelegate( QAbstractItemView* parent, TrackProxyModel* proxy )
+PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel* proxy )
     : QStyledItemDelegate( (QObject*)parent )
     , m_view( parent )
     , m_model( proxy )
@@ -37,7 +41,7 @@ PlaylistItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel
 
 
 QWidget*
-PlaylistItemDelegate::createEditor ( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+PlaylistItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
     return 0;
 }
@@ -48,9 +52,7 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
 {
     PlItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
     if ( !item || item->query().isNull() )
-    {
         return;
-    }
 
     if ( item->query()->results().count() )
         painter->setOpacity( item->query()->results().at( 0 )->score() );
@@ -64,9 +66,9 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
 
         {
             QRect r = option.rect.adjusted( 3, 0, 0, -3 );
-            if ( index.column() == 0 )
+            if ( m_view->header()->visualIndex( index.column() ) == 0 )
             {
-                painter->drawPixmap( r.adjusted( 3, 3, 18 - r.width(), 0 ), QPixmap( index.data( Qt::DecorationRole ).toString() ) );
+                painter->drawPixmap( r.adjusted( 3, 3, 18 - r.width(), 0 ), QPixmap( PLAYING_ICON ) );
                 r = r.adjusted( 22, 0, 0, 0 );
             }
 
@@ -74,7 +76,7 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
             painter->drawText( r.adjusted( 0, 2, 0, 0 ), index.data().toString() );
         }
 
-        if ( index.column() == index.model()->columnCount() - 1 )
+        if ( m_view->header()->visualIndex( index.column() ) == m_view->header()->visibleSectionCount()  - 1 )
         {
             QRect r = QRect( 3, option.rect.y() + 1, m_view->viewport()->width() - 6, option.rect.height() - 2 );
             painter->setPen( option.palette.highlight().color() );
diff --git a/src/libtomahawk/playlist/playlistitemdelegate.h b/src/libtomahawk/playlist/playlistitemdelegate.h
index 8001a48b7..6469bf899 100644
--- a/src/libtomahawk/playlist/playlistitemdelegate.h
+++ b/src/libtomahawk/playlist/playlistitemdelegate.h
@@ -6,13 +6,14 @@
 #include "dllmacro.h"
 
 class TrackProxyModel;
+class TrackView;
 
 class DLLEXPORT PlaylistItemDelegate : public QStyledItemDelegate
 {
 Q_OBJECT
 
 public:
-    PlaylistItemDelegate( QAbstractItemView* parent = 0, TrackProxyModel* proxy = 0 );
+    PlaylistItemDelegate( TrackView* parent = 0, TrackProxyModel* proxy = 0 );
 
     void updateRowSize( const QModelIndex& index );
 
@@ -27,7 +28,7 @@ protected:
 
 private:
     unsigned int m_removalProgress;
-    QAbstractItemView* m_view;
+    TrackView* m_view;
     TrackProxyModel* m_model;
 };
 
diff --git a/src/libtomahawk/playlist/trackheader.cpp b/src/libtomahawk/playlist/trackheader.cpp
index 6472b24bb..bd088424c 100644
--- a/src/libtomahawk/playlist/trackheader.cpp
+++ b/src/libtomahawk/playlist/trackheader.cpp
@@ -39,6 +39,13 @@ TrackHeader::~TrackHeader()
 }
 
 
+int
+TrackHeader::visibleSectionCount() const
+{
+    return count() - hiddenSectionCount();
+}
+
+
 void
 TrackHeader::onSectionResized( int logicalidx, int oldSize, int newSize )
 {
diff --git a/src/libtomahawk/playlist/trackheader.h b/src/libtomahawk/playlist/trackheader.h
index 5f36cdba8..75db27b0d 100644
--- a/src/libtomahawk/playlist/trackheader.h
+++ b/src/libtomahawk/playlist/trackheader.h
@@ -16,6 +16,8 @@ public:
     explicit TrackHeader( TrackView* parent = 0 );
     ~TrackHeader();
 
+    int visibleSectionCount() const;
+
 public slots:
     void onResized();
     void toggleVisibility( int index );
diff --git a/src/libtomahawk/playlist/trackmodel.cpp b/src/libtomahawk/playlist/trackmodel.cpp
index 0a78a446e..7cb73631b 100644
--- a/src/libtomahawk/playlist/trackmodel.cpp
+++ b/src/libtomahawk/playlist/trackmodel.cpp
@@ -95,9 +95,6 @@ TrackModel::data( const QModelIndex& index, int role ) const
 
     if ( role == Qt::DecorationRole )
     {
-        if ( index.column() == 0 && entry->isPlaying() )
-            return QString( RESPATH "images/now-playing-speaker.png" );
-
         return QVariant();
     }