diff --git a/README.md b/README.md
index 87c57d8..59f6dbe 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,7 @@ If you want to remove installed gdm theme, then you can run:
 | Icon theme          | [WhiteSur-icon](https://github.com/vinceliuice/WhiteSur-icon-theme)| ![icon](pictures/whitesur-icon-theme.png) |
 | Wallpaper           | [WhiteSur wallpaper](https://github.com/vinceliuice/WhiteSur-kde/tree/master/wallpaper)| ![wallpaper](pictures/whitesur-wallpaper.png) |
 | Firefox theme       | [WhiteSur firefox theme](src/other/firefox)| ![firefox](pictures/firefox-theme.png) |
+| Dash to Dock theme  | [WhiteSur dash-to-dock theme](src/other/dash-to-dock)| ![firefox](pictures/dash-to-dock.png) |
 
 ## Theme Preview
 ![gtk](pictures/preview-gtk.png)
diff --git a/pictures/dash-to-dock.png b/pictures/dash-to-dock.png
new file mode 100644
index 0000000..aa952a1
Binary files /dev/null and b/pictures/dash-to-dock.png differ
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index f3dd7c5..f75058d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(16, 16, 16, 0.25);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.35);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index d2f0175..33acdd9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(16, 16, 16, 0.25);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.35);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index d2f0175..33acdd9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(16, 16, 16, 0.25);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.35);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index f3dd7c5..f75058d 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(16, 16, 16, 0.25);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.35);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index eb17870..09151e4 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(241, 241, 241, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.03);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index d479319..7d98430 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(241, 241, 241, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.03);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index d479319..7d98430 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(241, 241, 241, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.03);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 8f8c0e4..33924d4 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -336,9 +336,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.vertical .user-icon StIcon {
-  padding: 20px;
-  padding-top: 18px;
-  padding-bottom: 22px;
+  padding: 14px;
+  padding-top: 12px;
+  padding-bottom: 16px;
   width: 88px;
   height: 88px;
 }
@@ -348,9 +348,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .user-widget.horizontal .user-icon StIcon {
-  padding: 12px;
-  width: 15px;
-  height: 15px;
+  padding: 8px;
+  width: 10px;
+  height: 10px;
 }
 
 .caps-lock-warning-label {
@@ -1614,16 +1614,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .datemenu-calendar-column:ltr {
-  margin-right: 12px;
+  margin-right: 8px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
-  margin-left: 12px;
+  margin-left: 8px;
   border-right-width: 0;
 }
 
@@ -2414,10 +2414,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
-  row-spacing: 36px;
-  column-spacing: 36px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  row-spacing: 24px;
+  column-spacing: 24px;
+  max-row-spacing: 48px;
+  max-column-spacing: 48px;
 }
 
 .icon-grid .overview-icon {
@@ -2696,8 +2696,8 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog .icon-grid {
-  row-spacing: 12px;
-  column-spacing: 30px;
+  row-spacing: 8px;
+  column-spacing: 20px;
 }
 
 .app-folder-dialog .page-indicators {
@@ -2713,23 +2713,23 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .app-folder-dialog-container {
-  padding: 6px;
+  padding: 4px;
   width: 600px;
   height: 600px;
 }
 
 .app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px;
+  padding: 4px;
+  spacing-rows: 4px;
+  spacing-columns: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item {
-  spacing: 6px;
+  spacing: 4px;
 }
 
 .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
-  padding: 0 12px;
+  padding: 0 8px;
 }
 
 .workspace-thumbnails {
@@ -2924,7 +2924,7 @@ StWidget.focused .app-well-app-running-dot {
   border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
-  padding: 12px;
+  padding: 8px;
   border-style: solid;
   border-width: 0;
   border-left-width: 0;
@@ -3877,49 +3877,38 @@ StWidget.focused .app-well-app-running-dot {
   margin: 0;
 }
 
-#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
 }
 
-#dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash {
-  border-radius: 14px;
-}
-
-#dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
-  border-radius: 14px;
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
 }
 
 #dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
-  padding: 0 4px;
+  padding: 0 0;
 }
 
 #dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
-  padding: 4px 0;
+  padding: 0 0;
 }
 
 #dashtodockContainer #dash {
   background-color: rgba(241, 241, 241, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.03);
 }
 
 #dashtodockContainer #dash .app-well-app-running-dot {
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 20f807b..7ee0bb3 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -2348,6 +2348,10 @@ notebook > stack:not(:only-child) {
   background-color: #242424;
 }
 
