diff --git a/src/qml/BaseTheme.qml b/src/qml/BaseTheme.qml
--- a/src/qml/BaseTheme.qml
+++ b/src/qml/BaseTheme.qml
@@ -66,7 +66,7 @@
                                        playListAuthorTextHeight.height +
                                        playListAlbumTextHeight.height
 
-    property int trackDelegateHeight: 45
+    property int trackDelegateHeight: (elisaTheme.layoutVerticalMargin + fontSize.height) * 2
 
     property int coverImageSize: 180
     property int contextCoverImageSize: 100
@@ -93,7 +93,8 @@
     property int navigationBarHeight: 100
     property int navigationBarFilterHeight: 44
 
-    property int gridDelegateHeight: 170 + layoutVerticalMargin + fontSize.height * 2
+    property real gridDelegateThumbnail: 0.85
+    property int gridDelegateHeight: 170 * gridDelegateThumbnail + layoutVerticalMargin
     property int gridDelegateWidth: 170
 
     property int viewSelectorDelegateHeight: 24
diff --git a/src/qml/GridBrowserDelegate.qml b/src/qml/GridBrowserDelegate.qml
--- a/src/qml/GridBrowserDelegate.qml
+++ b/src/qml/GridBrowserDelegate.qml
@@ -87,9 +87,7 @@
             hoverEnabled: true
             acceptedButtons: Qt.LeftButton
 
-            Layout.preferredHeight: gridEntry.width * 0.85 + elisaTheme.layoutVerticalMargin * 0.5 +
-                                    (mainLabelSize.boundingRect.height - mainLabelSize.boundingRect.y) +
-                                    (secondaryLabelSize.boundingRect.height - secondaryLabelSize.boundingRect.y)
+            Layout.preferredHeight: gridEntry.height
             Layout.fillWidth: true
 
             onClicked: {
@@ -117,12 +115,11 @@
                 anchors.fill: parent
 
                 Item {
-                    Layout.preferredHeight: gridEntry.width * 0.85
-                    Layout.preferredWidth: gridEntry.width * 0.85
+                    Layout.preferredHeight: gridEntry.width * elisaTheme.gridDelegateThumbnail
+                    Layout.preferredWidth: gridEntry.width * elisaTheme.gridDelegateThumbnail
 
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-
                     Loader {
                         id: hoverLoader
                         active: false
diff --git a/src/qml/GridBrowserView.qml b/src/qml/GridBrowserView.qml
--- a/src/qml/GridBrowserView.qml
+++ b/src/qml/GridBrowserView.qml
@@ -126,9 +126,9 @@
                 }
 
                 cellWidth: Math.floor(availableWidth / Math.max(Math.floor(availableWidth / elisaTheme.gridDelegateWidth), 2))
-                cellHeight: delegateDisplaySecondaryText ?
-                                elisaTheme.gridDelegateHeight :
-                                elisaTheme.gridDelegateHeight - (secondaryLabelSize.boundingRect.height - secondaryLabelSize.boundingRect.y)
+                cellHeight: elisaTheme.gridDelegateHeight +
+                            (secondaryLabelSize.boundingRect.height - secondaryLabelSize.boundingRect.y) *
+                            (delegateDisplaySecondaryText ? 2 : 1)
 
                 delegate: GridBrowserDelegate {
                     width: elisaTheme.gridDelegateWidth