diff --git a/src/qml/MediaPlayerControl.qml b/src/qml/MediaPlayerControl.qml
--- a/src/qml/MediaPlayerControl.qml
+++ b/src/qml/MediaPlayerControl.qml
@@ -131,6 +131,8 @@
             id: minimizeMaximizeButton
             action: minimizeMaximizeAction
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight- elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
 
@@ -142,6 +144,9 @@
             id: skipBackwardButton
             action: skipBackwardAction
             focus: skipBackwardEnabled
+
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
         }
@@ -151,6 +156,8 @@
             action: playPauseAction
             focus: playEnabled
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
         }
@@ -160,6 +167,8 @@
             action: skipForwardAction
             focus: skipForwardEnabled
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
         }
@@ -228,10 +237,10 @@
             background: Rectangle {
                 x: musicProgress.leftPadding
                 y: musicProgress.topPadding + musicProgress.availableHeight / 2 - height / 2
-                implicitWidth: 200
-                implicitHeight: 6
+                Layout.preferredWidth: 200
+                Layout.preferredHeight: 6
                 width: musicProgress.availableWidth
-                height: implicitHeight
+                height: Layout.preferredHeight
                 radius: 3
                 color: myPalette.dark
 
@@ -247,8 +256,8 @@
             handle: Rectangle {
                 x: musicProgress.leftPadding + musicProgress.visualPosition * (musicProgress.availableWidth - width)
                 y: musicProgress.topPadding + musicProgress.availableHeight / 2 - height / 2
-                implicitWidth: 18
-                implicitHeight: 18
+                Layout.preferredWidth: 18
+                Layout.preferredHeight: 18
                 radius: 9
                 color: myPalette.base
                 border.width: 1
@@ -284,6 +293,8 @@
             action: muteAction
             focus: true
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
         }
@@ -308,10 +319,10 @@
             background: Rectangle {
                 x: volumeSlider.leftPadding
                 y: volumeSlider.topPadding + volumeSlider.availableHeight / 2 - height / 2
-                implicitWidth: 200
-                implicitHeight: 6
+                Layout.preferredWidth: 200
+                Layout.preferredHeight: 6
                 width: volumeSlider.availableWidth
-                height: implicitHeight
+                height: Layout.preferredHeight
                 radius: 3
                 color: myPalette.dark
                 opacity: muted ? 0.5 : 1
@@ -329,8 +340,8 @@
             handle: Rectangle {
                 x: volumeSlider.leftPadding + volumeSlider.visualPosition * (volumeSlider.availableWidth - width)
                 y: volumeSlider.topPadding + volumeSlider.availableHeight / 2 - height / 2
-                implicitWidth: 18
-                implicitHeight: 18
+                Layout.preferredWidth: 18
+                Layout.preferredHeight: 18
                 radius: 9
                 color: myPalette.base
                 border.width: 1
@@ -343,6 +354,8 @@
             action: shuffleAction
             id: shuffleButton
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
         }
@@ -352,6 +365,8 @@
             action: repeatAction
             id: repeatButton
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize
         }
@@ -361,6 +376,8 @@
             action: applicationMenuAction
             focus: true
 
+            Layout.preferredHeight: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
+            Layout.preferredWidth: elisaTheme.mediaPlayerControlHeight - elisaTheme.layoutVerticalMargin
             icon.width: elisaTheme.smallControlButtonSize
             icon.height: elisaTheme.smallControlButtonSize