+notebook:not(.frame), notebook:not(.frame) > stack {
+  border-radius: 0 0 14px 14px;
+}
+
 notebook > header {
   padding: 0;
   background-color: #1e1e1e;
@@ -5355,6 +5359,10 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s
   border-radius: 0 0 14px 14px;
 }
 
+.gedit-side-panel-paned statusbar frame > border {
+  border: none;
+}
+
 .gedit-search-slider {
   background-color: #383838;
   padding: 6px;
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 80879f1..27d0045 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -2348,6 +2348,10 @@ notebook > stack:not(:only-child) {
   background-color: #242424;
 }
 
+notebook:not(.frame), notebook:not(.frame) > stack {
+  border-radius: 0 0 14px 14px;
+}
+
 notebook > header {
   padding: 0;
   background-color: #1e1e1e;
@@ -5351,6 +5355,10 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s
   border-radius: 0 0 14px 14px;
 }
 
+.gedit-side-panel-paned statusbar frame > border {
+  border: none;
+}
+
 .gedit-search-slider {
   background-color: #383838;
   padding: 6px;
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 4bfbef2..da2858a 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -2357,6 +2357,10 @@ notebook > stack:not(:only-child) {
   background-color: #ffffff;
 }
 
+notebook:not(.frame), notebook:not(.frame) > stack {
+  border-radius: 0 0 14px 14px;
+}
+
 notebook > header {
   padding: 0;
   background-color: #e6e6e6;
@@ -5378,6 +5382,10 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s
   border-radius: 0 0 14px 14px;
 }
 
+.gedit-side-panel-paned statusbar frame > border {
+  border: none;
+}
+
 .gedit-search-slider {
   background-color: #fafafa;
   padding: 6px;
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index be3b315..099bbb6 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -2357,6 +2357,10 @@ notebook > stack:not(:only-child) {
   background-color: #ffffff;
 }
 
+notebook:not(.frame), notebook:not(.frame) > stack {
+  border-radius: 0 0 14px 14px;
+}
+
 notebook > header {
   padding: 0;
   background-color: #e6e6e6;
@@ -5374,6 +5378,10 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s
   border-radius: 0 0 14px 14px;
 }
 
+.gedit-side-panel-paned statusbar frame > border {
+  border: none;
+}
+
 .gedit-search-slider {
   background-color: #fafafa;
   padding: 6px;
diff --git a/src/other/dash-to-dock/README.md b/src/other/dash-to-dock/README.md
new file mode 100644
index 0000000..d833dcb
--- /dev/null
+++ b/src/other/dash-to-dock/README.md
@@ -0,0 +1,26 @@
+## WhiteSur dash-to-dock theme
+
+## Installation
+
+### Install tips
+
+Usage:  `./Install`  **[OPTIONS...]**
+
+|  OPTIONS:           | |
+|:--------------------|:-------------|
+| with no option      | it'll run a terminal dialog to install the theme |
+|-d, --dark           | install dark version |
+|-l, --light          | install light version |
+|-h, --help           | Show this help|
+
+### Manual installation
+
+Copy `../src/other/dash-to-dock/stylesheet.css` to `../.local/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com`
+
+then you can:
+
+1. Open `Dash to Dock Settings`.
+2. Go to `[Appearance]` > `[Use built-in theme]` and turn it on.
+3. Copy `chrome` folder Firefox config folder.
+4. Restart Dash to Dock.
+5. Be happy with your new dash-to-dock theme.
diff --git a/src/other/dash-to-dock/install.sh b/src/other/dash-to-dock/install.sh
new file mode 100755
index 0000000..fd78bc4
--- /dev/null
+++ b/src/other/dash-to-dock/install.sh
@@ -0,0 +1,138 @@
+#!/bin/bash
+
+set  -o errexit
+
+[  GLOBAL::CONF  ]
+{
+  REPO_DIR=$(cd $(dirname $0) && pwd)
+  readonly ROOT_UID=0
+}
+
+# Destination directory
+if [ "$UID" -eq "$ROOT_UID" ]; then
+  DEST_DIR="/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com"
+else
+  DEST_DIR="$HOME/.local/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com"
+fi
+
+#COLORS
+CDEF=" \033[0m"                                     # default color
+CCIN=" \033[0;36m"                                  # info color
+CGSC=" \033[0;32m"                                  # success color
+CRER=" \033[0;31m"                                  # error color
+CWAR=" \033[0;33m"                                  # waring color
+b_CDEF=" \033[1;37m"                                # bold default color
+b_CCIN=" \033[1;36m"                                # bold info color
+b_CGSC=" \033[1;32m"                                # bold success color
+b_CRER=" \033[1;31m"                                # bold error color
+b_CWAR=" \033[1;33m"                                # bold warning color
+
+usage() {
+  printf "%s\n" "Usage: ${0##*/} [OPTIONS...]"
+  printf "\n%s\n" "OPTIONS:"
+  printf "  %-25s%s\n" "-d, --dark" "install dark theme"
+  printf "  %-25s%s\n" "-l, --light" "install light theme"
+  printf "  %-25s%s\n" "-h, --help" "Show this help"
+}
+
+# echo like ...  with  flag type  and display message  colors
+prompt () {
+  case ${1} in
+    "-s"|"--success")
+      echo -e "${b_CGSC}${@/-s/}${CDEF}";;    # print success message
+    "-e"|"--error")
+      echo -e "${b_CRER}${@/-e/}${CDEF}";;    # print error message
+    "-w"|"--warning")
+      echo -e "${b_CWAR}${@/-w/}${CDEF}";;    # print warning message
+    "-i"|"--info")
+      echo -e "${b_CCIN}${@/-i/}${CDEF}";;    # print info message
+    *)
+    echo -e "$@"
+    ;;
+  esac
+}
+
+# Check command avalibility
+function has_command() {
+  command -v $1 > /dev/null
+}
+
+operation_canceled() {
+  clear
+  prompt  -i "\n Operation canceled by user, Bye!"
+  exit 1
+}
+
+install_theme() {
+  if [[ -f ${DEST_DIR}/stylesheet.css ]]; then
+    mv -n ${DEST_DIR}/stylesheet.css ${DEST_DIR}/stylesheet.css.back
+    cp -r ${REPO_DIR}/stylesheet$color.css ${DEST_DIR}/stylesheet.css
+  else
+    prompt -i "\n stylesheet.css not exist!"
+    exit 0
+  fi
+}
+
+run_dialog() {
+  if [[ -x /usr/bin/dialog ]]; then
+    tui=$(dialog --backtitle "dash-to-dock theme installer" \
+    --radiolist "Choose your color version:" 15 40 5 \
+      1 "light" on  \
+      2 "dark" off --output-fd 1 )
+      case "$tui" in
+        1) color='' ;;
+        2) color='-dark' ;;
+        *) operation_canceled ;;
+     esac
+  fi
+}
+
+install_dialog() {
+  if [ ! "$(which dialog 2> /dev/null)" ]; then
+    prompt -w "\n 'dialog' needs to be installed for this shell"
+    if has_command zypper; then
+      sudo zypper in dialog
+    elif has_command apt-get; then
+      sudo apt-get install dialog
+    elif has_command dnf; then
+      sudo dnf install -y dialog
+    elif has_command yum; then
+      sudo yum install dialog
+    elif has_command pacman; then
+      sudo pacman -S --noconfirm dialog
+    fi
+  fi
+}
+
+# Show terminal user interface for better use
+if [[ $# -lt 1 ]] && [[ -x /usr/bin/dialog ]] ; then
+  run_dialog
+fi
+
+while [[ $# -ge 1 ]]; do
+  case "${1}" in
+    -l|--light)
+      color=''
+      ;;
+    -d|--dark)
+      color='-dark'
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      prompt -e "ERROR: Unrecognized installation option '$1'."
+      prompt -i "Try '$0 --help' for more information."
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+install_theme
+
+echo
+prompt -s Done.
+
+notify-send "All done!" "Go to [Dash to Dock Settings] > [Appearance] > [Use built-in theme] and turn it on!" -i face-smile
diff --git a/src/other/dash-to-dock/stylesheet-dark.css b/src/other/dash-to-dock/stylesheet-dark.css
new file mode 100644
index 0000000..e3acafd
--- /dev/null
+++ b/src/other/dash-to-dock/stylesheet-dark.css
@@ -0,0 +1,90 @@
+#dashtodockContainer {
+  background: transparent;
+}
+
+#dashtodockContainer .app-well-app-running-dot {
+  background-color: white;
+}
+
+#dashtodockContainer #dash, #dashtodockContainer:overview #dash, #dashtodockContainer.extended #dash, #dashtodockContainer.extended:overview #dash {
+  padding: 0;
+  border: none;
+  margin: 0;
+}
+
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
+  padding: 0 0;
+}
+
+#dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
+  padding: 0 0;
+}
+
+#dashtodockContainer #dash {
+  background-color: rgba(16, 16, 16, 0.25);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.35);
+}
+
+#dashtodockContainer #dash .app-well-app-running-dot {
+  background-color: rgba(255, 255, 255, 0.85);
+}
+
+#dashtodockContainer #dash StWidget.focused .app-well-app-running-dot {
+  background-color: #0860f2;
+}
+
+#dashtodockContainer.opaque #dash {
+  background-color: rgba(16, 16, 16, 0.25);
+}
+
+#dashtodockContainer.transparent #dash {
+  background-color: rgba(16, 16, 16, 0.25);
+}
+
+#dashtodockContainer:overview #dash {
+  background-color: rgba(255, 255, 255, 0.15);
+}
+
+#dashtodockContainer:overview #dash .app-well-app-running-dot {
+  background-color: rgba(255, 255, 255, 0.85);
+}
+
+#dashtodockContainer:overview #dash StWidget.focused .app-well-app-running-dot {
+  background-color: #0860f2;
+}
+
+#dashtodockContainer.opaque:overview #dash, #dashtodockContainer.transparent:overview #dash {
+  background-color: transparent !important;
+  box-shadow: none !important;
+}
+
+#dashtodockContainer.extended:overview #dash, #dashtodockContainer.opaque.extended:overview #dash, #dashtodockContainer.transparent.extended:overview #dash {
+  background-color: rgba(16, 16, 16, 0.25);
+}
+
+#dashtodockContainer .app-well-app .overview-icon,
+#dashtodockContainer .show-apps .overview-icon {
+  padding: 8px;
+  background-size: contain;
+}
diff --git a/src/other/dash-to-dock/stylesheet.css b/src/other/dash-to-dock/stylesheet.css
new file mode 100644
index 0000000..b13aeab
--- /dev/null
+++ b/src/other/dash-to-dock/stylesheet.css
@@ -0,0 +1,90 @@
+#dashtodockContainer {
+  background: transparent;
+}
+
+#dashtodockContainer .app-well-app-running-dot {
+  background-color: black;
+}
+
+#dashtodockContainer #dash, #dashtodockContainer:overview #dash, #dashtodockContainer.extended #dash, #dashtodockContainer.extended:overview #dash {
+  padding: 0;
+  border: none;
+  margin: 0;
+}
+
+#dashtodockContainer.top #dash, #dashtodockContainer.top:overview #dash, #dashtodockContainer.top.extended #dash, #dashtodockContainer.top.extended:overview #dash {
+  margin-top: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.bottom #dash, #dashtodockContainer.bottom:overview #dash, #dashtodockContainer.bottom.extended #dash, #dashtodockContainer.bottom.extended:overview #dash {
+  margin-bottom: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.left #dash, #dashtodockContainer.left:overview #dash, #dashtodockContainer.left.extended #dash, #dashtodockContainer.left.extended:overview #dash {
+  margin-left: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.right #dash, #dashtodockContainer.right:overview #dash, #dashtodockContainer.right.extended #dash, #dashtodockContainer.right.extended:overview #dash {
+  margin-right: 4px;
+  border-radius: 18px;
+}
+
+#dashtodockContainer.top #dash, #dashtodockContainer.bottom #dash {
+  padding: 0 0;
+}
+
+#dashtodockContainer.left #dash, #dashtodockContainer.right #dash {
+  padding: 0 0;
+}
+
+#dashtodockContainer #dash {
+  background-color: rgba(241, 241, 241, 0.15);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(0, 0, 0, 0.03);
+}
+
+#dashtodockContainer #dash .app-well-app-running-dot {
+  background-color: rgba(0, 0, 0, 0.85);
+}
+
+#dashtodockContainer #dash StWidget.focused .app-well-app-running-dot {
+  background-color: #0860f2;
+}
+
+#dashtodockContainer.opaque #dash {
+  background-color: rgba(241, 241, 241, 0.15);
+}
+
+#dashtodockContainer.transparent #dash {
+  background-color: rgba(241, 241, 241, 0.15);
+}
+
+#dashtodockContainer:overview #dash {
+  background-color: rgba(255, 255, 255, 0.15);
+}
+
+#dashtodockContainer:overview #dash .app-well-app-running-dot {
+  background-color: rgba(255, 255, 255, 0.85);
+}
+
+#dashtodockContainer:overview #dash StWidget.focused .app-well-app-running-dot {
+  background-color: #0860f2;
+}
+
+#dashtodockContainer.opaque:overview #dash, #dashtodockContainer.transparent:overview #dash {
+  background-color: transparent !important;
+  box-shadow: none !important;
+}
+
+#dashtodockContainer.extended:overview #dash, #dashtodockContainer.opaque.extended:overview #dash, #dashtodockContainer.transparent.extended:overview #dash {
+  background-color: rgba(241, 241, 241, 0.15);
+}
+
+#dashtodockContainer .app-well-app .overview-icon,
+#dashtodockContainer .show-apps .overview-icon {
+  padding: 8px;
+  background-size: contain;
+}
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index fe9d8aa..ff39132 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -26,7 +26,7 @@ $small_size: if($laptop == 'false', 24px, 20px);
 $medium_size: if($laptop == 'false', 36px, 32px);
 $large_size: if($laptop == 'false', 48px, 44px);
 $menuitem_size: if($laptop == 'false', 32px, 28px);
