From fdefaf61499c971da070212bd68fd775b6cc1393 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 27 Nov 2022 22:16:40 +0800
Subject: [PATCH] update

---
 src/_sass/gtk/_common-4.0.scss    | 52 ++++++++++++++++++-------------
 src/gtk/4.0/gtk-Compact.css       | 45 +++++++++++++++-----------
 src/gtk/4.0/gtk-Dark-Compact.css  | 45 +++++++++++++++-----------
 src/gtk/4.0/gtk-Dark.css          | 45 +++++++++++++++-----------
 src/gtk/4.0/gtk-Light-Compact.css | 45 +++++++++++++++-----------
 src/gtk/4.0/gtk-Light.css         | 45 +++++++++++++++-----------
 src/gtk/4.0/gtk.css               | 45 +++++++++++++++-----------
 7 files changed, 193 insertions(+), 129 deletions(-)

diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index a2d5bb0..b58bbc0 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -852,16 +852,8 @@ combobox {
 
   // align menu labels with the button label
   > popover.menu {
-    margin-top: $space-size - 2px;
-
-    > contents {
-      padding: $space-size;
-
-      modelbutton {
-        padding-left: $space-size * 1.5;
-        padding-right: $space-size * 1.5;
-      }
-    }
+    margin-top: $space-size;
+    padding: 0;
   }
 
   button.combo cellview {
@@ -1041,7 +1033,10 @@ searchbar > revealer > box {
   background-clip: border-box;
   box-shadow: none;
 
-  entry { margin: 0; }
+  entry,
+  button,
+  menubutton,
+  splitbutton { margin: 0; }
 }
 
 /***************
@@ -1240,12 +1235,16 @@ headerbar {
       border-radius: $circular-radius;
       color: $titlebar-text-secondary;
 
-      &:focus, &:hover, &:active, &:checked { color: $titlebar-text; }
+      &:focus, &:hover, &:active { color: $titlebar-text; }
 
       &:disabled { color: $titlebar-text-secondary-disabled; }
 
-      &:checked:disabled {
-        color: on($primary, disabled);
+      &:checked {
+        color: on($primary);
+
+        &:disabled {
+          color: on($primary, disabled);
+        }
       }
 
       &:backdrop {
@@ -1696,6 +1695,7 @@ popover.menu {
 
 popover.background {
   font: initial;
+  padding: 0;
 
   &, &:backdrop {
     background-color: transparent;
@@ -1737,7 +1737,13 @@ popover.background {
       margin: $space-size / 2 0;
     }
 
-    list separator { margin: 0; }
+    list {
+      > row {
+        padding: $space-size $space-size * 2;
+      }
+
+      separator { margin: 0; }
+    }
   }
 
   // FIXME: Use the popover color instead of transparent as a workaround for .view
@@ -2858,6 +2864,11 @@ actionbar > revealer > box {
   background-color: $base;
   background-clip: border-box;
   box-shadow: none;
+
+  entry,
+  button,
+  menubutton,
+  splitbutton { margin: 0; }
 }
 
 statusbar {
@@ -2936,7 +2947,6 @@ list {
   color: $text-secondary;
 
   > row {
-    padding: 2px;
     background-clip: padding-box;
   }
 
@@ -2998,12 +3008,13 @@ row {
     @extend %button-flat-simple;
   }
 
-  button & {
-    &, &:hover, &.has-open-popup, &:active {
+  button &.activatable {
+    &, &:hover, &.has-open-popup, &:active, &:active:hover {
       background-color: transparent;
       box-shadow: none;
       background-image: none;
       transition: none;
+      animation: none;
     }
   }
 
@@ -3207,7 +3218,6 @@ row.expander {
   }
 
   // AdwExpanderRow arrow rotation
-
   image.expander-row-arrow {
     transition: 200ms $ease-out;
     @include margin-start(6px);
@@ -3221,11 +3231,11 @@ row.expander {
     @extend .dim-label;
 
     &:dir(ltr) {
-      -gtk-icon-transform: rotate(-0.25turn);
+      -gtk-icon-transform: rotate(0.5turn);
     }
 
     &:dir(rtl) {
-      -gtk-icon-transform: rotate(0.25turn);
+      -gtk-icon-transform: rotate(-0.5turn);
     }
   }
 
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 4dc1cb8..d133f86 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -1173,18 +1173,8 @@ combobox arrow {
 
 dropdown > popover.menu,
 combobox > popover.menu {
-  margin-top: 2px;
-}
-
-dropdown > popover.menu > contents,
-combobox > popover.menu > contents {
-  padding: 4px;
-}
-
-dropdown > popover.menu > contents modelbutton,
-combobox > popover.menu > contents modelbutton {
-  padding-left: 6px;
-  padding-right: 6px;
+  margin-top: 4px;
+  padding: 0;
 }
 
 dropdown button.combo cellview:dir(ltr),
@@ -1408,7 +1398,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
-searchbar > revealer > box entry {
+searchbar > revealer > box entry,
+searchbar > revealer > box button,
+searchbar > revealer > box menubutton,
+searchbar > revealer > box splitbutton {
   margin: 0;
 }
 
@@ -1619,7 +1612,7 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.7);
 }
 
-headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active {
   color: white;
 }
 
@@ -1627,6 +1620,10 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.3);
 }
 
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+  color: white;
+}
+
 headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
@@ -2116,6 +2113,7 @@ popover.menu label.title {
  ************/
 popover.background {
   font: initial;
+  padding: 0;
 }
 
 popover.background, popover.background:backdrop {
@@ -2155,6 +2153,10 @@ popover.background > contents separator {
   margin: 2px 0;
 }
 
+popover.background > contents list > row {
+  padding: 4px 8px;
+}
+
 popover.background > contents list separator {
   margin: 0;
 }
@@ -3330,6 +3332,13 @@ actionbar > revealer > box {
   box-shadow: none;
 }
 
+actionbar > revealer > box entry,
+actionbar > revealer > box button,
+actionbar > revealer > box menubutton,
+actionbar > revealer > box splitbutton {
+  margin: 0;
+}
+
 statusbar {
   padding: 4px 12px;
 }
@@ -3425,7 +3434,6 @@ list {
 
 listview > row,
 list > row {
-  padding: 2px;
   background-clip: padding-box;
 }
 
@@ -3491,11 +3499,12 @@ treeview.view > header > button:active, row.activatable.has-open-popup, row.acti
   background-size: 100% 100%;
 }
 
-button row, button row:hover, button row.has-open-popup, button row:active {
+button row.activatable, button row.activatable:hover, button row.activatable.has-open-popup, button row.activatable:active, button row.activatable:active:hover {
   background-color: transparent;
   box-shadow: none;
   background-image: none;
   transition: none;
+  animation: none;
 }
 
 button:checked row {
@@ -3689,11 +3698,11 @@ row.expander:checked image.expander-row-arrow {
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(ltr) {
-  -gtk-icon-transform: rotate(-0.25turn);
+  -gtk-icon-transform: rotate(0.5turn);
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(rtl) {
-  -gtk-icon-transform: rotate(0.25turn);
+  -gtk-icon-transform: rotate(-0.5turn);
 }
 
 row.expander:checked image.expander-row-arrow:not(:disabled) {
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index 49851b1..f1ca101 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -1173,18 +1173,8 @@ combobox arrow {
 
 dropdown > popover.menu,
 combobox > popover.menu {
-  margin-top: 2px;
-}
-
-dropdown > popover.menu > contents,
-combobox > popover.menu > contents {
-  padding: 4px;
-}
-
-dropdown > popover.menu > contents modelbutton,
-combobox > popover.menu > contents modelbutton {
-  padding-left: 6px;
-  padding-right: 6px;
+  margin-top: 4px;
+  padding: 0;
 }
 
 dropdown button.combo cellview:dir(ltr),
@@ -1408,7 +1398,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
-searchbar > revealer > box entry {
+searchbar > revealer > box entry,
+searchbar > revealer > box button,
+searchbar > revealer > box menubutton,
+searchbar > revealer > box splitbutton {
   margin: 0;
 }
 
@@ -1619,7 +1612,7 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.7);
 }
 
-headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active {
   color: white;
 }
 
@@ -1627,6 +1620,10 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.3);
 }
 
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+  color: white;
+}
+
 headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
@@ -2116,6 +2113,7 @@ popover.menu label.title {
  ************/
 popover.background {
   font: initial;
+  padding: 0;
 }
 
 popover.background, popover.background:backdrop {
@@ -2155,6 +2153,10 @@ popover.background > contents separator {
   margin: 2px 0;
 }
 
+popover.background > contents list > row {
+  padding: 4px 8px;
+}
+
 popover.background > contents list separator {
   margin: 0;
 }
@@ -3330,6 +3332,13 @@ actionbar > revealer > box {
   box-shadow: none;
 }
 
+actionbar > revealer > box entry,
+actionbar > revealer > box button,
+actionbar > revealer > box menubutton,
+actionbar > revealer > box splitbutton {
+  margin: 0;
+}
+
 statusbar {
   padding: 4px 12px;
 }
@@ -3425,7 +3434,6 @@ list {
 
 listview > row,
 list > row {
-  padding: 2px;
   background-clip: padding-box;
 }
 
@@ -3491,11 +3499,12 @@ treeview.view > header > button:active, row.activatable.has-open-popup, row.acti
   background-size: 100% 100%;
 }
 
-button row, button row:hover, button row.has-open-popup, button row:active {
+button row.activatable, button row.activatable:hover, button row.activatable.has-open-popup, button row.activatable:active, button row.activatable:active:hover {
   background-color: transparent;
   box-shadow: none;
   background-image: none;
   transition: none;
+  animation: none;
 }
 
 button:checked row {
@@ -3689,11 +3698,11 @@ row.expander:checked image.expander-row-arrow {
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(ltr) {
-  -gtk-icon-transform: rotate(-0.25turn);
+  -gtk-icon-transform: rotate(0.5turn);
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(rtl) {
-  -gtk-icon-transform: rotate(0.25turn);
+  -gtk-icon-transform: rotate(-0.5turn);
 }
 
 row.expander:checked image.expander-row-arrow:not(:disabled) {
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index 3edfa04..f0fd667 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -1173,18 +1173,8 @@ combobox arrow {
 
 dropdown > popover.menu,
 combobox > popover.menu {
-  margin-top: 4px;
-}
-
-dropdown > popover.menu > contents,
-combobox > popover.menu > contents {
-  padding: 6px;
-}
-
-dropdown > popover.menu > contents modelbutton,
-combobox > popover.menu > contents modelbutton {
-  padding-left: 9px;
-  padding-right: 9px;
+  margin-top: 6px;
+  padding: 0;
 }
 
 dropdown button.combo cellview:dir(ltr),
@@ -1408,7 +1398,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
-searchbar > revealer > box entry {
+searchbar > revealer > box entry,
+searchbar > revealer > box button,
+searchbar > revealer > box menubutton,
+searchbar > revealer > box splitbutton {
   margin: 0;
 }
 
@@ -1619,7 +1612,7 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.7);
 }
 
-headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active {
   color: white;
 }
 
@@ -1627,6 +1620,10 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.3);
 }
 
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+  color: white;
+}
+
 headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
@@ -2116,6 +2113,7 @@ popover.menu label.title {
  ************/
 popover.background {
   font: initial;
+  padding: 0;
 }
 
 popover.background, popover.background:backdrop {
@@ -2155,6 +2153,10 @@ popover.background > contents separator {
   margin: 3px 0;
 }
 
+popover.background > contents list > row {
+  padding: 6px 12px;
+}
+
 popover.background > contents list separator {
   margin: 0;
 }
@@ -3330,6 +3332,13 @@ actionbar > revealer > box {
   box-shadow: none;
 }
 
+actionbar > revealer > box entry,
+actionbar > revealer > box button,
+actionbar > revealer > box menubutton,
+actionbar > revealer > box splitbutton {
+  margin: 0;
+}
+
 statusbar {
   padding: 6px 18px;
 }
@@ -3425,7 +3434,6 @@ list {
 
 listview > row,
 list > row {
-  padding: 2px;
   background-clip: padding-box;
 }
 
@@ -3491,11 +3499,12 @@ treeview.view > header > button:active, row.activatable.has-open-popup, row.acti
   background-size: 100% 100%;
 }
 
-button row, button row:hover, button row.has-open-popup, button row:active {
+button row.activatable, button row.activatable:hover, button row.activatable.has-open-popup, button row.activatable:active, button row.activatable:active:hover {
   background-color: transparent;
   box-shadow: none;
   background-image: none;
   transition: none;
+  animation: none;
 }
 
 button:checked row {
@@ -3689,11 +3698,11 @@ row.expander:checked image.expander-row-arrow {
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(ltr) {
-  -gtk-icon-transform: rotate(-0.25turn);
+  -gtk-icon-transform: rotate(0.5turn);
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(rtl) {
-  -gtk-icon-transform: rotate(0.25turn);
+  -gtk-icon-transform: rotate(-0.5turn);
 }
 
 row.expander:checked image.expander-row-arrow:not(:disabled) {
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 540aadd..304f2af 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -1173,18 +1173,8 @@ combobox arrow {
 
 dropdown > popover.menu,
 combobox > popover.menu {
-  margin-top: 2px;
-}
-
-dropdown > popover.menu > contents,
-combobox > popover.menu > contents {
-  padding: 4px;
-}
-
-dropdown > popover.menu > contents modelbutton,
-combobox > popover.menu > contents modelbutton {
-  padding-left: 6px;
-  padding-right: 6px;
+  margin-top: 4px;
+  padding: 0;
 }
 
 dropdown button.combo cellview:dir(ltr),
@@ -1408,7 +1398,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
-searchbar > revealer > box entry {
+searchbar > revealer > box entry,
+searchbar > revealer > box button,
+searchbar > revealer > box menubutton,
+searchbar > revealer > box splitbutton {
   margin: 0;
 }
 
@@ -1619,7 +1612,7 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(0, 0, 0, 0.6);
 }
 
-headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active {
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -1627,6 +1620,10 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(0, 0, 0, 0.26);
 }
 
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+  color: white;
+}
+
 headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
@@ -2116,6 +2113,7 @@ popover.menu label.title {
  ************/
 popover.background {
   font: initial;
+  padding: 0;
 }
 
 popover.background, popover.background:backdrop {
@@ -2155,6 +2153,10 @@ popover.background > contents separator {
   margin: 2px 0;
 }
 
+popover.background > contents list > row {
+  padding: 4px 8px;
+}
+
 popover.background > contents list separator {
   margin: 0;
 }
@@ -3330,6 +3332,13 @@ actionbar > revealer > box {
   box-shadow: none;
 }
 
+actionbar > revealer > box entry,
+actionbar > revealer > box button,
+actionbar > revealer > box menubutton,
+actionbar > revealer > box splitbutton {
+  margin: 0;
+}
+
 statusbar {
   padding: 4px 12px;
 }
@@ -3425,7 +3434,6 @@ list {
 
 listview > row,
 list > row {
-  padding: 2px;
   background-clip: padding-box;
 }
 
@@ -3491,11 +3499,12 @@ treeview.view > header > button:active, row.activatable.has-open-popup, row.acti
   background-size: 100% 100%;
 }
 
-button row, button row:hover, button row.has-open-popup, button row:active {
+button row.activatable, button row.activatable:hover, button row.activatable.has-open-popup, button row.activatable:active, button row.activatable:active:hover {
   background-color: transparent;
   box-shadow: none;
   background-image: none;
   transition: none;
+  animation: none;
 }
 
 button:checked row {
@@ -3689,11 +3698,11 @@ row.expander:checked image.expander-row-arrow {
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(ltr) {
-  -gtk-icon-transform: rotate(-0.25turn);
+  -gtk-icon-transform: rotate(0.5turn);
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(rtl) {
-  -gtk-icon-transform: rotate(0.25turn);
+  -gtk-icon-transform: rotate(-0.5turn);
 }
 
 row.expander:checked image.expander-row-arrow:not(:disabled) {
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 6820b98..96a5e47 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -1173,18 +1173,8 @@ combobox arrow {
 
 dropdown > popover.menu,
 combobox > popover.menu {
-  margin-top: 4px;
-}
-
-dropdown > popover.menu > contents,
-combobox > popover.menu > contents {
-  padding: 6px;
-}
-
-dropdown > popover.menu > contents modelbutton,
-combobox > popover.menu > contents modelbutton {
-  padding-left: 9px;
-  padding-right: 9px;
+  margin-top: 6px;
+  padding: 0;
 }
 
 dropdown button.combo cellview:dir(ltr),
@@ -1408,7 +1398,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
-searchbar > revealer > box entry {
+searchbar > revealer > box entry,
+searchbar > revealer > box button,
+searchbar > revealer > box menubutton,
+searchbar > revealer > box splitbutton {
   margin: 0;
 }
 
@@ -1619,7 +1612,7 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(0, 0, 0, 0.6);
 }
 
-headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active {
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -1627,6 +1620,10 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(0, 0, 0, 0.26);
 }
 
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+  color: white;
+}
+
 headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
@@ -2116,6 +2113,7 @@ popover.menu label.title {
  ************/
 popover.background {
   font: initial;
+  padding: 0;
 }
 
 popover.background, popover.background:backdrop {
@@ -2155,6 +2153,10 @@ popover.background > contents separator {
   margin: 3px 0;
 }
 
+popover.background > contents list > row {
+  padding: 6px 12px;
+}
+
 popover.background > contents list separator {
   margin: 0;
 }
@@ -3330,6 +3332,13 @@ actionbar > revealer > box {
   box-shadow: none;
 }
 
+actionbar > revealer > box entry,
+actionbar > revealer > box button,
+actionbar > revealer > box menubutton,
+actionbar > revealer > box splitbutton {
+  margin: 0;
+}
+
 statusbar {
   padding: 6px 18px;
 }
@@ -3425,7 +3434,6 @@ list {
 
 listview > row,
 list > row {
-  padding: 2px;
   background-clip: padding-box;
 }
 
@@ -3491,11 +3499,12 @@ treeview.view > header > button:active, row.activatable.has-open-popup, row.acti
   background-size: 100% 100%;
 }
 
-button row, button row:hover, button row.has-open-popup, button row:active {
+button row.activatable, button row.activatable:hover, button row.activatable.has-open-popup, button row.activatable:active, button row.activatable:active:hover {
   background-color: transparent;
   box-shadow: none;
   background-image: none;
   transition: none;
+  animation: none;
 }
 
 button:checked row {
@@ -3689,11 +3698,11 @@ row.expander:checked image.expander-row-arrow {
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(ltr) {
-  -gtk-icon-transform: rotate(-0.25turn);
+  -gtk-icon-transform: rotate(0.5turn);
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(rtl) {
-  -gtk-icon-transform: rotate(0.25turn);
+  -gtk-icon-transform: rotate(-0.5turn);
 }
 
 row.expander:checked image.expander-row-arrow:not(:disabled) {
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index eec8b0e..6f68bf7 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -1173,18 +1173,8 @@ combobox arrow {
 
 dropdown > popover.menu,
 combobox > popover.menu {
-  margin-top: 4px;
-}
-
-dropdown > popover.menu > contents,
-combobox > popover.menu > contents {
-  padding: 6px;
-}
-
-dropdown > popover.menu > contents modelbutton,
-combobox > popover.menu > contents modelbutton {
-  padding-left: 9px;
-  padding-right: 9px;
+  margin-top: 6px;
+  padding: 0;
 }
 
 dropdown button.combo cellview:dir(ltr),
@@ -1408,7 +1398,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
-searchbar > revealer > box entry {
+searchbar > revealer > box entry,
+searchbar > revealer > box button,
+searchbar > revealer > box menubutton,
+searchbar > revealer > box splitbutton {
   margin: 0;
 }
 
@@ -1619,7 +1612,7 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.7);
 }
 
-headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:focus, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:hover, headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:active {
   color: white;
 }
 
@@ -1627,6 +1620,10 @@ headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):no
   color: rgba(255, 255, 255, 0.3);
 }
 
+headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked {
+  color: white;
+}
+
 headerbar stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button:checked:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
@@ -2116,6 +2113,7 @@ popover.menu label.title {
  ************/
 popover.background {
   font: initial;
+  padding: 0;
 }
 
 popover.background, popover.background:backdrop {
@@ -2155,6 +2153,10 @@ popover.background > contents separator {
   margin: 3px 0;
 }
 
+popover.background > contents list > row {
+  padding: 6px 12px;
+}
+
 popover.background > contents list separator {
   margin: 0;
 }
@@ -3330,6 +3332,13 @@ actionbar > revealer > box {
   box-shadow: none;
 }
 
+actionbar > revealer > box entry,
+actionbar > revealer > box button,
+actionbar > revealer > box menubutton,
+actionbar > revealer > box splitbutton {
+  margin: 0;
+}
+
 statusbar {
   padding: 6px 18px;
 }
@@ -3425,7 +3434,6 @@ list {
 
 listview > row,
 list > row {
-  padding: 2px;
   background-clip: padding-box;
 }
 
@@ -3491,11 +3499,12 @@ treeview.view > header > button:active, row.activatable.has-open-popup, row.acti
   background-size: 100% 100%;
 }
 
-button row, button row:hover, button row.has-open-popup, button row:active {
+button row.activatable, button row.activatable:hover, button row.activatable.has-open-popup, button row.activatable:active, button row.activatable:active:hover {
   background-color: transparent;
   box-shadow: none;
   background-image: none;
   transition: none;
+  animation: none;
 }
 
 button:checked row {
@@ -3689,11 +3698,11 @@ row.expander:checked image.expander-row-arrow {
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(ltr) {
-  -gtk-icon-transform: rotate(-0.25turn);
+  -gtk-icon-transform: rotate(0.5turn);
 }
 
 row.expander:not(:checked) image.expander-row-arrow:dir(rtl) {
-  -gtk-icon-transform: rotate(0.25turn);
+  -gtk-icon-transform: rotate(-0.5turn);
 }
 
 row.expander:checked image.expander-row-arrow:not(:disabled) {