diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
index 670228bd..3f770080 100644
--- a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
@@ -58,6 +58,10 @@
       margin-top: 0 !important;
       padding: $dash_padding !important;
 
+      #dashtodockDashContainer {
+        padding: $dash_padding 0 !important;
+      }
+
       .dash-background {
         margin-bottom: 0 !important;
         padding: $dash_padding !important;
@@ -67,6 +71,84 @@
         padding: $dash_spacing $base_padding !important;
       }
     }
+
+    &.extended {
+      #dash {
+        #dashtodockDashContainer {
+          padding: 0 !important;
+
+          #dashtodockDashScrollview:first-child {
+            padding-top: 0 !important;
+          }
+
+          #dashtodockDashScrollview:last-child {
+            padding-bottom: 0 !important;
+          }
+
+          & > :first-child {
+            .show-apps {
+              padding-bottom: $container_padding !important;
+            }
+          }
+
+          & > :last-child {
+            .show-apps {
+              padding-bottom: $dash_padding + $container_padding !important;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &.top,
+  &.bottom {
+    #dash {
+      margin-top: 0 !important;
+      padding: $dash_padding !important;
+
+      #dashtodockDashContainer {
+        padding: $dash_padding 0 !important;
+      }
+
+      .dash-background {
+        margin-bottom: 0 !important;
+        padding: $dash_padding !important;
+        border-left: none !important;
+      }
+
+      .dash-item-container .app-well-app, .show-apps {
+        padding: $base_padding $dash_spacing !important;
+      }
+    }
+
+    &.extended {
+      #dash {
+        #dashtodockDashContainer {
+          padding: 0 !important;
+
+          #dashtodockDashScrollview:first-child {
+            padding-left: 0 !important;
+          }
+
+          #dashtodockDashScrollview:last-child {
+            padding-right: 0 !important;
+          }
+
+          & > :first-child {
+            .show-apps {
+              padding-left: $container_padding !important;
+            }
+          }
+
+          & > :last-child {
+            .show-apps {
+              padding-right: $dash_padding + $container_padding !important;
+            }
+          }
+        }
+      }
+    }
   }
 
   #dash { // default-mode
@@ -95,12 +177,12 @@
         background-color: if($variant == 'light', rgba(white, 0.35), $light_track_color);
       }
     }
-  }
 
-  .dash-background {
-    background-color: $dash_bg;
-    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-background {
+      background-color: $dash_bg;
+      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);
+    }
   }
 
   &:overview #dash { // overview-mode #1
diff --git a/src/sass/gnome-shell/widgets-40-0/_dash.scss b/src/sass/gnome-shell/widgets-40-0/_dash.scss
index 4d4f1a6d..cbeb6137 100644
--- a/src/sass/gnome-shell/widgets-40-0/_dash.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_dash.scss
@@ -23,7 +23,7 @@ $dash_border_radius: $dash_padding * 1.5 + 12px;
   .dash-background {
     background-color: $dash_background_color;
     margin-bottom: $dash_bottom_margin;
-    padding: $dash_padding $dash_padding - $dash_spacing * 2;
+    padding: $dash_padding $dash_padding - $dash_spacing * 2 !important;
     border-radius: $dash_border_radius;
   }
 
@@ -34,12 +34,12 @@ $dash_border_radius: $dash_padding * 1.5 + 12px;
     > * { margin: 0; }
 
     .app-well-app, .show-apps {
-      padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
+      padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin !important;
     }
 
     .overview-icon {
       padding: $dash_padding / 2;
-      border-radius: $dash_padding / 2 + 12px;
+      border-radius: $dash_border_radius - $dash_padding;
     }
   }