diff --git a/src/qml/HeaderBar.qml b/src/qml/HeaderBar.qml
--- a/src/qml/HeaderBar.qml
+++ b/src/qml/HeaderBar.qml
@@ -217,26 +217,25 @@
                 Layout.fillWidth: true
 
                 TextMetrics {
-                    id: titleFontInfo
-                    font
-                    {
-                        bold: albumLabel.font.bold
-                        pointSize: albumLabel.font.pointSize
-                    }
-                    text: albumLabel.text
+                    id: mainLabelSize
+                    text: title
+                    font.pointSize: elisaTheme.defaultFontPointSize * 2.5
+                    font.bold: true
+                    elide: Text.ElideRight
                 }
 
                 LabelWithToolTip {
                     id: mainLabel
                     text: title
                     Layout.alignment: Qt.AlignLeft
                     Layout.fillWidth: true
+                    Layout.maximumWidth: mainLabelSize.boundingRect.width - mainLabelSize.boundingRect.x
                     elide: Text.ElideRight
                     color: myPalette.highlightedText
                     font.pointSize: elisaTheme.defaultFontPointSize * 2.5
                     font.bold: true
 
-                    Layout.bottomMargin: titleFontInfo.height * 0.5
+                    Layout.bottomMargin: albumLabelSize.height * 0.5
 
                     MouseArea {
                         id: titleMouseArea
@@ -249,11 +248,19 @@
                     }
                 }
 
+                TextMetrics {
+                    id: authorLabelSize
+                    text: artist
+                    font.pointSize: elisaTheme.defaultFontPointSize * 1.5
+                    elide: Text.ElideRight
+                }
+
                 LabelWithToolTip {
                     id: authorLabel
                     text: artist
                     Layout.alignment: Qt.AlignLeft
                     Layout.fillWidth: true
+                    Layout.maximumWidth: authorLabelSize.boundingRect.width - authorLabelSize.boundingRect.x
                     elide: Text.ElideRight
                     color: myPalette.highlightedText
                     font.pointSize: elisaTheme.defaultFontPointSize * 1.5
@@ -278,11 +285,20 @@
                     }
                 }
 
+                TextMetrics {
+                    id: albumLabelSize
+                    text: album
+                    font.weight: Font.Light
+                    font.pointSize: elisaTheme.defaultFontPointSize * 1
+                    elide: Text.ElideRight
+                }
+
                 LabelWithToolTip {
                     id: albumLabel
                     text: album
                     Layout.alignment: Qt.AlignLeft
                     Layout.fillWidth: true
+                    Layout.maximumWidth: albumLabelSize.boundingRect.width - albumLabelSize.boundingRect.x
                     elide: Text.ElideRight
                     color: myPalette.highlightedText
                     font.weight: Font.Light