diff --git a/src/manageaudioplayer.cpp b/src/manageaudioplayer.cpp
index 6af87f9b..4aed1f7b 100644
--- a/src/manageaudioplayer.cpp
+++ b/src/manageaudioplayer.cpp
@@ -1,581 +1,581 @@
 /*
  * Copyright 2016 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "manageaudioplayer.h"
 
 #include "mediaplaylist.h"
 
 #include <QTimer>
 
 ManageAudioPlayer::ManageAudioPlayer(QObject *parent) : QObject(parent)
 {
 
 }
 
 QPersistentModelIndex ManageAudioPlayer::currentTrack() const
 {
     return mCurrentTrack;
 }
 
 QAbstractItemModel *ManageAudioPlayer::playListModel() const
 {
     return mPlayListModel;
 }
 
 int ManageAudioPlayer::urlRole() const
 {
     return mUrlRole;
 }
 
 int ManageAudioPlayer::isPlayingRole() const
 {
     return mIsPlayingRole;
 }
 
 QUrl ManageAudioPlayer::playerSource() const
 {
     if (!mCurrentTrack.isValid()) {
         return QUrl();
     }
 
     return mCurrentTrack.data(mUrlRole).toUrl();
 }
 
 QMediaPlayer::MediaStatus ManageAudioPlayer::playerStatus() const
 {
     return mPlayerStatus;
 }
 
 int ManageAudioPlayer::playerPlaybackState() const
 {
     return mPlayerPlaybackState;
 }
 
 QMediaPlayer::Error ManageAudioPlayer::playerError() const
 {
     return mPlayerError;
 }
 
 int ManageAudioPlayer::audioDuration() const
 {
     return mAudioDuration;
 }
 
 bool ManageAudioPlayer::playerIsSeekable() const
 {
     return mPlayerIsSeekable;
 }
 
 int ManageAudioPlayer::playerPosition() const
 {
     return mPlayerPosition;
 }
 
 int ManageAudioPlayer::playControlPosition() const
 {
     return mPlayerPosition;
 }
 
 QVariantMap ManageAudioPlayer::persistentState() const
 {
     auto persistentStateValue = QVariantMap();
 
     persistentStateValue[QStringLiteral("isPlaying")] = mPlayingState;
 
     persistentStateValue[QStringLiteral("playerPosition")] = mPlayerPosition;
     if (mCurrentTrack.isValid()) {
         persistentStateValue[QStringLiteral("audioPlayerCurrentTitle")] = mCurrentTrack.data(mTitleRole);
         persistentStateValue[QStringLiteral("audioPlayerCurrentArtistName")] = mCurrentTrack.data(mArtistNameRole);
         persistentStateValue[QStringLiteral("audioPlayerCurrentAlbumName")] = mCurrentTrack.data(mAlbumNameRole);
     } else {
         persistentStateValue[QStringLiteral("audioPlayerCurrentTitle")] = {};
         persistentStateValue[QStringLiteral("audioPlayerCurrentArtistName")] = {};
         persistentStateValue[QStringLiteral("audioPlayerCurrentAlbumName")] = {};
     }
 
     return persistentStateValue;
 }
 
 int ManageAudioPlayer::playListPosition() const
 {
     if (mCurrentTrack.isValid()) {
         return mCurrentTrack.row();
     }
 
     return 0;
 }
 
 int ManageAudioPlayer::titleRole() const
 {
     return mTitleRole;
 }
 
 int ManageAudioPlayer::artistNameRole() const
 {
     return mArtistNameRole;
 }
 
 int ManageAudioPlayer::albumNameRole() const
 {
     return mAlbumNameRole;
 }
 
 void ManageAudioPlayer::setCurrentTrack(const QPersistentModelIndex &currentTrack)
 {
     mOldCurrentTrack = mCurrentTrack;
 
     mCurrentTrack = currentTrack;
 
     if (mCurrentTrack.isValid()) {
         restorePreviousState();
     }
 
     mPlayerError = QMediaPlayer::NoError;
 
     if (mOldCurrentTrack != mCurrentTrack || mPlayingState) {
         Q_EMIT currentTrackChanged();
     }
 
     switch (mPlayerPlaybackState) {
     case StoppedState:
         notifyPlayerSourceProperty();
         break;
     case PlayingState:
     case PausedState:
         triggerStop();
         if (mPlayingState && !mCurrentTrack.isValid()) {
             mPlayingState = false;
         }
         mSkippingCurrentTrack = true;
         break;
     }
 }
 
 void ManageAudioPlayer::setPlayListModel(QAbstractItemModel *aPlayListModel)
 {
     if (mPlayListModel == aPlayListModel) {
         return;
     }
 
     if (mPlayListModel) {
         disconnect(mPlayListModel, &QAbstractItemModel::dataChanged, this, &ManageAudioPlayer::tracksDataChanged);
     }
 
     mPlayListModel = aPlayListModel;
 
     if (mPlayListModel) {
         connect(mPlayListModel, &QAbstractItemModel::dataChanged, this, &ManageAudioPlayer::tracksDataChanged);
     }
 
     Q_EMIT playListModelChanged();
 }
 
 void ManageAudioPlayer::setUrlRole(int value)
 {
     mUrlRole = value;
     Q_EMIT urlRoleChanged();
     notifyPlayerSourceProperty();
     restorePreviousState();
 }
 
 void ManageAudioPlayer::setIsPlayingRole(int value)
 {
     if (mIsPlayingRole == value) {
         return;
     }
 
     mIsPlayingRole = value;
     Q_EMIT isPlayingRoleChanged();
 }
 
 void ManageAudioPlayer::setPlayerStatus(QMediaPlayer::MediaStatus playerStatus)
 {
     if (mPlayerStatus == playerStatus) {
         return;
     }
 
     if (playerStatus < static_cast<int>(QMediaPlayer::UnknownMediaStatus) || playerStatus > static_cast<int>(QMediaPlayer::InvalidMedia)) {
         return;
     }
 
     mPlayerStatus = static_cast<QMediaPlayer::MediaStatus>(playerStatus);
     Q_EMIT playerStatusChanged();
 
     switch (mPlayerStatus) {
     case QMediaPlayer::NoMedia:
         break;
     case QMediaPlayer::LoadingMedia:
         break;
     case QMediaPlayer::LoadedMedia:
         if (mPlayingState) {
             triggerPlay();
         }
         break;
     case QMediaPlayer::BufferingMedia:
         break;
     case QMediaPlayer::StalledMedia:
         break;
     case QMediaPlayer::BufferedMedia:
         break;
     case QMediaPlayer::EndOfMedia:
         break;
     case QMediaPlayer::InvalidMedia:
         triggerSkipNextTrack();
         break;
     case QMediaPlayer::UnknownMediaStatus:
         break;
     }
 }
 
 void ManageAudioPlayer::setPlayerPlaybackState(int playerPlaybackState)
 {
     if (mPlayerPlaybackState == playerPlaybackState) {
         return;
     }
 
     if (playerPlaybackState < static_cast<int>(StoppedState) || playerPlaybackState > static_cast<int>(PausedState)) {
         return;
     }
 
     mPlayerPlaybackState = static_cast<PlayerPlaybackState>(playerPlaybackState);
     Q_EMIT playerPlaybackStateChanged();
 
     if (!mSkippingCurrentTrack) {
         switch(mPlayerPlaybackState) {
         case StoppedState:
             if (mPlayerStatus == QMediaPlayer::EndOfMedia || mPlayerStatus == QMediaPlayer::InvalidMedia) {
                 triggerSkipNextTrack();
             }
             if (mPlayListModel && mCurrentTrack.isValid()) {
                 mPlayListModel->setData(mCurrentTrack, MediaPlayList::NotPlaying, mIsPlayingRole);
             }
             break;
         case PlayingState:
             if (mPlayListModel && mCurrentTrack.isValid()) {
                 mPlayListModel->setData(mCurrentTrack, MediaPlayList::IsPlaying, mIsPlayingRole);
             }
             break;
         case PausedState:
             if (mPlayListModel && mCurrentTrack.isValid()) {
                 mPlayListModel->setData(mCurrentTrack, MediaPlayList::IsPaused, mIsPlayingRole);
             }
             break;
         }
     } else {
         switch(mPlayerPlaybackState) {
         case StoppedState:
             notifyPlayerSourceProperty();
             mSkippingCurrentTrack = false;
             if (mPlayListModel && mOldCurrentTrack.isValid()) {
                 mPlayListModel->setData(mOldCurrentTrack, MediaPlayList::NotPlaying, mIsPlayingRole);
             }
             break;
         case PlayingState:
             if (mPlayListModel && mCurrentTrack.isValid()) {
                 mPlayListModel->setData(mCurrentTrack, MediaPlayList::IsPlaying, mIsPlayingRole);
             }
             break;
         case PausedState:
             if (mPlayListModel && mCurrentTrack.isValid()) {
                 mPlayListModel->setData(mCurrentTrack, MediaPlayList::IsPaused, mIsPlayingRole);
             }
             break;
         }
     }
 }
 
 void ManageAudioPlayer::setPlayerError(QMediaPlayer::Error playerError)
 {
     if (mPlayerError == playerError) {
         return;
     }
 
     mPlayerError = playerError;
     Q_EMIT playerErrorChanged();
 
     if (mPlayerError != QMediaPlayer::NoError) {
         auto currentSource = playerSource();
 
         Q_EMIT sourceInError(currentSource, mPlayerError);
 
         if (currentSource.isLocalFile()) {
             Q_EMIT displayTrackError(currentSource.toLocalFile());
         } else {
             Q_EMIT displayTrackError(currentSource.toString());
         }
     }
 }
 
 void ManageAudioPlayer::ensurePause()
 {
     if (mPlayingState) {
         mPlayingState = false;
         triggerPause();
     }
 }
 
 void ManageAudioPlayer::ensurePlay()
 {
     if (!mPlayingState) {
         mPlayingState = true;
         triggerPlay();
     }
 }
 
 void ManageAudioPlayer::stop()
 {
     mPlayingState = false;
     triggerStop();
 }
 
 void ManageAudioPlayer::playPause()
 {
     mPlayingState = !mPlayingState;
 
     switch (mPlayerStatus) {
     case QMediaPlayer::LoadedMedia:
     case QMediaPlayer::BufferingMedia:
     case QMediaPlayer::BufferedMedia:
     case QMediaPlayer::LoadingMedia:
         if (mPlayingState) {
             triggerPlay();
         } else {
             triggerPause();
         }
         break;
     case QMediaPlayer::EndOfMedia:
         if (mPlayerPlaybackState == PlayingState && !mPlayingState) {
             triggerPause();
         } else if (mPlayerPlaybackState == PausedState && mPlayingState) {
             triggerPlay();
         }
         break;
     case QMediaPlayer::NoMedia:
     case QMediaPlayer::StalledMedia:
     case QMediaPlayer::InvalidMedia:
     case QMediaPlayer::UnknownMediaStatus:
         break;
     }
 }
 
 void ManageAudioPlayer::setAudioDuration(int audioDuration)
 {
     if (mAudioDuration == audioDuration) {
         return;
     }
 
     mAudioDuration = audioDuration;
     Q_EMIT audioDurationChanged();
 }
 
 void ManageAudioPlayer::setPlayerIsSeekable(bool playerIsSeekable)
 {
     if (mPlayerIsSeekable == playerIsSeekable) {
         return;
     }
 
     mPlayerIsSeekable = playerIsSeekable;
     Q_EMIT playerIsSeekableChanged();
 }
 
 void ManageAudioPlayer::setPlayerPosition(int playerPosition)
 {
     if (mPlayerPosition == playerPosition) {
         return;
     }
 
     mPlayerPosition = playerPosition;
     Q_EMIT playerPositionChanged();
     QTimer::singleShot(0, [this]() {Q_EMIT playControlPositionChanged();});
 }
 
 void ManageAudioPlayer::setPlayControlPosition(int playerPosition)
 {
     Q_EMIT seek(playerPosition);
 }
 
 void ManageAudioPlayer::setPersistentState(const QVariantMap &persistentStateValue)
 {
     if (mPersistentState == persistentStateValue) {
         return;
     }
 
     mPersistentState = persistentStateValue;
 
     Q_EMIT persistentStateChanged();
 
     if (mCurrentTrack.isValid()) {
         restorePreviousState();
     }
 }
 
 void ManageAudioPlayer::playerSeek(int position)
 {
     Q_EMIT seek(position);
 }
 
 void ManageAudioPlayer::playListFinished()
 {
     mPlayingState = false;
 }
 
 void ManageAudioPlayer::tracksDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
 {
     if (!mCurrentTrack.isValid()) {
         return;
     }
 
     if (mCurrentTrack.row() > bottomRight.row() || mCurrentTrack.row() < topLeft.row()) {
         return;
     }
 
     if (mCurrentTrack.column() > bottomRight.column() || mCurrentTrack.column() < topLeft.column()) {
         return;
     }
 
     if (roles.isEmpty()) {
         notifyPlayerSourceProperty();
         restorePreviousState();
     } else {
         for(auto oneRole : roles) {
             if (oneRole == mUrlRole) {
                 notifyPlayerSourceProperty();
                 restorePreviousState();
             }
         }
     }
 }
 
 void ManageAudioPlayer::setTitleRole(int titleRole)
 {
     if (mTitleRole == titleRole) {
         return;
     }
 
     mTitleRole = titleRole;
     Q_EMIT titleRoleChanged();
 
     if (mCurrentTrack.isValid()) {
         restorePreviousState();
     }
 }
 
 void ManageAudioPlayer::setArtistNameRole(int artistNameRole)
 {
     if (mArtistNameRole == artistNameRole) {
         return;
     }
 
     mArtistNameRole = artistNameRole;
     Q_EMIT artistNameRoleChanged();
 
     if (mCurrentTrack.isValid()) {
         restorePreviousState();
     }
 }
 
 void ManageAudioPlayer::setAlbumNameRole(int albumNameRole)
 {
     if (mAlbumNameRole == albumNameRole) {
         return;
     }
 
     mAlbumNameRole = albumNameRole;
     Q_EMIT albumNameRoleChanged();
 
     if (mCurrentTrack.isValid()) {
         restorePreviousState();
     }
 }
 
 void ManageAudioPlayer::notifyPlayerSourceProperty()
 {
     auto newUrlValue = mCurrentTrack.data(mUrlRole);
-    if ((mCurrentTrack == mOldCurrentTrack && mOldPlayerSource == newUrlValue && mPlayingState) || mOldPlayerSource != newUrlValue) {
+    if (mSkippingCurrentTrack || mOldPlayerSource != newUrlValue) {
         Q_EMIT playerSourceChanged(mCurrentTrack.data(mUrlRole).toUrl());
 
         mOldPlayerSource = newUrlValue;
     }
 }
 
 void ManageAudioPlayer::triggerPlay()
 {
     QTimer::singleShot(0, [this]() {Q_EMIT playerPlay();});
 }
 
 void ManageAudioPlayer::triggerPause()
 {
     QTimer::singleShot(0, [this]() {Q_EMIT playerPause();});
 }
 
 void ManageAudioPlayer::triggerStop()
 {
     QTimer::singleShot(0, [this]() {Q_EMIT playerStop();});
 }
 
 void ManageAudioPlayer::triggerSkipNextTrack()
 {
     QTimer::singleShot(0, [this]() {Q_EMIT skipNextTrack();});
 }
 
 void ManageAudioPlayer::restorePreviousState()
 {
     if (mPersistentState.isEmpty()) {
         return;
     }
 
     auto itTitle = mPersistentState.find(QStringLiteral("audioPlayerCurrentTitle"));
     auto itArtistName = mPersistentState.find(QStringLiteral("audioPlayerCurrentArtistName"));
     auto itAlbumName = mPersistentState.find(QStringLiteral("audioPlayerCurrentAlbumName"));
 
     if (itTitle == mPersistentState.end() || itArtistName == mPersistentState.end() ||
             itAlbumName == mPersistentState.end()) {
         return;
     }
 
     if (*itTitle != mCurrentTrack.data(mTitleRole) || *itArtistName != mCurrentTrack.data(mArtistNameRole) ||
             *itAlbumName != mCurrentTrack.data(mAlbumNameRole)) {
         if (mCurrentTrack.isValid() && mCurrentTrack.data(mTitleRole).isValid() && mCurrentTrack.data(mArtistNameRole).isValid() &&
                 mCurrentTrack.data(mAlbumNameRole).isValid()) {
             mPersistentState.clear();
         }
 
         return;
     }
 
     if (!mCurrentTrack.data(mUrlRole).toUrl().isValid()) {
         return;
     }
 
     auto isPlaying = mPersistentState.find(QStringLiteral("isPlaying"));
     if (isPlaying != mPersistentState.end() && mPlayingState != isPlaying->toBool()) {
         mPlayingState = isPlaying->toBool();
     }
 
     auto playerPosition = mPersistentState.find(QStringLiteral("playerPosition"));
     if (playerPosition != mPersistentState.end()) {
         mPlayerPosition = playerPosition->toInt();
         Q_EMIT seek(mPlayerPosition);
     }
 
     mPersistentState.clear();
 }
 
 
 #include "moc_manageaudioplayer.cpp"
diff --git a/src/qml/PlayListEntry.qml b/src/qml/PlayListEntry.qml
index ad8765d4..a930451d 100644
--- a/src/qml/PlayListEntry.qml
+++ b/src/qml/PlayListEntry.qml
@@ -1,604 +1,604 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.3
 import QtQuick.Controls 1.4 as Controls1
 import QtQuick.Window 2.2
 import QtGraphicalEffects 1.0
 import org.kde.elisa 1.0
 
 FocusScope {
     id: playListEntry
 
     property var index
     property bool isSingleDiscAlbum
     property int isPlaying
     property bool isSelected
     property bool isValid
     property bool isAlternateColor
     property bool containsMouse
     property bool hasAlbumHeader
     property string titleDisplay
     property string albumDisplay
     property string albumArtistDisplay
     property string artistDisplay
     property alias trackData: dataHelper.trackData
     property int scrollBarWidth
 
     signal startPlayback()
     signal pausePlayback()
     signal removeFromPlaylist(var trackIndex)
     signal switchToTrack(var trackIndex)
 
-    height: (hasAlbumHeader ? elisaTheme.delegateWithHeaderHeight : elisaTheme.delegateHeight)
+    height: (hasAlbumHeader ? elisaTheme.playListDelegateWithHeaderHeight : elisaTheme.playListDelegateHeight)
 
     Controls1.Action {
         id: removeFromPlayList
         text: i18nc("Remove current track from play list", "Remove")
         iconName: "error"
         onTriggered: {
             playListEntry.removeFromPlaylist(playListEntry.index)
         }
     }
 
     Controls1.Action {
         id: playNow
         text: i18nc("Play now current track from play list", "Play Now")
         iconName: "media-playback-start"
         enabled: !(isPlaying === MediaPlayList.IsPlaying) && isValid
         onTriggered: {
             if (isPlaying === MediaPlayList.NotPlaying) {
                 playListEntry.switchToTrack(playListEntry.index)
             }
             playListEntry.startPlayback()
         }
     }
 
     Controls1.Action {
         id: pauseNow
         text: i18nc("Pause current track from play list", "Pause")
         iconName: "media-playback-pause"
         enabled: isPlaying == MediaPlayList.IsPlaying && isValid
         onTriggered: playListEntry.pausePlayback()
     }
 
     Controls1.Action {
         id: showInfo
         text: i18nc("Show track metadata", "View Details")
         iconName: "help-about"
         enabled: isValid
         onTriggered: {
             if (metadataLoader.active === false) {
                 metadataLoader.active = true
             }
             else {
                 metadataLoader.item.close();
                 metadataLoader.active = false
             }
         }
     }
 
     TrackDataHelper {
         id: dataHelper
     }
 
     Loader {
         id: metadataLoader
         active: false
         onLoaded: item.show()
 
         sourceComponent:  MediaTrackMetadataView {
             trackDataHelper: dataHelper
 
             onRejected: metadataLoader.active = false;
         }
     }
 
     Rectangle {
         id: entryBackground
 
         anchors.fill: parent
         anchors.rightMargin: LayoutMirroring.enabled ? scrollBarWidth : 0
 
         color: (isAlternateColor ? myPalette.alternateBase : myPalette.base)
 
-        height: (hasAlbumHeader ? elisaTheme.delegateWithHeaderHeight : elisaTheme.delegateHeight)
+        height: (hasAlbumHeader ? elisaTheme.playListDelegateWithHeaderHeight : elisaTheme.playListDelegateHeight)
 
         focus: true
 
         ColumnLayout {
             spacing: 0
 
             anchors.fill: parent
 
             Loader {
                 Layout.fillWidth: true
-                Layout.preferredHeight: elisaTheme.delegateWithHeaderHeight - elisaTheme.delegateHeight
-                Layout.minimumHeight: elisaTheme.delegateWithHeaderHeight - elisaTheme.delegateHeight
-                Layout.maximumHeight: elisaTheme.delegateWithHeaderHeight - elisaTheme.delegateHeight
+                Layout.preferredHeight: elisaTheme.playListDelegateWithHeaderHeight - elisaTheme.playListDelegateHeight
+                Layout.minimumHeight: elisaTheme.playListDelegateWithHeaderHeight - elisaTheme.playListDelegateHeight
+                Layout.maximumHeight: elisaTheme.playListDelegateWithHeaderHeight - elisaTheme.playListDelegateHeight
 
                 visible: hasAlbumHeader
                 active: hasAlbumHeader
 
                 sourceComponent: Rectangle {
                     color: myPalette.midlight
 
                     anchors.fill: parent
 
                     RowLayout {
                         id: headerRow
 
                         spacing: elisaTheme.layoutHorizontalMargin
 
                         anchors.fill: parent
                         anchors.topMargin: elisaTheme.layoutVerticalMargin * 1.5
                         anchors.bottomMargin: elisaTheme.layoutVerticalMargin * 1.5
 
                         Image {
                             id: mainIcon
 
                             source: (isValid ? (dataHelper.hasValidAlbumCover ? dataHelper.albumCover : Qt.resolvedUrl(elisaTheme.defaultAlbumImage)) : Qt.resolvedUrl(elisaTheme.errorIcon))
 
                             Layout.minimumWidth: headerRow.height
                             Layout.maximumWidth: headerRow.height
                             Layout.preferredWidth: headerRow.height
                             Layout.minimumHeight: headerRow.height
                             Layout.maximumHeight: headerRow.height
                             Layout.preferredHeight: headerRow.height
                             Layout.leftMargin: !LayoutMirroring.enabled ?
                                                    (elisaTheme.smallDelegateToolButtonSize +
                                                     trackNumberSize.width +
                                                     fakeDiscNumberSize.width +
                                                     (elisaTheme.layoutHorizontalMargin * 3 / 4) -
                                                     headerRow.height) :
                                                    0
                             Layout.rightMargin: LayoutMirroring.enabled ?
-                                                   (elisaTheme.smallDelegateToolButtonSize +
-                                                    trackNumberSize.width +
-                                                    fakeDiscNumberSize.width +
-                                                    (elisaTheme.layoutHorizontalMargin * 3 / 4) -
-                                                    headerRow.height) :
-                                                   0
+                                                    (elisaTheme.smallDelegateToolButtonSize +
+                                                     trackNumberSize.width +
+                                                     fakeDiscNumberSize.width +
+                                                     (elisaTheme.layoutHorizontalMargin * 3 / 4) -
+                                                     headerRow.height) :
+                                                    0
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                             sourceSize.width: headerRow.height
                             sourceSize.height: headerRow.height
 
                             fillMode: Image.PreserveAspectFit
                             asynchronous: true
 
                             visible: isValid
                         }
 
                         BrightnessContrast {
                             source: mainIcon
 
                             cached: true
 
                             visible: !isValid
 
                             contrast: -0.9
 
                             Layout.minimumWidth: headerRow.height - 4
                             Layout.maximumWidth: headerRow.height - 4
                             Layout.preferredWidth: headerRow.height - 4
                             Layout.minimumHeight: headerRow.height - 4
                             Layout.maximumHeight: headerRow.height - 4
                             Layout.preferredHeight: headerRow.height - 4
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                         }
 
                         ColumnLayout {
                             id: albumHeaderTextColumn
 
                             Layout.fillWidth: true
                             Layout.fillHeight: true
                             Layout.leftMargin: !LayoutMirroring.enabled ? - elisaTheme.layoutHorizontalMargin / 4 : 0
                             Layout.rightMargin: LayoutMirroring.enabled ? - elisaTheme.layoutHorizontalMargin / 4 : 0
 
                             spacing: 0
 
                             LabelWithToolTip {
                                 id: mainLabel
                                 text: albumDisplay
 
                                 font.weight: Font.Bold
                                 font.pointSize: elisaTheme.defaultFontPointSize * 1.4
                                 color: myPalette.text
 
                                 horizontalAlignment: Text.AlignLeft
 
                                 Layout.fillWidth: true
                                 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
                                 Layout.topMargin: elisaTheme.layoutVerticalMargin
 
                                 elide: Text.ElideRight
                             }
 
                             Item {
                                 Layout.fillHeight: true
                             }
 
                             LabelWithToolTip {
                                 id: authorLabel
 
                                 text: albumArtistDisplay
 
                                 font.weight: Font.Light
                                 color: myPalette.text
 
                                 horizontalAlignment: Text.AlignLeft
 
                                 Layout.fillWidth: true
                                 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
                                 Layout.bottomMargin: elisaTheme.layoutVerticalMargin
 
                                 elide: Text.ElideRight
                             }
                         }
                     }
                 }
             }
 
             Item {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
 
                 RowLayout {
                     id: trackRow
 
                     anchors.fill: parent
 
                     spacing: elisaTheme.layoutHorizontalMargin / 4
 
                     Item {
                         id: playIconItem
 
                         implicitHeight: elisaTheme.smallDelegateToolButtonSize
                         implicitWidth: elisaTheme.smallDelegateToolButtonSize
                         Layout.maximumWidth: elisaTheme.smallDelegateToolButtonSize
                         Layout.maximumHeight: elisaTheme.smallDelegateToolButtonSize
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                         Image {
                             id: playIcon
 
                             anchors.fill: parent
 
                             opacity: 0
 
                             source: (isPlaying === MediaPlayList.IsPlaying ?
                                          Qt.resolvedUrl(elisaTheme.playingIndicatorIcon) : Qt.resolvedUrl(elisaTheme.pausedIndicatorIcon))
 
                             width: parent.height * 1.
                             height: parent.height * 1.
 
                             sourceSize.width: parent.height * 1.
                             sourceSize.height: parent.height * 1.
                             fillMode: Image.PreserveAspectFit
                             mirror: LayoutMirroring.enabled
                             visible: opacity > 0.0
                         }
                     }
 
                     Item {
                         id: fakeDiscNumberItem
 
                         visible: isValid && (!dataHelper.hasValidDiscNumber || isSingleDiscAlbum)
 
                         Layout.preferredWidth: fakeDiscNumberSize.width + (elisaTheme.layoutHorizontalMargin / 4)
                         Layout.minimumWidth: fakeDiscNumberSize.width + (elisaTheme.layoutHorizontalMargin / 4)
                         Layout.maximumWidth: fakeDiscNumberSize.width + (elisaTheme.layoutHorizontalMargin / 4)
 
                         TextMetrics {
                             id: fakeDiscNumberSize
 
                             text: '/9'
                         }
                     }
 
                     Label {
                         id: trackNumberLabel
 
                         horizontalAlignment: Text.AlignRight
 
                         text: dataHelper.hasValidTrackNumber ? Number(dataHelper.trackNumber).toLocaleString(Qt.locale(), 'f', 0) : ''
 
                         font.weight: (isPlaying ? Font.Bold : Font.Light)
                         color: myPalette.text
 
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
 
                         visible: isValid
 
                         Layout.preferredWidth: (trackNumberSize.width > realTrackNumberSize.width ? trackNumberSize.width : realTrackNumberSize.width)
                         Layout.minimumWidth: (trackNumberSize.width > realTrackNumberSize.width ? trackNumberSize.width : realTrackNumberSize.width)
                         Layout.maximumWidth: (trackNumberSize.width > realTrackNumberSize.width ? trackNumberSize.width : realTrackNumberSize.width)
 
                         Layout.rightMargin: !LayoutMirroring.enabled ? (dataHelper.hasValidDiscNumber && !isSingleDiscAlbum ?
                                                                             0 : elisaTheme.layoutHorizontalMargin / 2) : 0
                         Layout.leftMargin: LayoutMirroring.enabled ? (dataHelper.hasValidDiscNumber && !isSingleDiscAlbum ?
                                                                           0 : elisaTheme.layoutHorizontalMargin / 2) : 0
 
                         TextMetrics {
                             id: trackNumberSize
 
                             text: (99).toLocaleString(Qt.locale(), 'f', 0)
                         }
 
                         TextMetrics {
                             id: realTrackNumberSize
 
                             text: Number(dataHelper.trackNumber).toLocaleString(Qt.locale(), 'f', 0)
                         }
                     }
 
                     Label {
                         horizontalAlignment: Text.AlignCenter
 
                         text: '/'
 
                         visible: isValid && dataHelper.hasValidDiscNumber && !isSingleDiscAlbum
 
                         font.weight: (isPlaying ? Font.Bold : Font.Light)
                         color: myPalette.text
 
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                         Layout.preferredWidth: numberSeparatorSize.width
                         Layout.minimumWidth: numberSeparatorSize.width
                         Layout.maximumWidth: numberSeparatorSize.width
 
                         TextMetrics {
                             id: numberSeparatorSize
 
                             text: '/'
                         }
                     }
 
                     Label {
                         horizontalAlignment: Text.AlignRight
 
                         font.weight: (isPlaying ? Font.Bold : Font.Light)
                         color: myPalette.text
 
                         text: Number(dataHelper.discNumber).toLocaleString(Qt.locale(), 'f', 0)
 
                         visible: isValid && dataHelper.hasValidDiscNumber && !isSingleDiscAlbum
 
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
 
                         Layout.preferredWidth: (discNumberSize.width > realDiscNumberSize.width ? discNumberSize.width : realDiscNumberSize.width)
                         Layout.minimumWidth: (discNumberSize.width > realDiscNumberSize.width ? discNumberSize.width : realDiscNumberSize.width)
                         Layout.maximumWidth: (discNumberSize.width > realDiscNumberSize.width ? discNumberSize.width : realDiscNumberSize.width)
 
                         Layout.rightMargin: !LayoutMirroring.enabled ? (elisaTheme.layoutHorizontalMargin / 2) : 0
                         Layout.leftMargin: LayoutMirroring.enabled ? (elisaTheme.layoutHorizontalMargin / 2) : 0
 
                         TextMetrics {
                             id: discNumberSize
 
                             text: '9'
                         }
 
                         TextMetrics {
                             id: realDiscNumberSize
 
                             text: Number(dataHelper.discNumber).toLocaleString(Qt.locale(), 'f', 0)
                         }
                     }
 
                     LabelWithToolTip {
                         id: mainCompactLabel
 
                         text: titleDisplay
 
                         font.weight: (isPlaying ? Font.Bold : Font.Normal)
                         color: myPalette.text
 
                         Layout.maximumWidth: mainCompactLabel.implicitWidth + 1
                         Layout.fillWidth: true
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 
                         visible: isValid
 
                         elide: Text.ElideRight
                         horizontalAlignment: Text.AlignLeft
                     }
 
                     LabelWithToolTip {
                         id: mainInvalidCompactLabel
 
                         text: titleDisplay
 
                         font.weight: Font.Normal
                         color: myPalette.text
 
                         Layout.fillWidth: true
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 
                         visible: !isValid
 
                         elide: Text.ElideRight
                     }
 
                     Item {
                         Layout.fillWidth: true
                         Layout.preferredWidth: 0
                     }
 
                     Controls1.ToolButton {
                         id: infoButton
                         objectName: 'infoButton'
 
                         implicitHeight: elisaTheme.smallDelegateToolButtonSize
                         implicitWidth: elisaTheme.smallDelegateToolButtonSize
 
                         opacity: 0
 
                         visible: opacity > 0.1
 
                         action: showInfo
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
                     }
 
                     Controls1.ToolButton {
                         id: playPauseButton
                         objectName: 'playPauseButton'
 
                         implicitHeight: elisaTheme.smallDelegateToolButtonSize
                         implicitWidth: elisaTheme.smallDelegateToolButtonSize
 
                         opacity: 0
 
                         scale: LayoutMirroring.enabled ? -1 : 1 // We can mirror the symmetrical pause icon
 
                         visible: opacity > 0.1
                         action: !(isPlaying === MediaPlayList.IsPlaying) ? playNow : pauseNow
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
                     }
 
                     Item {
                         implicitHeight: elisaTheme.smallDelegateToolButtonSize
                         implicitWidth: elisaTheme.smallDelegateToolButtonSize
                         Layout.maximumWidth: elisaTheme.smallDelegateToolButtonSize
                         Layout.maximumHeight: elisaTheme.smallDelegateToolButtonSize
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                         Controls1.ToolButton {
                             id: removeButton
                             objectName: 'removeButton'
 
                             anchors.fill: parent
 
                             opacity: 0
 
                             visible: opacity > 0.1
                             action: removeFromPlayList
                         }
                     }
 
                     RatingStar {
                         id: ratingWidget
 
                         starRating: dataHelper.rating
 
                         starSize: elisaTheme.ratingStarSize
                     }
 
                     TextMetrics {
                         id: durationTextMetrics
                         text: i18nc("This is used to preserve a fixed width for the duration text.", "00:00")
                     }
 
                     LabelWithToolTip {
                         id: durationLabel
 
                         text: dataHelper.duration
 
                         font.weight: (isPlaying ? Font.Bold : Font.Normal)
                         color: myPalette.text
 
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
                         Layout.preferredWidth: durationTextMetrics.width + 1
                         Layout.leftMargin: elisaTheme.layoutHorizontalMargin / 2
                         Layout.rightMargin: elisaTheme.layoutHorizontalMargin / 2
 
                         horizontalAlignment: Text.AlignRight
                     }
                 }
             }
         }
     }
 
     states: [
         State {
             name: 'notSelected'
             when: !containsMouse && (!playListEntry.activeFocus || !isSelected)
             PropertyChanges {
                 target: removeButton
                 opacity: 0
             }
             PropertyChanges {
                 target: infoButton
                 opacity: 0
             }
             PropertyChanges {
                 target: playPauseButton
                 opacity: 0
             }
             PropertyChanges {
                 target: playIcon
                 opacity: (isPlaying === MediaPlayList.IsPlaying || isPlaying === MediaPlayList.IsPaused ? 1.0 : 0.0)
             }
             PropertyChanges {
                 target: entryBackground
                 color: (isAlternateColor ? myPalette.alternateBase : myPalette.base)
             }
             PropertyChanges {
                 target: ratingWidget
                 hoverWidgetOpacity: 0.0
             }
         },
         State {
             name: 'hoveredOrSelected'
             when: containsMouse || (playListEntry.activeFocus && isSelected)
             PropertyChanges {
                 target: removeButton
                 opacity: 1
             }
             PropertyChanges {
                 target: playPauseButton
                 opacity: 1
             }
             PropertyChanges {
                 target: infoButton
                 opacity: 1
             }
             PropertyChanges {
                 target: playIcon
                 opacity: (isPlaying === MediaPlayList.IsPlaying || isPlaying === MediaPlayList.IsPaused ? 1.0 : 0.0)
             }
             PropertyChanges {
                 target: entryBackground
                 color: myPalette.mid
             }
             PropertyChanges {
                 target: ratingWidget
                 hoverWidgetOpacity: 1.0
             }
         }
     ]
     transitions: Transition {
         ParallelAnimation {
             NumberAnimation {
                 properties: "opacity, hoverWidgetOpacity"
                 easing.type: Easing.InOutQuad
                 duration: 250
             }
             ColorAnimation {
                 properties: "color"
                 duration: 250
             }
         }
     }
 }
 
diff --git a/src/qml/Theme.qml b/src/qml/Theme.qml
index 7e2e2372..81d647b0 100644
--- a/src/qml/Theme.qml
+++ b/src/qml/Theme.qml
@@ -1,100 +1,122 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
 Item {
     function dp(pixel) {
         // 96 - common, "base" DPI value
         return Math.round(pixel * logicalDpi / 96);
     }
 
     property string defaultAlbumImage: 'image://icon/media-optical-audio'
     property string defaultArtistImage: 'image://icon/view-media-artist'
     property string defaultBackgroundImage: 'qrc:///background.png'
     property string artistIcon: 'image://icon/view-media-artist'
     property string albumIcon: 'image://icon/view-media-album-cover'
     property string playlistIcon: 'image://icon/view-media-playlist'
     property string tracksIcon: 'image://icon/view-media-track'
     property string genresIcon: 'image://icon/view-media-genre'
     property string clearIcon: 'image://icon/edit-clear'
     property string skipBackwardIcon: 'image://icon/media-skip-backward'
     property string pauseIcon: 'image://icon/media-playback-pause'
     property string playIcon: 'image://icon/media-playback-start'
     property string skipForwardIcon: 'image://icon/media-skip-forward'
     property string pausedIndicatorIcon: 'image://icon/media-playback-paused'
     property string playingIndicatorIcon: 'image://icon/media-playback-playing'
     property string playerVolumeMutedIcon: 'image://icon/player-volume-muted'
     property string playerVolumeIcon: 'image://icon/player-volume'
     property string ratingIcon: 'image://icon/rating'
     property string ratingUnratedIcon: 'image://icon/rating-unrated'
     property string errorIcon: 'image://icon/error'
     property string repeatIcon: 'image://icon/media-repeat-all'
     property string shuffleIcon: 'image://icon/media-playlist-shuffle'
     property string noRepeatIcon: 'image://icon/media-repeat-none'
     property string noShuffleIcon: 'image://icon/media-playlist-normal'
     property string folderIcon: 'image://icon/document-open-folder'
     property string maximizeIcon: 'image://icon/draw-arrow-down'
     property string minimizeIcon: 'image://icon/draw-arrow-up'
 
     property int layoutHorizontalMargin: dp(8)
     property int layoutVerticalMargin: dp(6)
 
     property int delegateHeight: dp(28)
-    property int delegateWithHeaderHeight: dp(86)
+
+    FontMetrics {
+        id: playListAuthorTextHeight
+        font.weight: Font.Light
+    }
+
+    FontMetrics {
+        id: playListAlbumTextHeight
+        font.weight: Font.Bold
+        font.pointSize: elisaTheme.defaultFontPointSize * 1.4
+    }
+
+    FontMetrics {
+        id: playListTrackTextHeight
+        font.weight: Font.Bold
+    }
+
+    property int playListDelegateHeight: (playListTrackTextHeight.height > dp(28)) ? playListTrackTextHeight.height : dp(28)
+    property int playListDelegateWithHeaderHeight: playListDelegateHeight +
+                                                   elisaTheme.layoutVerticalMargin * 5 +
+                                                   playListAuthorTextHeight.height +
+                                                   playListAlbumTextHeight.height
+
     property int trackDelegateHeight: dp(45)
 
     property int coverImageSize: dp(180)
     property int smallImageSize: dp(32)
 
     property int maximumMetadataWidth: dp(300)
 
     property int tooltipRadius: dp(3)
     property int shadowOffset: dp(2)
 
     property int delegateToolButtonSize: dp(34)
     property int smallDelegateToolButtonSize: dp(20)
 
     property int ratingStarSize: dp(15)
 
     property int mediaPlayerControlHeight: dp(42)
     property int mediaPlayerHorizontalMargin: dp(10)
     property real mediaPlayerControlOpacity: 0.6
     property int smallControlButtonSize: dp(22)
     property int volumeSliderWidth: dp(100)
 
     property int dragDropPlaceholderHeight: dp(28)
 
     property int navigationBarHeight: dp(100)
     property int navigationBarFilterHeight: dp(44)
 
     property int gridDelegateHeight: dp(100) + layoutVerticalMargin + fontSize.height * 2
     property int gridDelegateWidth: dp(100)
 
     property int viewSelectorDelegateHeight: dp(24)
 
     property int filterClearButtonMargin: layoutVerticalMargin
 
     property alias defaultFontPointSize: fontSize.font.pointSize
 
     Label {
         id: fontSize
     }
 }
diff --git a/src/windows/WindowsTheme.qml b/src/windows/WindowsTheme.qml
index e079ebb8..0a0dc32b 100644
--- a/src/windows/WindowsTheme.qml
+++ b/src/windows/WindowsTheme.qml
@@ -1,100 +1,117 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
 Item {
     function dp(pixel) {
         // 96 - common, "base" DPI value
         return Math.round(pixel * logicalDpi / 96);
     }
 
     property string defaultAlbumImage: 'image://icon/media-optical-audio'
     property string defaultArtistImage: 'image://icon/view-media-artist'
     property string defaultBackgroundImage: 'qrc:///background.png'
     property string artistIcon: 'image://icon/view-media-artist'
     property string albumIcon: 'image://icon/view-media-album-cover'
     property string playlistIcon: 'image://icon/view-media-playlist'
     property string tracksIcon: 'image://icon/view-media-track'
     property string genresIcon: 'image://icon/view-media-genre'
     property string clearIcon: 'image://icon/edit-clear'
     property string skipBackwardIcon: 'image://icon/media-skip-backward'
     property string pauseIcon: 'image://icon/media-playback-pause'
     property string playIcon: 'image://icon/media-playback-start'
     property string skipForwardIcon: 'image://icon/media-skip-forward'
     property string pausedIndicatorIcon: 'image://icon/media-playback-paused'
     property string playingIndicatorIcon: 'image://icon/media-playback-playing'
     property string playerVolumeMutedIcon: 'image://icon/player-volume-muted'
     property string playerVolumeIcon: 'image://icon/player-volume'
     property string ratingIcon: 'image://icon/rating'
     property string ratingUnratedIcon: 'image://icon/rating-unrated'
     property string errorIcon: 'image://icon/error'
     property string repeatIcon: 'image://icon/media-repeat-all'
     property string shuffleIcon: 'image://icon/media-playlist-shuffle'
     property string noRepeatIcon: 'image://icon/media-repeat-none'
     property string noShuffleIcon: 'image://icon/media-playlist-normal'
     property string folderIcon: 'image://icon/document-open-folder'
     property string maximizeIcon: 'image://icon/draw-arrow-down'
     property string minimizeIcon: 'image://icon/draw-arrow-up'
 
     property int layoutHorizontalMargin: dp(8)
     property int layoutVerticalMargin: dp(6)
 
     property int delegateHeight: dp(28)
-    property int delegateWithHeaderHeight: dp(86)
+
+    FontMetrics {
+        id: playListAuthorTextHeight
+        font.weight: Font.Light
+    }
+
+    FontMetrics {
+        id: playListTitleTextHeight
+        font.weight: Font.Bold
+        font.pointSize: elisaTheme.defaultFontPointSize * 1.4
+    }
+
+    property int playListDelegateHeight: dp(28)
+    property int playListDelegateWithHeaderHeight: playListDelegateHeight +
+                                                   elisaTheme.layoutVerticalMargin * 5 +
+                                                   playListAuthorTextHeight.height +
+                                                   playListTitleTextHeight.height
+
     property int trackDelegateHeight: dp(45)
 
     property int coverImageSize: dp(180)
     property int smallImageSize: dp(32)
 
     property int maximumMetadataWidth: dp(300)
 
     property int tooltipRadius: dp(3)
     property int shadowOffset: dp(2)
 
     property int delegateToolButtonSize: dp(34)
     property int smallDelegateToolButtonSize: dp(20)
 
     property int ratingStarSize: dp(15)
 
     property int mediaPlayerControlHeight: dp(42)
     property int mediaPlayerHorizontalMargin: dp(10)
     property real mediaPlayerControlOpacity: 0.8
     property int smallControlButtonSize: dp(22)
     property int volumeSliderWidth: dp(100)
 
     property int dragDropPlaceholderHeight: dp(28)
 
     property int navigationBarHeight: dp(100)
     property int navigationBarFilterHeight: dp(44)
 
     property int gridDelegateHeight: dp(100) + layoutVerticalMargin + fontSize.height * 2
     property int gridDelegateWidth: dp(100)
 
     property int viewSelectorDelegateHeight: dp(24)
 
     property int filterClearButtonMargin: layoutVerticalMargin
 
     property alias defaultFontPointSize: fontSize.font.pointSize
 
     Label {
         id: fontSize
     }
 }