diff --git a/dots/.config/hypr/hyprland/rules.conf b/dots/.config/hypr/hyprland/rules.conf
index 9cb877f7c..4891ee854 100644
--- a/dots/.config/hypr/hyprland/rules.conf
+++ b/dots/.config/hypr/hyprland/rules.conf
@@ -141,6 +141,9 @@ layerrule = noanim, quickshell:lockWindowPusher
 layerrule = animation fade, quickshell:notificationPopup
 layerrule = noanim, quickshell:overview
 layerrule = animation slide bottom, quickshell:osk
+layerrule = noanim, quickshell:polkit
+layerrule = xray 0, quickshell:popup # No weird color for bar tooltips (this in theory should suffice)
+layerrule = ignorealpha 1, quickshell:popup # No weird color for bar tooltips (but somehow this is necessary)
 layerrule = noanim, quickshell:regionSelector
 layerrule = noanim, quickshell:screenshot
 layerrule = blur, quickshell:session
diff --git a/dots/.config/quickshell/ii/modules/bar/StyledPopup.qml b/dots/.config/quickshell/ii/modules/bar/StyledPopup.qml
index 9b030685f..650d770b6 100644
--- a/dots/.config/quickshell/ii/modules/bar/StyledPopup.qml
+++ b/dots/.config/quickshell/ii/modules/bar/StyledPopup.qml
@@ -70,7 +70,7 @@ LazyLoader {
             }
             implicitWidth: root.contentItem.implicitWidth + margin * 2
             implicitHeight: root.contentItem.implicitHeight + margin * 2
-            color: ColorUtils.applyAlpha(Appearance.colors.colSurfaceContainer, 1 - Appearance.backgroundTransparency)
+            color: Appearance.m3colors.m3surfaceContainer
             radius: Appearance.rounding.small
             children: [root.contentItem]
 
diff --git a/dots/.config/quickshell/ii/modules/common/widgets/NotificationAppIcon.qml b/dots/.config/quickshell/ii/modules/common/widgets/NotificationAppIcon.qml
index 795a708be..b590f22ac 100644
--- a/dots/.config/quickshell/ii/modules/common/widgets/NotificationAppIcon.qml
+++ b/dots/.config/quickshell/ii/modules/common/widgets/NotificationAppIcon.qml
@@ -27,7 +27,7 @@ MaterialShape { // App icon
     ]
     shape: isUrgent ? urgentShapes[Math.floor(Math.random() * urgentShapes.length)] : MaterialShape.Shape.Circle
 
-    color: isUrgent ? Appearance.colors.colPrimary : Appearance.colors.colSecondaryContainer
+    color: isUrgent ? Appearance.colors.colPrimaryContainer : Appearance.colors.colSecondaryContainer
     Loader {
         id: materialSymbolLoader
         active: root.appIcon == ""
@@ -40,7 +40,7 @@ MaterialShape { // App icon
                     "priority_high" : guessedIcon
             }
             anchors.fill: parent
-            color: isUrgent ? Appearance.colors.colOnPrimary : Appearance.colors.colOnSecondaryContainer
+            color: isUrgent ? Appearance.colors.colOnPrimaryContainer : Appearance.colors.colOnSecondaryContainer
             iconSize: root.materialIconSize
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
diff --git a/dots/.config/quickshell/ii/modules/polkit/PolkitContent.qml b/dots/.config/quickshell/ii/modules/polkit/PolkitContent.qml
index 2c5b9f3e2..baef7f0b5 100644
--- a/dots/.config/quickshell/ii/modules/polkit/PolkitContent.qml
+++ b/dots/.config/quickshell/ii/modules/polkit/PolkitContent.qml
@@ -52,7 +52,7 @@ Item {
         MaterialSymbol {
             Layout.alignment: Qt.AlignHCenter
             iconSize: 26
-            text: "shield_locked"
+            text: "security"
             color: Appearance.colors.colSecondary
         }