diff --git a/src/other/firefox/common/parts/infobar.css b/src/other/firefox/common/parts/infobar.css
index 2c278d71..95efff1d 100644
--- a/src/other/firefox/common/parts/infobar.css
+++ b/src/other/firefox/common/parts/infobar.css
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 :host(.infobar) {
-  --info-bar-background-color: light-dark(var(--color-white), var(--gnome-tabbar-tab-active-background));
-  --info-bar-text-color: light-dark(var(--color-gray-100), var(--color-gray-05));
+  --info-bar-background-color: light-dark(var(--color-white), var(--gnome-tabbar-tab-active-background)) !important;
+  --info-bar-text-color: light-dark(var(--color-gray-100), var(--color-gray-05)) !important;
   position: relative;
 
   &::before {
@@ -47,8 +47,8 @@
 @media not (prefers-contrast) {
   :host(.infobar) {
     box-shadow: 0 1px 2px rgba(48, 48, 48, 0.1);
-    background-color: var(--gnome-tabbar-tab-active-background);
-    color: var(--info-bar-text-color);
+    background-color: var(--gnome-tabbar-tab-active-background) !important;
+    color: var(--info-bar-text-color) !important;
 
     &::before {
       background-image: linear-gradient(0deg, #9059ff 0%, #ff4aa2 52.08%, #ffbd4f 100%);
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 32bc6a76..2218ff60 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -291,6 +291,7 @@ $button_borders:                    if($variant == 'light', $button_border, $dar
 // WM colors
 $wm_outline_light:                  0 0 0 2px rgba(black, 0.03), 0 0 0 1px rgba(black, 0.12);
 $wm_outline_dark:                   0 0 0 2px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.75);
+$wm_border:                         if($variant=='light', rgba(black, 0.15), rgba(black, 0.75));
 $wm_shadow:                         if($variant=='light', rgba(black, 0.15), rgba(black, 0.35));
 $wm_shadow_backdrop:                if($variant=='light', rgba(black, 0.08), rgba(black, 0.15));
 $wm_outline:                        if($variant=='light', $wm_outline_light, $wm_outline_dark);
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index a67f8092..fa44649d 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2092,13 +2092,27 @@ headerbar {
   }
 
   > windowhandle > box {
-    padding: 8px;
+    padding: 0 8px;
+    margin-top: 8px;
+    margin-bottom: 8px;
 
     &,
     > box.start,
     > box.end {
       border-spacing: $container_padding;
     }
+
+    &, > widget {
+      > box.start:dir(ltr),
+      > box.end:dir(rtl) {
+        margin-right: $container_padding;
+      }
+
+      > box.start:dir(rtl),
+      > box.end:dir(ltr) {
+        margin-left: $container_padding;
+      }
+    }
   }
 
   entry {
@@ -2179,8 +2193,8 @@ headerbar {
 
   // Headerbar Switches
   switch {
-    margin-top: ($headerbar_size - 24px) / 2;
-    margin-bottom: ($headerbar_size - 24px) / 2;
+    // margin-top: ($headerbar_size - 24px) / 2;
+    // margin-bottom: ($headerbar_size - 24px) / 2;
 
     &:backdrop { opacity: 0.75; }
   }
@@ -5280,15 +5294,17 @@ tooltip {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: lighten($osd_bg_color, 10%);
+    background-color: rgba($osd_bg_color, 0.96);
     background-clip: padding-box;
-    border-radius: $bt_radius;
+    border-radius: $wm_radius;
     color: $osd_fg_color;
+    border: 1px solid $wm_shadow;
+    box-shadow: inset 0 0 0 1px $highlight_color;
 
     label { padding: $container_padding; }
   }
 
-  border-radius: $bt_radius;
+  border-radius: $wm_radius;
   box-shadow: none;
 
   > box {
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 9e445bf0..48cd6176 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -236,14 +236,19 @@ toast {
 
 viewswitcher {
   margin: 0;
+  min-height: 26px;
 
   &.wide {
-    border-spacing: 0;
+    border-spacing: $container_padding / 2;
   }
 
   &.narrow > button.toggle {
     border-radius: 0;
     margin: 0;
+
+    indicatorbin > image {
+      -gtk-icon-size: 12px;
+    }
   }
 
   > button.toggle {
@@ -255,7 +260,7 @@ viewswitcher {
         font-size: 0.75rem;
         padding-top: $container_padding;
         padding-bottom: $container_padding;
-        border-spacing: 0;
+        border-spacing: $container_padding - 2px;
 
         > stack > label {
           padding-left: $container_padding + 2px;
@@ -265,12 +270,7 @@ viewswitcher {
 
       &.wide {
         padding: 0 $container_padding * 2;
-        border-spacing: 0;
-
-        > label, > indicatorbin > image {
-          padding-left: $container_padding / 2;
-          padding-right: $container_padding / 2;
-        }
+        border-spacing: $container_padding;
       }
     }
   }
@@ -343,6 +343,12 @@ indicatorbin {
     background: black;
   }
 
+  > image {
+    -gtk-icon-size: 16px;
+    margin-top: -4px;
+    margin-bottom: -4px;
+  }
+
   &.needs-attention > indicator {
     background: $selected_bg_color;
 
@@ -357,13 +363,13 @@ headerbar > windowhandle > box viewswitcher {
     box-shadow: inset 0 0 0 1px $light_borders_color;
     border-radius: $bt_radius;
     padding: 0;
-  
+
     > button.toggle {
       margin: 0;
       min-height: 0;
       font-weight: 500;
       border-radius: $bt_radius;
-  
+
       &:not(:first-child) {
         border-width: 0 0 0 1px;
         border-style: none solid none none;
@@ -373,7 +379,7 @@ headerbar > windowhandle > box viewswitcher {
                                       $light_borders_color 84%,
                                       transparent 84%) 0 0 0 1 / 0 0 0 1px stretch;
       }
-  
+
       &:hover, &:active, &:checked {
         border-image: none;
   
@@ -877,8 +883,8 @@ toolbarview {
         min-height: $headerbar_size;
 
         > windowhandle > box {
-          padding-top: 8px;
-          padding-bottom: 8px;
+          padding-top: 0;
+          padding-bottom: 0;
         }
 
         &.default-decoration {