diff --git a/src/sass/gnome-shell/extensions-40-0/_misc.scss b/src/sass/gnome-shell/extensions-40-0/_misc.scss
index 4471ec23..edf2759f 100644
--- a/src/sass/gnome-shell/extensions-40-0/_misc.scss
+++ b/src/sass/gnome-shell/extensions-40-0/_misc.scss
@@ -57,8 +57,26 @@
 // Cosmic desktop (Pop_OS)
 //
 
+.cosmic-dock {
+  #dock {
+    border-radius: $icon_radius !important;
+    border: none !important;
+    margin: 6px !important;
+    background-color: $dash_background_color !important;
+    box-shadow: inset 0 1px rgba(white, 0.08) !important;
+
+    .dash-background {
+      background-color: transparent !important;
+      margin-bottom: 0 !important;
+      padding: 0;
+      box-shadow: none !important;
+    }
+  }
+}
+
 .cosmic-application-dialog {
-  box-shadow: 0 3px 6px 0 rgba(black, 0.15);
+  border-radius: $menu_radius;
+  box-shadow: 0 3px 6px rgba(black, 0.08);
   background-color: $popover;
   color: $text;
 
@@ -73,7 +91,7 @@
 
 .cosmic-folder-edit-button {
 	box-shadow: none;
-	border-radius: $corner-radius;
+	border-radius: $base_radius;
 	border-width: 0;
   color: $text;
   background: $fill;
@@ -99,7 +117,7 @@
 .pop-shell-active-hint {
   border-style: solid;
   border-color: $warning;
-  border-radius: $corner-radius;
+  border-radius: $base_radius;
   box-shadow: none;
 }
 
@@ -109,7 +127,7 @@
 
 .pop-shell-search-element:select{
   background: $divider;
-  border-radius: $corner-radius;
+  border-radius: $base_radius;
   color: $text;
 }
 
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 7e2113fe..28a242e0 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -590,28 +590,26 @@ button {
     min-width: $small-size;
     min-width: $small-size;
     padding: ($medium-size - 24px) / 2;
-    box-shadow: none;
-    background-color: rgba(black, 0.35);
-    color: white;
+    background-color: $osd;
+    color: on($osd);
 
     &:focus {
-      box-shadow: inset 0 0 0 2px rgba(black, 0.1);
-      color: white;
+      box-shadow: none;
     }
 
     &:hover {
-      background-color: rgba(black, 0.45);
-      color: white;
+      background-color: mix(white, $osd, 15%);
+      color: on($osd);
     }
 
     &:active {
-      background-color: rgba(black, 0.65);
-      color: white;
+      background-color: mix(white, $osd, 25%);
+      color: on($osd);
     }
 
     &:disabled {
-      background-color: rgba(black, 0.15);
-      color: rgba(white, 0.35);
+      background-color: transparent;
+      color: transparent;
     }
 
     &.image-button, &.circular {