diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index f9e4e04..71fb119 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3521,6 +3521,11 @@
   }
 }
 /*= Info Bar - Reduce Padding ================================================*/
+@supports -moz-bool-pref("userChrome.padding.infobar") or -moz-bool-pref("userChrome.autohide.infobar") {
+  #tab-notification-deck notification-message[message-bar-type="infobar"]:not([style*="margin-top"]) {
+    margin: var(--infobar-message-margin, 0 4px var(--infobar-message-vertical-margin, 8px)) !important;
+  }
+}
 @supports -moz-bool-pref("userChrome.padding.infobar") {
   :root:not([uidensity]) #tab-notification-deck {
     --infobar-message-vertical-margin: 3px;
@@ -3540,10 +3545,6 @@
     --infobar-button-vertical-margin: 4px;
   }
 
-  #tab-notification-deck notification-message[message-bar-type="infobar"]:not([style*="margin-top"]) {
-    margin: var(--infobar-message-margin, 0 4px var(--infobar-message-vertical-margin)) !important;
-  }
-
   .infobar > .icon {
     margin-block: var(--infobar-vertical-margin) !important;
     /* Original: 8px */
@@ -5980,10 +5981,14 @@
     > .notificationbox-stack[slot="selected"]
     > notification-message {
     --infobar-message-margin: 0 4px var(--infobar-message-vertical-margin, 8px);
-    margin-bottom: 0;
     opacity: 1;
   }
 
+  @supports -moz-bool-pref("userChrome.autohide.toolbar_overlap") {
+    #tab-notification-deck:not([customizing]) {
+      height: 0;
+    }
+  }
   @media (prefers-reduced-motion: no-preference) {
     #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
       transition: margin-bottom 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
diff --git a/src/autohide/_infobar.scss b/src/autohide/_infobar.scss
index 77536b7..39c9fb8 100644
--- a/src/autohide/_infobar.scss
+++ b/src/autohide/_infobar.scss
@@ -11,10 +11,15 @@
 
 #navigator-toolbox:is(:hover, :focus-within) #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
   --infobar-message-margin: 0 4px var(--infobar-message-vertical-margin, 8px);
-  margin-bottom: 0;
   opacity: 1;
 }
 
+@include Option("userChrome.autohide.toolbar_overlap") {
+  #tab-notification-deck:not([customizing]) {
+    height: 0;
+  }
+}
+
 @include Animate {
   #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
     transition: margin-bottom 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
diff --git a/src/padding/_index.scss b/src/padding/_index.scss
index b4872dc..4d6776a 100644
--- a/src/padding/_index.scss
+++ b/src/padding/_index.scss
@@ -46,6 +46,11 @@
 }
 
 /*= Info Bar - Reduce Padding ================================================*/
+@include Option("userChrome.padding.infobar", "userChrome.autohide.infobar") {
+  #tab-notification-deck notification-message[message-bar-type="infobar"]:not([style*="margin-top"]) {
+    margin: var(--infobar-message-margin, 0 4px var(--infobar-message-vertical-margin, 8px)) !important;
+  }
+}
 @include Option("userChrome.padding.infobar") {
   @import "info_bar";
 }
diff --git a/src/padding/_info_bar.scss b/src/padding/_info_bar.scss
index 098e5b2..9697bc6 100644
--- a/src/padding/_info_bar.scss
+++ b/src/padding/_info_bar.scss
@@ -16,9 +16,6 @@
   --infobar-vertical-margin: 8px;
   --infobar-button-vertical-margin: 4px;
 }
-#tab-notification-deck notification-message[message-bar-type="infobar"]:not([style*="margin-top"]) {
-  margin: var(--infobar-message-margin, 0 4px var(--infobar-message-vertical-margin)) !important;
-}
 
 :root:not([uidensity]) #tab-notification-deck,
 :root:not([uidensity]) notification-message[message-bar-type="infobar"] {