diff --git a/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HResources.qml b/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HResources.qml
index 29b18e16a..1868cf830 100644
--- a/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HResources.qml
+++ b/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HResources.qml
@@ -66,6 +66,8 @@ HBarWidgetWithPopout {
             }
             spacing: 4
 
+            Item {} // Trick for extra spacing
+
             AlignedFadeLoader {
                 shown: C.Config.options.hefty.bar.resources.showMemory || (
                     !battLoader.visible
@@ -98,6 +100,8 @@ HBarWidgetWithPopout {
                 Layout.fillHeight: !root.vertical
                 sourceComponent: Battery {}
             }
+
+            Item {}
         }
     }
 
@@ -500,7 +504,7 @@ HBarWidgetWithPopout {
             }
             W.ConfigSwitch {
                 buttonIcon: "memory"
-                text: S.Translation.tr("Show physical memory usage")
+                text: S.Translation.tr("Show RAM usage")
                 checked: C.Config.options.hefty.bar.resources.showRam
                 onCheckedChanged: {
                     C.Config.options.hefty.bar.resources.showRam = checked;
diff --git a/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HSystemTray.qml b/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HSystemTray.qml
index 9ea1991b4..4c1af7fd5 100644
--- a/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HSystemTray.qml
+++ b/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HSystemTray.qml
@@ -27,9 +27,11 @@ HBarWidgetWithPopout {
 
     HBarWidgetContent {
         id: contentRoot
+
         vertical: root.vertical
         atBottom: root.atBottom
         showPopup: root.showPopup
+
         contentImplicitWidth: trayContent.implicitWidth
         contentImplicitHeight: trayContent.implicitHeight
 
@@ -67,6 +69,8 @@ HBarWidgetWithPopout {
             visible: TrayService.unpinnedItems.length > 0
             Layout.fillWidth: true
             Layout.fillHeight: true
+            Layout.topMargin: 4 * root.vertical
+            Layout.leftMargin: 4 * !root.vertical
             hoverEnabled: true
             acceptedButtons: Qt.AllButtons
 
diff --git a/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HWindowInfo.qml b/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HWindowInfo.qml
index f65158a8a..58b195a1f 100644
--- a/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HWindowInfo.qml
+++ b/dots/.config/quickshell/ii/modules/hefty/topLayer/bar/widgets/HWindowInfo.qml
@@ -30,6 +30,7 @@ HBarWidgetWithPopout {
             return root.activeWindow?.appId;
         return Translation.tr("Options")
     }
+    onPrimaryTextChanged: showPopup = false;
 
     property real fontPixelSize: Appearance.font.pixelSize.smaller