-$container_padding: 6px;
+$container_padding: if($laptop == 'false', 6px, 4px);
 
 // radiuses
 $circular_radius: 9999px;
diff --git a/src/sass/gnome-shell/_extensions.scss b/src/sass/gnome-shell/_extensions.scss
index 84d9c28..ce5d65a 100644
--- a/src/sass/gnome-shell/_extensions.scss
+++ b/src/sass/gnome-shell/_extensions.scss
@@ -2,6 +2,7 @@
 
 $dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.15), rgba(#101010, 0.25));
 $dash_panel_fg: if($variant == 'light', black, white);
+$dash_radius: 18px;
 
 #dashtodockContainer {
   background: transparent;
@@ -19,28 +20,31 @@ $dash_panel_fg: if($variant == 'light', black, white);
     margin: 0;
   }
 
-  @each $_dock, $_radius in (top, $wm_radius),
-                            (bottom, $wm_radius),
-                            (left, $wm_radius),
-                            (right, $wm_radius) {
+  @each $_dock, $_radius in (top, $dash_radius),
+                            (bottom, $dash_radius),
+                            (left, $dash_radius),
+                            (right, $dash_radius) {
     &.#{$_dock} #dash,
-    &.#{$_dock}:overview #dash { border-radius: #{$_radius}; }
-
+    &.#{$_dock}:overview #dash,
     &.#{$_dock}.extended #dash,
-    &.#{$_dock}.extended:overview #dash { border-radius: #{$_radius}; }
+    &.#{$_dock}.extended:overview #dash {
+      margin-#{$_dock}: $container_padding;
+      border-radius: #{$_radius};
+    }
   }
 
   &.top, &.bottom {
-    #dash { padding: 0 4px; }
+    #dash { padding: 0 0; }
   }
 
   &.left, &.right {
-    #dash { padding: 4px 0; }
+    #dash { padding: 0 0; }
   }
 
   #dash { // default-mode
     background-color: $dash_panel_bg;
     box-shadow: inset 0 0 0 1px rgba(white, 0.05);
+    border: 1px solid if($variant == 'light', rgba(black, 0.03), rgba(black, 0.35));
 
     .app-well-app-running-dot {
       background-color: rgba($dash_panel_fg, 0.85);
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 886505d..2f31bc1 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -719,6 +719,8 @@ window.org-gnome-gedit {
   border-top: 1px solid $borders_color;
   background-color: $bg_color;
   border-radius: 0 0 $wm_radius $wm_radius;
+
+  frame > border { border: none; }
 }
 
 .gedit-search-slider {
@@ -753,7 +755,6 @@ window.org-gnome-gedit {
   }
 }
 
-
 //
 // Pluma
 //
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index 1f25414..f211d24 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -2094,6 +2094,10 @@ notebook {
     background-color: $base_color;
   }
 
+  &:not(.frame), &:not(.frame) > stack {
+    border-radius: 0 0 $wm_radius $wm_radius;
+  }
+
   > header {
     padding: 0;
     background-color: darken($header_bg, 10%);