diff --git a/src/MediaAlbumDelegate.qml b/src/MediaAlbumDelegate.qml
--- a/src/MediaAlbumDelegate.qml
+++ b/src/MediaAlbumDelegate.qml
@@ -108,7 +108,7 @@
             acceptedButtons: Qt.LeftButton
             focus: true
 
-            Layout.preferredHeight: mediaServerEntry.width * 0.9 + elisaTheme.layoutVerticalMargin * 0.5 + titleSize.height + artistSize.height
+            Layout.preferredHeight: mediaServerEntry.width * 0.85 + elisaTheme.layoutVerticalMargin * 0.5 + titleSize.height + artistSize.height
             Layout.fillWidth: true
 
             onClicked:
@@ -140,7 +140,7 @@
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
-                height: mediaServerEntry.width * 0.9 + elisaTheme.layoutVerticalMargin
+                height: mediaServerEntry.width * 0.85 + elisaTheme.layoutVerticalMargin
 
                 sourceComponent: Item {
                     GaussianBlur {
@@ -209,8 +209,8 @@
                 z: 1
 
                 Item {
-                    Layout.preferredHeight: mediaServerEntry.width * 0.9
-                    Layout.preferredWidth: mediaServerEntry.width * 0.9
+                    Layout.preferredHeight: mediaServerEntry.width * 0.85
+                    Layout.preferredWidth: mediaServerEntry.width * 0.85
 
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
@@ -221,8 +221,8 @@
 
                         anchors.fill: parent
 
-                        sourceSize.width: mediaServerEntry.width * 0.9
-                        sourceSize.height: mediaServerEntry.width * 0.9
+                        sourceSize.width: parent.width
+                        sourceSize.height: parent.height
                         fillMode: Image.PreserveAspectFit
                         smooth: true
 
@@ -254,21 +254,21 @@
                     horizontalAlignment: Text.AlignLeft
 
                     Layout.topMargin: elisaTheme.layoutVerticalMargin * 0.5
-                    Layout.preferredWidth: mediaServerEntry.width * 0.9
+                    Layout.preferredWidth: mediaServerEntry.width * 0.85
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
 
                     elide: Text.ElideRight
                 }
 
                 LabelWithToolTip {
                     id: artistLabel
 
-                    font.weight: Font.Normal
+                    font.weight: Font.Light
                     color: myPalette.text
 
                     horizontalAlignment: Text.AlignLeft
 
-                    Layout.preferredWidth: mediaServerEntry.width * 0.9
+                    Layout.preferredWidth: mediaServerEntry.width * 0.85
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
 
                     elide: Text.ElideRight
diff --git a/src/MediaAllAlbumView.qml b/src/MediaAllAlbumView.qml
--- a/src/MediaAllAlbumView.qml
+++ b/src/MediaAllAlbumView.qml
@@ -86,7 +86,7 @@
                     }
 
                     cellWidth: elisaTheme.gridDelegateWidth
-                    cellHeight: elisaTheme.gridDelegateWidth + elisaTheme.layoutVerticalMargin * 3 + textLineHeight.height * 2
+                    cellHeight: elisaTheme.gridDelegateWidth + elisaTheme.layoutVerticalMargin + textLineHeight.height * 2
 
                     model: DelegateModel {
                         id: delegateContentModel
diff --git a/src/MediaAllArtistView.qml b/src/MediaAllArtistView.qml
--- a/src/MediaAllArtistView.qml
+++ b/src/MediaAllArtistView.qml
@@ -85,7 +85,7 @@
                     }
 
                     cellWidth: elisaTheme.gridDelegateWidth
-                    cellHeight: elisaTheme.gridDelegateWidth + elisaTheme.layoutVerticalMargin * 2 + textLineHeight.height
+                    cellHeight: elisaTheme.gridDelegateWidth + elisaTheme.layoutVerticalMargin + textLineHeight.height * 2
 
                     model: DelegateModel {
                         id: delegateContentModel
diff --git a/src/MediaArtistDelegate.qml b/src/MediaArtistDelegate.qml
--- a/src/MediaArtistDelegate.qml
+++ b/src/MediaArtistDelegate.qml
@@ -89,7 +89,7 @@
             acceptedButtons: Qt.LeftButton
             focus: true
 
-            Layout.preferredHeight: mediaServerEntry.width * 0.9 + elisaTheme.layoutVerticalMargin * 0.5 + nameSize.height
+            Layout.preferredHeight: mediaServerEntry.width * 0.85 + elisaTheme.layoutVerticalMargin * 0.5 + nameSize.height
             Layout.fillWidth: true
 
             onClicked:
@@ -115,7 +115,7 @@
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
-                height: mediaServerEntry.width * 0.9 + elisaTheme.layoutVerticalMargin
+                height: mediaServerEntry.width * 0.85 + elisaTheme.layoutVerticalMargin
 
                 sourceComponent: Rectangle {
                     id: hoverLayer
@@ -167,9 +167,8 @@
                 z: 1
 
                 Item {
-                    Layout.topMargin: elisaTheme.layoutVerticalMargin
-                    Layout.preferredWidth: mediaServerEntry.width * 0.9
-                    Layout.preferredHeight: mediaServerEntry.width * 0.9
+                    Layout.preferredWidth: mediaServerEntry.width * 0.85
+                    Layout.preferredHeight: mediaServerEntry.width * 0.85
 
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
@@ -180,8 +179,8 @@
 
                         anchors.fill: parent
 
-                        sourceSize.width: mediaServerEntry.width * 0.9
-                        sourceSize.height: mediaServerEntry.width * 0.9
+                        sourceSize.width: parent.width
+                        sourceSize.height: parent.height
 
                         fillMode: Image.PreserveAspectFit
 
@@ -210,9 +209,8 @@
 
                     horizontalAlignment: Text.AlignLeft
 
-                    Layout.preferredWidth: mediaServerEntry.width * 0.9
-                    Layout.topMargin: elisaTheme.layoutVerticalMargin
-                    Layout.bottomMargin: elisaTheme.layoutVerticalMargin
+                    Layout.preferredWidth: mediaServerEntry.width * 0.85
+                    Layout.topMargin: elisaTheme.layoutVerticalMargin * 0.5
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
 
                     elide: Text.ElideRight
diff --git a/src/Theme.qml b/src/Theme.qml
--- a/src/Theme.qml
+++ b/src/Theme.qml
@@ -62,7 +62,7 @@
     property int navigationBarHeight: 100
 
     property int gridDelegateHeight: 168
-    property int gridDelegateWidth: 112
+    property int gridDelegateWidth: 100
 
     property int viewSelectorDelegateHeight: 32