diff --git a/src/main/gtk-3.0/gtk-Dark.css b/src/main/gtk-3.0/gtk-Dark.css
index 7e863368..19593151 100644
--- a/src/main/gtk-3.0/gtk-Dark.css
+++ b/src/main/gtk-3.0/gtk-Dark.css
@@ -4028,13 +4028,13 @@ colorchooser .popover.osd:backdrop {
 decoration {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 12px;
+  background-color: #2C2C2C;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 15px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 36px transparent;
   margin: 8px;
 }
 
 .csd decoration {
   border: 1px solid rgba(255, 255, 255, 0.1);
-  background-color: #2C2C2C;
   background-clip: border-box;
 }
 
@@ -4942,14 +4942,11 @@ window.background.csd scrolledwindow.contacts-contact-form {
  * Epiphany (Gnome Web) *
  ************************/
 tabbox {
-  background-color: #2C2C2C;
-  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
-  padding: 3px 3px 0;
-}
-
-tabbox > tab {
-  border-radius: 6px 6px 0 0;
-  border-bottom: none;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.04);
+  padding: 3px;
+  margin: 3px;
+  border-radius: 9px;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-Light.css b/src/main/gtk-3.0/gtk-Light.css
index b43075ff..34bb6498 100644
--- a/src/main/gtk-3.0/gtk-Light.css
+++ b/src/main/gtk-3.0/gtk-Light.css
@@ -4028,6 +4028,7 @@ colorchooser .popover.osd:backdrop {
 decoration {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 12px;
+  background-color: #FFFFFF;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 15px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12), 0 0 36px transparent;
   margin: 8px;
 }
@@ -4933,14 +4934,11 @@ window.background.csd scrolledwindow.contacts-contact-form {
  * Epiphany (Gnome Web) *
  ************************/
 tabbox {
-  background-color: #FFFFFF;
-  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
-  padding: 3px 3px 0;
-}
-
-tabbox > tab {
-  border-radius: 6px 6px 0 0;
-  border-bottom: none;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.04);
+  padding: 3px;
+  margin: 3px;
+  border-radius: 9px;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-4.0/gtk-Dark.css b/src/main/gtk-4.0/gtk-Dark.css
index f412027f..0b3fbaef 100644
--- a/src/main/gtk-4.0/gtk-Dark.css
+++ b/src/main/gtk-4.0/gtk-Dark.css
@@ -4436,6 +4436,7 @@ infobar > revealer > box {
 
 infobar.info > revealer > box, infobar.info:hover > revealer > box, infobar.info:backdrop > revealer > box {
   background-color: #2C2C2C;
+  color: #FFFFFF;
 }
 
 infobar.info > revealer > box button, infobar.info > revealer > box button.text-button:not(:disabled), infobar.info:hover > revealer > box button, infobar.info:hover > revealer > box button.text-button:not(:disabled), infobar.info:backdrop > revealer > box button, infobar.info:backdrop > revealer > box button.text-button:not(:disabled) {
diff --git a/src/main/gtk-4.0/gtk-Light.css b/src/main/gtk-4.0/gtk-Light.css
index 45435f72..10e11198 100644
--- a/src/main/gtk-4.0/gtk-Light.css
+++ b/src/main/gtk-4.0/gtk-Light.css
@@ -4444,6 +4444,7 @@ infobar > revealer > box {
 
 infobar.info > revealer > box, infobar.info:hover > revealer > box, infobar.info:backdrop > revealer > box {
   background-color: #FFFFFF;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 infobar.info > revealer > box button, infobar.info > revealer > box button.text-button:not(:disabled), infobar.info:hover > revealer > box button, infobar.info:hover > revealer > box button.text-button:not(:disabled), infobar.info:backdrop > revealer > box button, infobar.info:backdrop > revealer > box button.text-button:not(:disabled) {
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index bd201792..fdb71b54 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -3669,6 +3669,7 @@ colorchooser .popover.osd {
 decoration {
   transition: $transition-shadow;
   border-radius: $window-radius;
+  background-color: $background;
 
   @if $rimless == 'true' {
     box-shadow: $shadow-z16, 0 0 36px transparent;
@@ -3678,7 +3679,6 @@ decoration {
     @if $variant == 'dark' {
       .csd & {
         border: 1px solid highlight($background);
-        background-color: $background;
         background-clip: border-box;
       }
     }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 5ce69d02..56a142f2 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -4109,6 +4109,7 @@ infobar {
     &:hover > revealer > box,
     &:backdrop > revealer > box {
       background-color: $base;
+      color: $text;
 
       button {
         &, &.text-button:not(:disabled) { color: $primary; }
diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss
index b461e88c..44df9b53 100644
--- a/src/sass/gtk/apps/_gnome-3.0.scss
+++ b/src/sass/gtk/apps/_gnome-3.0.scss
@@ -757,14 +757,14 @@ window.background.csd {
  ************************/
 
 tabbox { // Gnome 40.0
-  background-color: $background;
-  box-shadow: inset 0 -1px $divider;
-  padding: ($space-size / 2) ($space-size / 2) 0;
+  border: none;
+  background-color: $fill;
+  padding: $space-size / 2;
+  margin: $space-size / 2;
+  border-radius: $modal-radius + $space-size / 2;
 
   > tab {
     @extend %tabs_tab;
-    border-radius: $corner-radius $corner-radius 0 0;
-    border-bottom: none;
 
     // close button
     button {