diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index d61becc6..91e689c4 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1649,7 +1649,7 @@ menubar,
   }
 
   > menuitem {
-    transition: $transition;
+    transition: none;
     min-height: 20px;
     padding: 4px 8px;
     color: $titlebar-text-secondary;
@@ -1667,6 +1667,11 @@ menubar,
 
     label:disabled { color: inherit; } // to inherit the above color
 
+    > window.background.csd.popup > decoration,
+    > window.background.csd.popup > menu {
+      border-radius: 0 0 $menu-radius $menu-radius;
+    }
+
     > window.popup.background > menu {
       menuitem { transition: none; }
     }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 2c41c758..31824340 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2008,10 +2008,6 @@ popover.menu {
     }
   }
 
-  &.background separator {
-    margin: $space-size 0;
-  }
-
   arrow.left,
   radio.left,
   check.left {
@@ -2026,30 +2022,6 @@ popover.menu {
     margin-right: 0;
   }
 
-  modelbutton {
-    transition: background-color $duration $ease-out;
-    min-height: $menuitem-size - $space-size;
-    min-width: $menuitem-size * 2;
-    padding: $space-size / 2 $space-size * 1.5;
-    color: $text;
-    font: initial;
-    border-radius: $corner-radius;
-    @extend %button-flat-simple;
-
-    &:focus:not(:hover) {
-      transition: none;
-      box-shadow: none;
-      outline: none;
-    }
-
-    &:disabled { color: $text-disabled; }
-
-    arrow {
-      &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }
-      &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }
-    }
-  }
-
   label.title {
     font-weight: bold;
     padding: 4px ($space-size + 20px); //this will fall apart with font sizing
@@ -2134,6 +2106,39 @@ popover {
     padding: 0 8px;
   }
 
+  modelbutton {
+    transition: background-color $duration $ease-out;
+    min-height: $menuitem-size - $space-size;
+    min-width: $menuitem-size * 2;
+    padding: $space-size / 2 $space-size * 1.5;
+    color: $text;
+    font: initial;
+    border-radius: $corner-radius;
+    @extend %button-flat-simple;
+
+    &:focus:not(:hover) {
+      transition: none;
+      box-shadow: none;
+      outline: none;
+    }
+
+    &:disabled { color: $text-disabled; }
+
+    accelerator {
+      color: $text-disabled;
+      margin-left: $space-size * 5;
+
+      &:disabled {
+        color: $divider;
+      }
+    }
+
+    arrow {
+      &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }
+      &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }
+    }
+  }
+
   .osd &,
   &.touch-selection,
   &.magnifier {
@@ -3061,7 +3066,6 @@ scale {
       min-height: $slider_size;
       min-width: $slider_size;
       margin: $slider_margin;
-
       transition: all $duration $ease-out;
       border-radius: $circular-radius;
       color: $primary;