update

src/sass/_colors.scss

@@ -276,6 +276,7 @@ $entry_highlight:                   rgba($selection_mode_bg, 0.75);
 
 // Button colors
 $button_bg:                         if($variant == 'light', white, #656565);
+$button_shell_bg:                   if($variant == 'light', mix(black, $dialog_bg_color, 6%), mix(white, $dialog_bg_color, 6%));
 
 @if $scheme == 'nord' {
   $button_bg:                       if($variant == 'light', #fbfcfd, #556075);

src/sass/gnome-shell/_drawing.scss

@@ -195,7 +195,7 @@
   }
 }
 
-@mixin button($t, $c: $button_bg, $tc: $fg_color) {
+@mixin button($t, $c: $button_shell_bg, $tc: $fg_color) {
 //
 // button
 //
@@ -214,7 +214,7 @@
 
   @if $t == focus {
     color: $tc;
-    background-color: $c;
+    // background-color: $c;
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none !important;
@@ -222,7 +222,7 @@
 
   @if $t == hover {
     color: $tc;
-    background-color: if($variant=='light', darken($c, 3%), lighten($c, 3%));
+    background-color: mix($tc, $c, 6%);
     border: none;
     text-shadow: none;
     icon-shadow: none;
@@ -230,7 +230,7 @@
 
   @if $t == active {
     color: $tc;
-    background-color: if($variant=='light', darken($c, 5%), lighten($c, 5%));
+    background-color: mix($tc, $c, 12%);
     border: none;
     text-shadow: none;
     icon-shadow: none;
@@ -246,7 +246,7 @@
 
   @if $t == insensitive {
     color: if($tc == $fg_color, $disabled_fg_color, $tc);
-    background-color: if($c == $base_color, $divider_color, $c);
+    background-color: if($c == $button_bg, $divider_color, $c);
     border: none;
     text-shadow: none;
     icon-shadow: none;

src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss

@@ -172,6 +172,10 @@
       border: 1px solid if($variant == 'light', rgba(black, 0.08), rgba(black, 0.75));
       box-shadow: inset 0 0 0 1px rgba(white, 0.05);
     }
+
+    .dash-separator {
+      background-color: $divider_color;
+    }
   }
 
   &:overview #dash { // overview-mode #1

src/sass/gnome-shell/widgets-46-0/_dash.scss

@@ -81,9 +81,9 @@ $dash_spacing: $base_margin * 0.5;
   // separator between pinned and running apps
   .dash-separator {
     width: 1px;
-    margin-left:$base_margin;
+    margin-left: $base_margin;
-    margin-right:$base_margin;
+    margin-right: $base_margin;
-    background-color: rgba(white, 0.25);
+    background-color: rgba(white, 0.15);
   }
 
   // make sure all dash components have same margin from screen edge

src/sass/gnome-shell/widgets-47-0/_dialogs.scss

@@ -11,7 +11,6 @@
 %last_dialog_button {
   color: white !important;
   background-color: $primary_color;
-  box-shadow: inset 0 1px 0 0 rgba(white,0.1);
   background-gradient-direction: none !important;
 
   &:hover {
@@ -40,39 +39,39 @@
 // modal dialog
 .modal-dialog {
   color: $fg_color;
-  padding: $base_padding * 2;
+  padding: $base_padding * 3;
   @extend %theme_dialogs !optional;
 
-  &-linked-button {
-    min-height: 40px;
-    padding: 0 16px;
-    margin: 0 !important;
-    border: none !important;
-    border-radius: $modal_radius - $base_padding * 2;
-
-    @include font(button);
-    @include button(flat-normal);
-    &:hover { @include button(flat-hover); }
-    &:active { @include button(flat-active); }
-    &:insensitive { @include button(flat-insensitive); }
-    &:focus { @include button(flat-focus); }
-  }
-
-  &-linked-button:first-child {
-    background: $entry_bg;
-    &:hover { @include button(flat-hover); }
-    &:active { @include button(flat-active); }
-  }
-
-  &-linked-button:last-child {
-    @extend %last_dialog_button;
-  }
-
   .modal-dialog-content-box {
     margin: 32px 40px;
     spacing: 32px;
     max-width: 28em;
   }
+
+  .modal-dialog-button-box {
+    padding-top: $base_padding;
+    spacing: 0;
+
+    .modal-dialog-button {
+      min-height: 40px;
+      padding: 0 16px;
+      margin: 0 !important;
+      border: none !important;
+      border-radius: $modal_radius - $base_padding * 2;
+
+      @include font(button);
+      @include button(normal);
+      &:hover { @include button(hover); }
+      &:active { @include button(active); }
+      &:checked { @include button(checked); }
+      &:insensitive { @include button(insensitive); }
+      &:focus { @include button(focus); }
+
+      &:last-child {
+        @extend %last_dialog_button;
+      }
+    }
+  }
 }
 
 // End Session Dialog

src/sass/gtk/_common-3.0.scss

@@ -918,6 +918,13 @@ button {
     &.text-button {
       padding-left: $container_padding + 4px;
       padding-right: $container_padding + 4px;
+      min-width: 80px;
+
+      &.circular {
+        min-height: $menuitem_size - 4px;
+        min-width: $menuitem_size - 4px;
+        padding: $container_padding - 2px;
+      }
     }
 
     &.image-button {
@@ -4276,11 +4283,6 @@ colorchooser .popover.osd { border-radius: $bt_radius; }
   box-shadow: inset 0px -2px 0px if($variant=='light', transparentize(black, 0.95), transparentize(black, 0.85));
 }
 
-stackswitcher {
-  button.text-button { min-width: 80px; }
-  // button.circular { @extend %circular_button; }
-}
-
 viewswitcher {
   button:not(.suggested-action):not(.destructive-action) {
     margin: 0;