diff --git a/desktop/qml/PlayerBar/PlayerBar.qml b/desktop/qml/PlayerBar/PlayerBar.qml
index 6c4ace3..5072116 100644
--- a/desktop/qml/PlayerBar/PlayerBar.qml
+++ b/desktop/qml/PlayerBar/PlayerBar.qml
@@ -6,18 +6,69 @@ ColumnLayout {
     id: playerBar
 
     Layout.fillWidth: true
+    Layout.leftMargin: Kirigami.Units.largeSpacing
+    Layout.rightMargin: Kirigami.Units.largeSpacing
+    spacing: 4
 
-    Controls.Slider {
-        id: seekSlider
-
+    RowLayout {
         Layout.fillWidth: true
+        Layout.margins: Kirigami.Units.largeSpacing
+
+        Controls.Slider {
+            id: seekSlider
+
+            Layout.fillWidth: true
+        }
     }
     RowLayout {
         Layout.fillWidth: true
+        Layout.margins: Kirigami.Units.largeSpacing
+        Layout.maximumWidth: parent.width - 2 * Kirigami.Units.largeSpacing
+        Layout.minimumWidth: parent.width - 2 * Kirigami.Units.largeSpacing
 
-        Controls.Button {
-            icon.height: Kirigami.Units.iconSizes.small
-            icon.name: "media-seek-backward"
+        RowLayout {
+            anchors.left: parent.left
+
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.small
+                icon.name: "media-seek-backward"
+            }
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.medium
+                icon.name: "media-playback-start"
+                icon.width: Kirigami.Units.iconSizes.medium
+            }
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.small
+                icon.name: "media-seek-forward"
+            }
+        }
+        RowLayout {
+            anchors.right: parent.right
+
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.small
+                icon.name: "media-playlist-repeat"
+            }
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.small
+                icon.name: "media-playlist-shuffle"
+            }
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.small
+                icon.name: "playlist-symbolic"
+            }
+            Controls.Button {
+                flat: true
+                icon.height: Kirigami.Units.iconSizes.small
+                icon.name: "audio-volume-medium"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/desktop/qml/PrimaryNavigation.qml b/desktop/qml/PrimaryNavigation.qml
index f02907a..a689981 100644
--- a/desktop/qml/PrimaryNavigation.qml
+++ b/desktop/qml/PrimaryNavigation.qml
@@ -92,6 +92,7 @@ Kirigami.GlobalDrawer {
     header: Kirigami.SearchField {
         id: searchEntry
 
+        Layout.topMargin: Kirigami.Units.largeSpacing
         placeholderText: qsTr("Search")
     }