diff --git a/src/calamares/calamares-sidebar.qml b/src/calamares/calamares-sidebar.qml
index ee75c22c8..85d1d506d 100644
--- a/src/calamares/calamares-sidebar.qml
+++ b/src/calamares/calamares-sidebar.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.3
 Rectangle {
     id: sideBar;
     color: Branding.styleString( Branding.SidebarBackground );
+    anchors.fill: parent;
 
     ColumnLayout {
         anchors.fill: parent;
@@ -27,17 +28,17 @@ Rectangle {
         Repeater {
             model: ViewManager
             Rectangle {
-                Layout.leftMargin: 12;
-                width: parent.width - 24;
+                Layout.leftMargin: 6;
+                Layout.rightMargin: 6;
+                Layout.fillWidth: true;
                 height: 35;
                 radius: 6;
-                color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextHighlight : Branding.SidebarBackground );
+                color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarBackgroundSelected : Branding.SidebarBackground );
 
                 Text {
                     anchors.verticalCenter: parent.verticalCenter;
                     anchors.horizontalCenter: parent.horizontalCenter;
-                    x: parent.x + 12;
-                    color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextSelect : Branding.SidebarText );
+                    color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextSelected : Branding.SidebarText );
                     text: display;
                 }
             }