diff --git a/desktoppackage/contents/configuration/AppletConfiguration.qml b/desktoppackage/contents/configuration/AppletConfiguration.qml
--- a/desktoppackage/contents/configuration/AppletConfiguration.qml
+++ b/desktoppackage/contents/configuration/AppletConfiguration.qml
@@ -50,7 +50,7 @@
     ConfigModel {
         id: globalAppletConfigModel
         ConfigCategory {
-            name: i18nd("plasma_shell_org.kde.plasma.desktop", "Keyboard Shortcuts")
+            name: i18nd("plasma_shell_org.kde.plasma.desktop", "Keyboard shortcuts")
             icon: "preferences-desktop-keyboard"
             source: "ConfigurationShortcuts.qml"
         }
@@ -104,6 +104,24 @@
 //END connections
 
 //BEGIN UI components
+    Rectangle {
+    id: sidebar
+        color: Kirigami.Theme.viewBackgroundColor
+        anchors.left: parent.left
+        width: categories.width
+        height: root.height
+    }
+
+    Kirigami.Separator {
+        anchors.left:sidebar.right
+        height: root.height
+    }
+
+    Kirigami.Separator {
+        anchors.top:sidebar.top
+        width: sidebar.width
+    }
+
     MessageDialog {
         id: messageDialog
         icon: StandardIcon.Warning
@@ -124,7 +142,8 @@
         id: pageStackColumn
         anchors {
             fill: parent
-            margins: pageStackColumn.spacing * units.devicePixelRatio //margins are hardcoded in QStyle we should match that here
+            rightMargin: units.smallSpacing * 2
+            bottomMargin: units.smallSpacing * 2
         }
         property int implicitWidth: Math.max(contentRow.implicitWidth, buttonsRow.implicitWidth) + 8
         property int implicitHeight: contentRow.implicitHeight + buttonsRow.implicitHeight + 8
@@ -184,49 +203,30 @@
                     }
                 }
 
-                // Encapsulate as ColumnLayout will keep overwriting its own implicitWidth
-                Item {
-                    implicitWidth: categoriesScroll.Layout.maximumWidth
-                    implicitHeight: categories.implicitHeight
-                    ColumnLayout {
-                        id: categories
-                        spacing: 0
-                        width: categoriesScroll.width
+                ColumnLayout {
+                    id: categories
+                    spacing: 0
+                    width: categoriesScroll.width
 
-                        property Item currentItem: children[1]
+                    property Item currentItem: children[1]
 
-                        Repeater {
-                            model: root.isContainment ? globalConfigModel : undefined
-                            delegate: ConfigCategoryDelegate {}
-                        }
-                        Repeater {
-                            model: configDialogFilterModel
-                            delegate: ConfigCategoryDelegate {}
-                        }
-                        Repeater {
-                            model: !root.isContainment ? globalConfigModel : undefined
-                            delegate: ConfigCategoryDelegate {}
-                        }
+                    Repeater {
+                        model: root.isContainment ? globalConfigModel : undefined
+                        delegate: ConfigCategoryDelegate {}
                     }
-                }
-            }
-
-            Rectangle {
-                Layout.fillHeight: true
-                width: Math.round(units.devicePixelRatio)
-                color: Kirigami.Theme.highlightColor
-                visible: categoriesScroll.visible
-                opacity: categoriesScroll.activeFocus && Window.active ? 1 : 0.3
-                Behavior on color {
-                    ColorAnimation {
-                        duration: units.longDuration
-                        easing.type: Easing.InOutQuad
+                    Repeater {
+                        model: configDialogFilterModel
+                        delegate: ConfigCategoryDelegate {}
+                    }
+                    Repeater {
+                        model: !root.isContainment ? globalConfigModel : undefined
+                        delegate: ConfigCategoryDelegate {}
                     }
                 }
             }
 
             Item { // spacer
-                width: units.largeSpacing
+                width: units.smallSpacing * 2
                 visible: categoriesScroll.visible
             }
 
@@ -276,10 +276,12 @@
                     contentWidth: width
                     Column {
                         id: pageColumn
+
                         spacing: units.largeSpacing / 2
 
                         Kirigami.Heading {
                             id: pageTitle
+                            topPadding: units.smallSpacing
                             width: scroll.width
                             level: 1
                             text: pageStack.title