diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml
index 22518f17..1aac8558 100644
--- a/modules/osd/Content.qml
+++ b/modules/osd/Content.qml
@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import Caelestia
 import Caelestia.Config
 import qs.components
 import qs.components.controls
@@ -20,13 +21,14 @@ Item {
     required property bool sourceMuted
     required property real brightness
 
-    implicitWidth: layout.implicitWidth + Tokens.padding.extraLargeIncreased
-    implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
+    implicitWidth: layout.implicitWidth + Tokens.padding.large + layout.anchors.horizontalCenterOffset * 2
+    implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
 
     ColumnLayout {
         id: layout
 
         anchors.centerIn: parent
+        anchors.horizontalCenterOffset: CUtils.clamp(Tokens.padding.large - Config.border.thickness, 0, Tokens.padding.large) / 2
         spacing: Tokens.spacing.medium
 
         // Speaker volume
diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index 612cc67d..f70e6493 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
+import Caelestia
 import Caelestia.Config
 import qs.components
 import qs.components.controls
@@ -14,6 +15,7 @@ Column {
     required property DrawerVisibilities visibilities
 
     padding: Tokens.padding.large
+    rightPadding: CUtils.clamp(padding - Config.border.thickness, 0, padding)
     spacing: Tokens.spacing.large
 
     SessionButton {