diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -383,13 +383,12 @@
         qml/BasicPlayListAlbumHeader.qml
 
         qml/MetaDataDelegate.qml
-        qml/MediaTrackDelegate.qml
         qml/TracksDiscHeader.qml
-        qml/MediaAlbumTrackDelegate.qml
         qml/MediaTrackMetadataView.qml
         qml/GridBrowserView.qml
         qml/GridBrowserDelegate.qml
         qml/ListBrowserView.qml
+        qml/ListBrowserDelegate.qml
         qml/FileBrowserDelegate.qml
         qml/FileBrowserView.qml
         qml/ScrollHelper.qml
diff --git a/src/qml/DataListView.qml b/src/qml/DataListView.qml
--- a/src/qml/DataListView.qml
+++ b/src/qml/DataListView.qml
@@ -51,7 +51,7 @@
     Component {
         id: singleAlbumDelegate
 
-        MediaAlbumTrackDelegate {
+        ListBrowserDelegate {
             id: entry
 
             width: listView.delegateWidth
@@ -69,21 +69,21 @@
             trackNumber: model.trackNumber
             discNumber: model.discNumber
             rating: model.rating
-            isFirstTrackOfDisc: true
             isSingleDiscAlbum: true
             isSelected: listView.currentIndex === index
             isAlternateColor: (index % 2) === 1
+            detailedView: false
 
-            mediaTrack.onEnqueue: elisa.mediaPlayList.enqueue(databaseId, name, ElisaUtils.Track,
+            onEnqueue: elisa.mediaPlayList.enqueue(databaseId, name, ElisaUtils.Track,
                                                               ElisaUtils.AppendPlayList,
                                                               ElisaUtils.DoNotTriggerPlay)
 
-            mediaTrack.onReplaceAndPlay: elisa.mediaPlayList.enqueue(databaseId, name, ElisaUtils.Track,
+            onReplaceAndPlay: elisa.mediaPlayList.enqueue(databaseId, name, ElisaUtils.Track,
                                                                      ElisaUtils.ReplacePlayList,
                                                                      ElisaUtils.TriggerPlay)
 
 
-            mediaTrack.onClicked: listView.currentIndex = index
+            onClicked: listView.currentIndex = index
 
             onActiveFocusChanged: {
                 if (activeFocus && listView.currentIndex !== index) {
@@ -96,7 +96,7 @@
     Component {
         id: multipleDiscDelegate
 
-        MediaTrackDelegate {
+        ListBrowserDelegate {
             id: entry
 
             width: listView.delegateWidth
@@ -114,7 +114,6 @@
             trackNumber: model.trackNumber
             discNumber: model.discNumber
             rating: model.rating
-            isFirstTrackOfDisc: false
             isSingleDiscAlbum: model.isSingleDiscAlbum
             isSelected: listView.currentIndex === index
             isAlternateColor: (index % 2) === 1
diff --git a/src/qml/MediaTrackDelegate.qml b/src/qml/ListBrowserDelegate.qml
rename from src/qml/MediaTrackDelegate.qml
rename to src/qml/ListBrowserDelegate.qml
--- a/src/qml/MediaTrackDelegate.qml
+++ b/src/qml/ListBrowserDelegate.qml
@@ -36,7 +36,6 @@
     property int trackNumber
     property int discNumber
     property int rating
-    property bool isFirstTrackOfDisc
     property bool isSingleDiscAlbum
     property bool isSelected
     property bool isAlternateColor
diff --git a/src/resources.qrc b/src/resources.qrc
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -18,12 +18,11 @@
         <file>qml/TopNotification.qml</file>
         <file>qml/TrackImportNotification.qml</file>
         <file>qml/TopNotificationItem.qml</file>
-        <file>qml/MediaTrackDelegate.qml</file>
-        <file>qml/MediaAlbumTrackDelegate.qml</file>
         <file>qml/MediaTrackMetadataView.qml</file>
         <file>qml/GridBrowserView.qml</file>
         <file>qml/GridBrowserDelegate.qml</file>
         <file>qml/ListBrowserView.qml</file>
+        <file>qml/ListBrowserDelegate.qml</file>
         <file>qml/FileBrowserDelegate.qml</file>
         <file>qml/FileBrowserView.qml</file>
         <file>qtquickcontrols2.conf</file>