diff --git a/install.sh b/install.sh
index af80afd..a6cbac5 100755
--- a/install.sh
+++ b/install.sh
@@ -133,6 +133,7 @@ install() {
 
   if [[ ${alt} == '-alt' || ${opacity} == '-solid' ]] &&  [[ ${color} == '-light' ]]; then
     cp -r ${SRC_DIR}/assets/gnome-shell/activities-black/activities${icon}.svg          ${THEME_DIR}/gnome-shell/assets/activities.svg
+    cp -r ${SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg                ${THEME_DIR}/gnome-shell/assets/activities-white.svg
   fi
 
   mkdir -p                                                                              ${THEME_DIR}/gtk-2.0
diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css
index 92513ee..e369321 100644
--- a/src/main/gnome-shell/gdm3-dark.css
+++ b/src/main/gnome-shell/gdm3-dark.css
@@ -65,7 +65,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0.75);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -975,8 +975,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -985,8 +986,8 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -994,8 +995,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1003,7 +1005,7 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:insensitive,
 .unlock-dialog .modal-dialog-button:default:insensitive {
   color: rgba(255, 255, 255, 0.45);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
diff --git a/src/main/gnome-shell/gdm3-light.css b/src/main/gnome-shell/gdm3-light.css
index f87cf96..b69bfa5 100644
--- a/src/main/gnome-shell/gdm3-light.css
+++ b/src/main/gnome-shell/gdm3-light.css
@@ -65,7 +65,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -975,8 +975,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -985,7 +986,7 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -994,8 +995,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index 36365ef..1e67a3d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #dedede;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -113,7 +114,7 @@ stage {
 
 .hotplug-notification-item:insensitive {
   color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
@@ -121,8 +122,8 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #dedede;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -131,12 +132,14 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  color: #dedede;
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0.75);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.16);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,8 +2108,8 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2100,7 +2127,7 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:insensitive,
 .unlock-dialog .modal-dialog-button:default:insensitive {
   color: rgba(255, 255, 255, 0.45);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
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 e4a6c4b..0f1c9d5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #dedede;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -113,7 +114,7 @@ stage {
 
 .hotplug-notification-item:insensitive {
   color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
@@ -121,8 +122,8 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #dedede;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -131,12 +132,14 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  color: #dedede;
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0.75);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.16);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,8 +2108,8 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2100,7 +2127,7 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:insensitive,
 .unlock-dialog .modal-dialog-button:default:insensitive {
   color: rgba(255, 255, 255, 0.45);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
@@ -3093,7 +3120,7 @@ StEntry StLabel.hint-text {
 }
 
 #panel {
-  background-color: rgba(42, 42, 42, 0.75);
+  background-color: rgba(42, 42, 42, 0.95);
   /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
@@ -3132,7 +3159,7 @@ StEntry StLabel.hint-text {
 
 #panel .panel-corner {
   -panel-corner-radius: 0;
-  -panel-corner-background-color: rgba(42, 42, 42, 0.75);
+  -panel-corner-background-color: rgba(42, 42, 42, 0.95);
   -panel-corner-border-width: 2px;
   -panel-corner-border-color: transparent;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index e4a6c4b..0f1c9d5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #dedede;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -113,7 +114,7 @@ stage {
 
 .hotplug-notification-item:insensitive {
   color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
@@ -121,8 +122,8 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #dedede;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -131,12 +132,14 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  color: #dedede;
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0.75);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.16);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,8 +2108,8 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2100,7 +2127,7 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:insensitive,
 .unlock-dialog .modal-dialog-button:default:insensitive {
   color: rgba(255, 255, 255, 0.45);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
@@ -3093,7 +3120,7 @@ StEntry StLabel.hint-text {
 }
 
 #panel {
-  background-color: rgba(42, 42, 42, 0.75);
+  background-color: rgba(42, 42, 42, 0.95);
   /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
@@ -3132,7 +3159,7 @@ StEntry StLabel.hint-text {
 
 #panel .panel-corner {
   -panel-corner-radius: 0;
-  -panel-corner-background-color: rgba(42, 42, 42, 0.75);
+  -panel-corner-background-color: rgba(42, 42, 42, 0.95);
   -panel-corner-border-width: 2px;
   -panel-corner-border-color: transparent;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 36365ef..1e67a3d 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #dedede;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -113,7 +114,7 @@ stage {
 
 .hotplug-notification-item:insensitive {
   color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
@@ -121,8 +122,8 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #dedede;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -131,12 +132,14 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  color: #dedede;
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0.75);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.16);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #242424;
+  background-color: #656565;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,8 +2108,8 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.15);
-  background-color: #2c2c2c;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  background-color: #6d6d6d;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: rgba(0, 0, 0, 0.15);
+  background-color: transparent;
+  background-image: #727272;
+  border: 1px solid rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2100,7 +2127,7 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:insensitive,
 .unlock-dialog .modal-dialog-button:default:insensitive {
   color: rgba(255, 255, 255, 0.45);
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: #656565;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   icon-shadow: none;
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 8e31dc7..41a6176 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #242424;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -121,7 +122,7 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #242424;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -131,12 +132,14 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  color: #242424;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(0, 0, 0, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,7 +2108,7 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -3307,6 +3334,10 @@ StEntry StLabel.hint-text {
   border: none;
 }
 
+#panel #panelActivities.panel-button:overview > * {
+  background-image: url("assets/activities-white.svg");
+}
+
 .popup-menu {
   min-width: 12em;
   color: #424242;
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 102d552..645d377 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #242424;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -121,7 +122,7 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #242424;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -131,12 +132,14 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  color: #242424;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(0, 0, 0, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,7 +2108,7 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -3093,7 +3120,7 @@ StEntry StLabel.hint-text {
 }
 
 #panel {
-  background-color: rgba(241, 241, 241, 0.75);
+  background-color: rgba(241, 241, 241, 0.95);
   /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
@@ -3132,7 +3159,7 @@ StEntry StLabel.hint-text {
 
 #panel .panel-corner {
   -panel-corner-radius: 0;
-  -panel-corner-background-color: rgba(241, 241, 241, 0.75);
+  -panel-corner-background-color: rgba(241, 241, 241, 0.95);
   -panel-corner-border-width: 2px;
   -panel-corner-border-color: transparent;
 }
@@ -3307,6 +3334,10 @@ StEntry StLabel.hint-text {
   border: none;
 }
 
+#panel #panelActivities.panel-button:overview > * {
+  background-image: url("assets/activities-white.svg");
+}
+
 .popup-menu {
   min-width: 12em;
   color: #424242;
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index 102d552..645d377 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #242424;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -121,7 +122,7 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #242424;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -131,12 +132,14 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  color: #242424;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(0, 0, 0, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,7 +2108,7 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -3093,7 +3120,7 @@ StEntry StLabel.hint-text {
 }
 
 #panel {
-  background-color: rgba(241, 241, 241, 0.75);
+  background-color: rgba(241, 241, 241, 0.95);
   /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
@@ -3132,7 +3159,7 @@ StEntry StLabel.hint-text {
 
 #panel .panel-corner {
   -panel-corner-radius: 0;
-  -panel-corner-background-color: rgba(241, 241, 241, 0.75);
+  -panel-corner-background-color: rgba(241, 241, 241, 0.95);
   -panel-corner-border-width: 2px;
   -panel-corner-border-color: transparent;
 }
@@ -3307,6 +3334,10 @@ StEntry StLabel.hint-text {
   border: none;
 }
 
+#panel #panelActivities.panel-button:overview > * {
+  background-image: url("assets/activities-white.svg");
+}
+
 .popup-menu {
   min-width: 12em;
   color: #424242;
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index dfb61de..512b322 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -100,8 +100,9 @@ stage {
 
 .hotplug-notification-item {
   color: #242424;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
   padding: 8px;
@@ -121,7 +122,7 @@ stage {
 
 .hotplug-notification-item:hover {
   color: #242424;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -131,12 +132,14 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
+  box-shadow: none;
 }
 
 .hotplug-notification-item:active {
-  color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  color: #242424;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -157,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  border: none;
+  border: 1px solid rgba(0, 0, 0, 0);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -1288,6 +1291,28 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.modal-dialog-linked-button:first-child {
+  background: rgba(0, 0, 0, 0.05);
+}
+
+.modal-dialog-linked-button:first-child:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.modal-dialog-linked-button:first-child:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
 .modal-dialog .modal-dialog-content-box {
   margin: 32px 40px;
   spacing: 32px;
@@ -2072,8 +2097,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default,
 .unlock-dialog .modal-dialog-button:default {
   color: white;
-  background-color: #ffffff;
+  background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.02);
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2082,7 +2108,7 @@ StEntry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:default:hover,
 .unlock-dialog .modal-dialog-button:default:focus {
   color: white;
-  border-color: rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #f7f7f7;
   text-shadow: none;
   icon-shadow: none;
@@ -2091,8 +2117,9 @@ StEntry StLabel.hint-text {
 .login-dialog .modal-dialog-button:default:active,
 .unlock-dialog .modal-dialog-button:default:active {
   color: white;
-  background-color: #0860F2;
-  border-color: #487afa;
+  background-color: transparent;
+  background-image: #f2f2f2;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index 113a4c1..80907e4 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -174,7 +174,7 @@
   }
 }
 
-@mixin button($t, $c: $base_color, $tc: $fg_color) {
+@mixin button($t, $c: $button_bg, $tc: $fg_color) {
 //
 // button
 //
@@ -184,10 +184,15 @@
 //
 
   @if $t == normal {
-    color: if($tc == $fg_color, $fg_color, $tc);
+    color: $tc;
     background-color: $c;
     border: 1px solid $button_borders;
 
+    @if $variant=='light' { box-shadow: 0 1px 2px 0 rgba(black, 0.02); }
+    @if $variant=='dark' {
+      box-shadow: inset 0 1px $button_highlight;
+    }
+
     text-shadow: none;
     icon-shadow: none;
   }
@@ -196,20 +201,22 @@
     color: $tc;
     text-shadow: none;
     icon-shadow: none;
+    box-shadow: none;
   }
 
   @if $t == hover {
     color: $tc;
-    border-color: $button_borders_hover;
+    border: 1px solid $button_borders_hover;
     background-color: if($variant=='light', darken($c, 3%), lighten($c, 3%));
     text-shadow: none;
     icon-shadow: none;
   }
 
   @if $t == active {
-    color: $light_fg_color;
-    background-color: $primary_color;
-    border-color: $button_borders_active;
+    color: $tc;
+    background-color: transparent;
+    background-image: if($variant=='light', darken($c, 5%), lighten($c, 5%));
+    border: 1px solid $button_borders;
     text-shadow: none;
     icon-shadow: none;
   }
diff --git a/src/sass/gnome-shell/widgets/_base.scss b/src/sass/gnome-shell/widgets/_base.scss
index f016c98..41c059a 100644
--- a/src/sass/gnome-shell/widgets/_base.scss
+++ b/src/sass/gnome-shell/widgets/_base.scss
@@ -120,7 +120,7 @@ stage {
 %theme_dialogs {
   background-color: $dialog_bg_color;
   border-radius: $wm_radius;
-  border: none;
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
 }
 
 %overview_scrollbar {
diff --git a/src/sass/gnome-shell/widgets/_dialogs.scss b/src/sass/gnome-shell/widgets/_dialogs.scss
index b5acdb0..5cd0ea3 100644
--- a/src/sass/gnome-shell/widgets/_dialogs.scss
+++ b/src/sass/gnome-shell/widgets/_dialogs.scss
@@ -43,6 +43,7 @@
     margin: 3px 3px;
     border: none !important;
     border-radius: $bt_radius;
+
     @include font(button);
     @include button(flat-normal);
     &:hover { @include button(flat-hover); }
@@ -51,6 +52,12 @@
     &: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;
   }
diff --git a/src/sass/gnome-shell/widgets/_panel.scss b/src/sass/gnome-shell/widgets/_panel.scss
index d73f9d3..099c1b3 100644
--- a/src/sass/gnome-shell/widgets/_panel.scss
+++ b/src/sass/gnome-shell/widgets/_panel.scss
@@ -1,5 +1,5 @@
 @if $trans == 'true' { $panel_bg:   if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); }
-$shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.75));
+$shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
 
 #panel {
   background-color: $shell_panel_bg;
@@ -199,4 +199,10 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.75));
 
     // > * { background-image: url("assets/activities-active.svg"); }
   }
+
+  @if $variant == 'light' and $black == 'true' {
+    &:overview {
+      > * { background-image: url("assets/activities-white.svg"); }
+    }
+  }
 }