diff --git a/README.md b/README.md
index 0fe04696..795120d4 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@ Usage:  `./install.sh`  **[OPTIONS...]**
 |-s, --small          | Specify titlebutton size variant(s) **[standard/small]** (Default: standard variants)|
 |-t, --theme          | Specify primary theme color variant(s) **[default/blue/purple/pink/red/orange/yellow/green/grey/all]** (Default: MacOS blue)|
 |-i, --icon           | activities icon variant(s) **[standard/normal/gnome/ubuntu/arch/manjaro/fedora/debian/void]** (Default: standard variant)|
+|-l, --libadwaita     | Install gtk4.0 theme in $HOME/.config/gtk-4.0 for libadwaita apps|
 |-g, --gdm            | Install GDM theme, you should run this with sudo!|
 |-r, --revert         | revert GDM theme, you should run this with sudo!|
 |-h, --help           | Show this help|
diff --git a/install.sh b/install.sh
index 8a848611..d5230251 100755
--- a/install.sh
+++ b/install.sh
@@ -21,21 +21,6 @@ SMALL_VARIANTS=('' '-small')
 THEME_VARIANTS=('' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey')
 ICON_VARIANTS=('' '-normal' '-gnome' '-ubuntu' '-arch' '-manjaro' '-fedora' '-debian' '-void')
 
-if [[ "$(command -v gnome-shell)" ]]; then
-  gnome-shell --version
-  SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
-  if [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
-    GS_VERSION="42-0"
-  elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
-    GS_VERSION="40-0"
-  else
-    GS_VERSION="3-28"
-  fi
-  else
-    echo "'gnome-shell' not found, using styles for last gnome-shell version available."
-    GS_VERSION="42-0"
-fi
-
 # COLORS
 CDEF=" \033[0m"                                     # default color
 CCIN=" \033[0;36m"                                  # info color
@@ -180,18 +165,6 @@ install() {
   echo '@import url("resource:///org/gnome/theme/gtk.css");' >>                              "${THEME_DIR}/gtk-4.0/gtk.css"
   echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' >>                         "${THEME_DIR}/gtk-4.0/gtk-dark.css"
 
-  # For libadwaita
-  rm -rf "$HOME/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css}
-  cp -r "${SRC_DIR}/assets/gtk/common-assets/assets"                                         "$HOME/.config/gtk-4.0"
-
-  if [[ ${theme} != '-default' ]]; then
-    cp -r "${SRC_DIR}/assets/gtk/common-assets/assets${theme}/"*'.png'                       "$HOME/.config/gtk-4.0/assets"
-  fi
-
-  cp -r "${SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${small}"                     "$HOME/.config/gtk-4.0/windows-assets"
-  cp -r "${SRC_DIR}/main/gtk-4.0/gtk${color}${opacity}${theme}.css"                          "$HOME/.config/gtk-4.0/gtk.css"
-  cp -r "${SRC_DIR}/main/gtk-4.0/gtk-Dark${opacity}${theme}.css"                             "$HOME/.config/gtk-4.0/gtk-dark.css"
-
   mkdir -p                                                                                   "${THEME_DIR}/metacity-1"
   cp -r "${SRC_DIR}/main/metacity-1/metacity-theme${color}.xml"                              "${THEME_DIR}/metacity-1/metacity-theme-1.xml"
   cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3.xml"                                    "${THEME_DIR}/metacity-1"
@@ -374,6 +347,10 @@ while [[ $# -gt 0 ]]; do
       name="${2}"
       shift 2
       ;;
+    -l|--libadwaita)
+      libadwaita='true'
+      shift 1
+      ;;
     -g|--gdm)
       gdm='true'
       shift 1
@@ -592,7 +569,44 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+gtk4_config() {
+  local color="${1}"
+  local opacity="${2}"
+  local alt="${3}"
+  local theme="${4}"
+  local small="${5}"
+
+  # For libadwaita
+  rm -rf "$HOME/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css}
+  cp -r "${SRC_DIR}/assets/gtk/common-assets/assets"                                         "$HOME/.config/gtk-4.0"
+
+  if [[ ${theme} != '-default' ]]; then
+    cp -r "${SRC_DIR}/assets/gtk/common-assets/assets${theme}/"*'.png'                       "$HOME/.config/gtk-4.0/assets"
+  fi
+
+  cp -r "${SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${small}"                     "$HOME/.config/gtk-4.0/windows-assets"
+  cp -r "${SRC_DIR}/main/gtk-4.0/gtk${color}${opacity}${theme}.css"                          "$HOME/.config/gtk-4.0/gtk.css"
+  cp -r "${SRC_DIR}/main/gtk-4.0/gtk-Dark${opacity}${theme}.css"                             "$HOME/.config/gtk-4.0/gtk-dark.css"
+
+  echo; prompt -i "Installed ${THEME_NAME}${color}${opacity}${alt}${small}${theme} theme in $HOME/.config/gtk-4.0/windows-assets"
+}
+
+install_libadwaita() {
+  for color in "${colors[@]-${COLOR_VARIANTS[0]}}"; do
+    for opacity in "${opacities[@]-${OPACITY_VARIANTS[0]}}"; do
+      for alt in "${alts[@]-${ALT_VARIANTS[0]}}"; do
+        for theme in "${themes[@]-${THEME_VARIANTS[0]}}"; do
+          for small in "${smalls[@]-${SMALL_VARIANTS[0]}}"; do
+            gtk4_config "${color}" "${opacity}" "${alt}" "${small}" "${theme}"
+          done
+        done
+      done
+    done
+  done
+}
+
 install_theme() {
+  echo
   for color in "${colors[@]-${COLOR_VARIANTS[@]}}"; do
     for opacity in "${opacities[@]-${OPACITY_VARIANTS[@]}}"; do
       for alt in "${alts[@]-${ALT_VARIANTS[@]}}"; do
@@ -631,8 +645,27 @@ if [[ "${small:-}" == 'small' ]]; then
   cd ${SRC_DIR}/assets/gtk/windows-assets && ./render-small-assets.sh && ./render-alt-small-assets.sh
 fi
 
+if [[ "$(command -v gnome-shell)" ]]; then
+  echo; prompt -w "Desktop version: '$(gnome-shell --version)'";
+  SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
+  if [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
+    GS_VERSION="42-0"
+  elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
+    GS_VERSION="40-0"
+  else
+    GS_VERSION="3-28"
+  fi
+  else
+    prompt -e "'gnome-shell' not found, using styles for last gnome-shell version available."
+    GS_VERSION="42-0"
+fi
+
 if [[ "${gdm:-}" != 'true' && "${revert:-}" != 'true' ]]; then
-  install_theme "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${color}" "${opacity}" "${alt}" "${small}" "${theme}" "${icon}"
+  if [[ "${libadwaita:-}" != 'true' ]]; then
+    install_theme "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${color}" "${opacity}" "${alt}" "${small}" "${theme}" "${icon}"
+  else
+    install_libadwaita "${color}" "${opacity}" "${alt}" "${small}" "${theme}"
+  fi
 fi
 
 if [[ "${gdm:-}" == 'true' && "${revert:-}" != 'true' && "$UID" -eq "$ROOT_UID" ]]; then
@@ -643,4 +676,4 @@ if [[ "${gdm:-}" != 'true' && "${revert:-}" == 'true' && "$UID" -eq "$ROOT_UID"
   revert_gdm
 fi
 
-prompt -s "\n Done!"
+echo; prompt -s "Done!"
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-blue.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-blue.css
index 57be6d1d..2dc1b6e4 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-blue.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-green.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-green.css
index 0df7fde1..cf627049 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-green.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-grey.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-grey.css
index cc07e6c3..5c94d1a1 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-grey.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-orange.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-orange.css
index a67f4fb5..7cd1a370 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-orange.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-pink.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-pink.css
index ed2a40a5..ae387874 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-pink.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-purple.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-purple.css
index dcf97257..2f1c59bf 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-purple.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-red.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-red.css
index 950d0c0a..a4442628 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-red.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-blue.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-blue.css
index 7ab7a440..fdb29e35 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-blue.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-green.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-green.css
index 5b316a62..c7bb8f2b 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-green.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-grey.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-grey.css
index 57aad6f5..9a2c7646 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-grey.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-orange.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-orange.css
index a05f235d..a60704e9 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-orange.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-pink.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-pink.css
index ff7b6285..3faf611f 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-pink.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-purple.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-purple.css
index a08d2dc9..7a8c5a99 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-purple.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-red.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-red.css
index 6a754af6..10bfbca0 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-red.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-yellow.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-yellow.css
index 78c31aad..368f29d0 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-yellow.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid.css
index a7f325df..f3f69bc1 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-solid.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-yellow.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-yellow.css
index 3d099965..74c15cb4 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-yellow.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark.css
index 1379d6b8..65be3bc5 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2798,7 +2845,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2820,9 +2867,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2865,12 +2912,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2886,7 +2933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2895,7 +2942,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3176,7 +3223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3204,7 +3251,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3525,7 +3572,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3634,9 +3681,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3673,7 +3720,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3855,7 +3902,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-blue.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-blue.css
index 7ee2a6f5..e1f12353 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-blue.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-green.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-green.css
index 483227b7..1fe26ea9 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-green.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-grey.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-grey.css
index 52b8b0bd..a1ac3a5a 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-grey.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-orange.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-orange.css
index f8c36543..99091dd9 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-orange.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-pink.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-pink.css
index 283b1d42..bdcdc816 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-pink.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-purple.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-purple.css
index 6a8ba862..aa9f30a5 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-purple.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-red.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-red.css
index 90daa6a4..194feab3 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-red.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-blue.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-blue.css
index e7199e61..6e69c7ce 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-blue.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-green.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-green.css
index 6b768045..d3f0f2f2 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-green.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-grey.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-grey.css
index 5146ced8..bf76cae5 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-grey.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-orange.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-orange.css
index c277bd37..42879564 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-orange.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-pink.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-pink.css
index 0a9ef2d0..38e2c76b 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-pink.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-purple.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-purple.css
index 1037fcdf..0e1ad1fd 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-purple.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-red.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-red.css
index 7a5f062b..524d6bfd 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-red.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-yellow.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-yellow.css
index 642830d6..d8de7413 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-yellow.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid.css
index ca9bad3b..72e3a696 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-solid.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-yellow.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-yellow.css
index 7840da3b..0e20271c 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light-yellow.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-Light.css b/src/main/gnome-shell/shell-3-28/gnome-shell-Light.css
index cd6aa399..c6c8401f 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2802,7 +2849,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2824,9 +2871,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -2869,12 +2916,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2890,7 +2937,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2899,7 +2946,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -3180,7 +3227,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .app-folder-popup {
   -arrow-border-radius: 16px;
-  -arrow-background-color: rgba(255, 255, 255, 0.15);
+  -arrow-background-color: rgba(255, 255, 255, 0.16);
   -arrow-base: 0;
   -arrow-rise: 12px;
 }
@@ -3208,7 +3255,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-left: 0;
   border-radius: 0 12px 12px 0;
   padding: 6px;
@@ -3529,7 +3576,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #screenShieldNotifications StScrollBar StButton#vhandle, #screenShieldNotifications StScrollBar StButton#hhandle {
@@ -3638,9 +3685,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-clone-border {
-  border: 4px solid rgba(255, 255, 255, 0.3);
+  border: 4px solid rgba(255, 255, 255, 0.26);
   border-radius: 5px;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.26);
 }
 
 .window-close {
@@ -3677,7 +3724,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   visible-width: 32px;
   spacing: 12px;
@@ -3859,7 +3906,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app-running-dot {
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-blue.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-blue.css
index a887bd30..eb058b12 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-blue.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-green.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-green.css
index b8f0d95e..1038831c 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-green.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-grey.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-grey.css
index 194e4fb9..15e748fd 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-grey.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-orange.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-orange.css
index 1dbae4cb..67dcd3fc 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-orange.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-pink.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-pink.css
index 695694ad..696e0dc0 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-pink.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-purple.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-purple.css
index b6f56412..8e0fc777 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-purple.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-red.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-red.css
index 85d0969e..b0ee0886 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-red.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-blue.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-blue.css
index 462fa025..0fb3ef64 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-blue.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-green.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-green.css
index 903b7756..ca474201 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-green.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-grey.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-grey.css
index cd1f5e75..9bf2c806 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-grey.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-orange.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-orange.css
index dc3cd1b5..1d80908d 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-orange.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-pink.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-pink.css
index 30d75d90..f4aee498 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-pink.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-purple.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-purple.css
index 31fd29fe..409611e2 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-purple.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-red.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-red.css
index 0a4295c5..91ba818a 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-red.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-yellow.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-yellow.css
index 5e52bbe0..fde73255 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-yellow.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid.css
index b1f1981a..6ec62edc 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-solid.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-yellow.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-yellow.css
index cfcc8c8d..29434594 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-yellow.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.css
index f327db84..e300ff0d 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2529,15 +2576,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2765,12 +2812,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2786,7 +2833,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2795,7 +2842,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2878,7 +2925,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2900,9 +2947,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3332,7 +3379,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3467,13 +3514,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3481,7 +3528,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-blue.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-blue.css
index 71c306b1..7e755122 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-blue.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-green.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-green.css
index 0973c6ea..f4c2249b 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-green.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-grey.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-grey.css
index e57ffea5..22997223 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-grey.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-orange.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-orange.css
index 8965ffaa..447c131c 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-orange.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-pink.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-pink.css
index 2c21d7ae..7d272b07 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-pink.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-purple.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-purple.css
index 1c9a9e29..6ab0d4a6 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-purple.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-red.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-red.css
index eed2b080..e7016d01 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-red.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-blue.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-blue.css
index f76cccbe..bb47a6ee 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-blue.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-green.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-green.css
index 749bd0cd..6570fd5c 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-green.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-grey.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-grey.css
index 81cd76bc..d87b5358 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-grey.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-orange.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-orange.css
index 9bfbc13c..cffbb7bd 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-orange.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-pink.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-pink.css
index a5a0ad8e..37261592 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-pink.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-purple.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-purple.css
index 5011b483..326f19d0 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-purple.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-red.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-red.css
index 42ed5947..f634f3c5 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-red.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-yellow.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-yellow.css
index e2a27598..80ca5e86 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-yellow.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid.css
index 7fc04d2b..d5f3578f 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-solid.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-yellow.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-yellow.css
index 10ad0b6d..d2144684 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light-yellow.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light.css b/src/main/gnome-shell/shell-40-0/gnome-shell-Light.css
index a05e1ba1..448980e9 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-blue.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-blue.css
index 6c0eb400..f19bb6ed 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-blue.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #3882f5 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #488af3 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-green.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-green.css
index b62e8eb5..69872431 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-green.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #7fb95f !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #88bc6b !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-grey.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-grey.css
index 23595341..6d3279dd 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-grey.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #919191 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #989898 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-orange.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-orange.css
index 4abc8e32..10f27833 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-orange.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e88c44 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #e79352 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-pink.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-pink.css
index 864d57c4..12778b33 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-pink.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e465a0 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #e371a5 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-purple.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-purple.css
index 3d99fb23..bf466212 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-purple.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #9A57A3 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #9e5fa6 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #a46bab !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #9A57A3 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-red.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-red.css
index fe5dc856..bbc28266 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-red.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #ED5F5D !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #ec6665 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #ea7170 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #ED5F5D !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-blue.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-blue.css
index a2b06988..5206105d 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-blue.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #3882f5 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #488af3 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-green.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-green.css
index fd8762aa..f67e3e98 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-green.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #7fb95f !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #88bc6b !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-grey.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-grey.css
index 786b99c5..21ba2cfc 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-grey.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #919191 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #989898 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-orange.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-orange.css
index 626f02b3..c0943ce2 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-orange.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e88c44 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #e79352 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-pink.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-pink.css
index d9c2b733..102bf9bb 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-pink.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e465a0 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #e371a5 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-purple.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-purple.css
index 1f90e54e..515bca3a 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-purple.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #9A57A3 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #9e5fa6 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #a46bab !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #9A57A3 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-red.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-red.css
index 8053a131..1366b149 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-red.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #ED5F5D !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #ec6665 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #ea7170 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #ED5F5D !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-yellow.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-yellow.css
index 0a8c347f..b7585963 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-yellow.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #f2bc54 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #efbf60 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid.css
index b1cbbd57..b8ef3910 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-solid.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #333333;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #3b63ee !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #4a6eec !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: #333333 !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-yellow.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-yellow.css
index 55a7315a..d44c862a 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-yellow.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #f2bc54 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #efbf60 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.css
index e90cc458..142a1717 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #afafaf;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #dadada;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2552,15 +2599,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid black;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(51, 51, 51, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #afafaf !important;
   text-shadow: none;
@@ -2698,6 +2745,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #3b63ee !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #4a6eec !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #dadada !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(51, 51, 51, 0.95) !important;
+  color: #dadada !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #dadada !important;
+  background-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #dadada;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2788,12 +3072,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2809,7 +3093,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2818,7 +3102,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2901,7 +3185,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2923,9 +3207,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3161,10 +3445,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3595,7 +3896,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3730,13 +4031,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3744,7 +4045,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-blue.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-blue.css
index 0126dbcf..cd9af7be 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-blue.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #2e78eb !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #2f72da !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-green.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-green.css
index fd6e3b78..e924f261 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-green.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #75af55 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #6fa452 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-grey.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-grey.css
index 9855f888..74f40d47 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-grey.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #878787 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #7f7f7f !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-orange.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-orange.css
index 7b3c6df5..e4f7caea 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-orange.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #de823a !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #ce7b39 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-pink.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-pink.css
index 25e7b0b1..bf9fc4d1 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-pink.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #db5c96 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #cb588d !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-purple.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-purple.css
index 1c9a9e29..6ab0d4a6 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-purple.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-red.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-red.css
index eed2b080..e7016d01 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-red.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 /* Date/Time Menu */
 .popup-menu .message, .world-clocks-button,
 .weather-button,
@@ -1421,7 +1468,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1431,7 +1478,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1567,7 +1614,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1581,17 +1628,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2358,13 +2405,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2399,7 +2446,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2533,15 +2580,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2769,12 +2816,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2790,7 +2837,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2799,7 +2846,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2882,7 +2929,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2904,9 +2951,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3336,7 +3383,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3471,13 +3518,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3485,7 +3532,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-blue.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-blue.css
index ead16b85..8dca1d24 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-blue.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-blue.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #2e78eb !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #2f72da !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #2E7CF7 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-green.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-green.css
index 1a46b4b3..55490d1c 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-green.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-green.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #75af55 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #6fa452 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #79B757 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-grey.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-grey.css
index ade0887f..4fc56a69 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-grey.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-grey.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #878787 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #7f7f7f !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #8C8C8C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-orange.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-orange.css
index 1809ac64..9ea970c8 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-orange.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-orange.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #de823a !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #ce7b39 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E9873A !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-pink.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-pink.css
index e428d519..3ada98d6 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-pink.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-pink.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #db5c96 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #cb588d !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #E55E9C !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-purple.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-purple.css
index 8d0bc853..0852c0f8 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-purple.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-purple.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #9A57A3 !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #94559c !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #8b5293 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #9A57A3 !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-red.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-red.css
index 51321e1e..7031d5b2 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-red.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-red.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #ED5F5D !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e25d5b !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #d25957 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #ED5F5D !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-yellow.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-yellow.css
index 8203d3b0..adda5c5a 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-yellow.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e8b24a !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #d7a648 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid.css
index c24a5b4f..526c6cc2 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-solid.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: #ffffff;
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #3159e4 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #3255d3 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: #ffffff !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-yellow.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-yellow.css
index d1c45cd8..bf794dfa 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light-yellow.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light-yellow.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #e8b24a !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #d7a648 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #F3BA4B !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light.css b/src/main/gnome-shell/shell-42-0/gnome-shell-Light.css
index 0de429aa..083649a8 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light.css
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light.css
@@ -48,7 +48,7 @@
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-image: none;
   background-image: none;
 }
@@ -58,7 +58,7 @@
 .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   box-shadow: none;
 }
 
@@ -67,7 +67,7 @@
 }
 
 .app-folder .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-radius: 16px;
 }
 
@@ -103,7 +103,7 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
   border: none;
   padding: 0;
@@ -117,11 +117,11 @@
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .app-folder-dialog .folder-name-container .edit-folder-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 .app-folder-dialog .icon-grid {
@@ -238,8 +238,8 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Buttons */
 .button {
-  min-height: 32px;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: 6px 12px;
   border-radius: 5px;
   box-shadow: none;
 }
@@ -288,6 +288,53 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: none;
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 6px;
+  border-radius: 9999px;
+  color: #424242;
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.icon-button:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
   background-color: transparent;
   border: none;
@@ -1444,7 +1491,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .unlock-dialog .modal-dialog-button:hover,
 .unlock-dialog .modal-dialog-button:focus {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1454,7 +1501,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 .login-dialog .modal-dialog-button:active,
 .unlock-dialog .modal-dialog-button:active {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -1590,7 +1637,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-not-listed-label:focus {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .login-dialog-user-list-view {
@@ -1604,17 +1651,17 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   color: rgba(255, 255, 255, 0.85);
 }
 
 .login-dialog-user-list:expanded .login-dialog-user-list-item:active {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   color: rgba(255, 255, 255, 0.85);
 }
 
@@ -2381,13 +2428,13 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel:overview .panel-button:hover, #panel.unlock-screen .panel-button:hover, #panel.login-screen .panel-button:hover, #panel.lock-screen .panel-button:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
 #panel:overview .panel-button:active, #panel:overview .panel-button:active:hover, #panel:overview .panel-button:overview, #panel:overview .panel-button:overview:hover, #panel:overview .panel-button:focus, #panel:overview .panel-button:focus:hover, #panel:overview .panel-button:checked, #panel:overview .panel-button:checked:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:active:hover, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:overview:hover, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:focus:hover, #panel.unlock-screen .panel-button:checked, #panel.unlock-screen .panel-button:checked:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:active:hover, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:overview:hover, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:focus:hover, #panel.login-screen .panel-button:checked, #panel.login-screen .panel-button:checked:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:active:hover, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:overview:hover, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:focus:hover, #panel.lock-screen .panel-button:checked, #panel.lock-screen .panel-button:checked:hover {
   color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
   text-shadow: none;
 }
 
@@ -2422,7 +2469,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 #panel .panel-button:hover {
   color: #363636;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   text-shadow: none;
 }
 
@@ -2556,15 +2603,15 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   font-weight: normal;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  padding: 9px 0 !important;
-  margin: 0 !important;
+  padding: 9px 0;
+  margin: 0;
   border-radius: 8px;
   background-color: rgba(255, 255, 255, 0.95);
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 12px !important;
-  padding: 6px !important;
+  spacing: 12px;
+  padding: 6px;
   border-radius: 0 !important;
   color: #424242 !important;
   text-shadow: none;
@@ -2702,6 +2749,243 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -st-icon-style: symbolic;
 }
 
+.quick-settings {
+  padding: 12px !important;
+}
+
+.quick-settings .icon-button, .quick-settings .button {
+  padding: 6px;
+}
+
+.quick-settings-grid {
+  spacing-rows: 12px;
+  spacing-columns: 12px;
+}
+
+.quick-toggle {
+  border-radius: 8px;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+}
+
+.quick-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle:active {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+}
+
+.quick-toggle:checked {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-toggle:checked:hover {
+  background-color: #3159e4 !important;
+  color: white;
+}
+
+.quick-toggle:checked:active {
+  background-color: #3255d3 !important;
+  color: white;
+}
+
+.quick-toggle > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-toggle.button {
+  padding: 0;
+}
+
+.quick-toggle > StBoxLayout {
+  padding: 0 12px;
+}
+
+.quick-toggle:ltr > StBoxLayout {
+  padding-left: 15px;
+}
+
+.quick-toggle:rtl > StBoxLayout {
+  padding-right: 15px;
+}
+
+.quick-toggle .quick-toggle-label {
+  font-weight: bold;
+}
+
+.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+  icon-size: 16px;
+}
+
+.quick-menu-toggle:ltr > StBoxLayout {
+  padding-right: 0;
+}
+
+.quick-menu-toggle:rtl > StBoxLayout {
+  padding-left: 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+  padding: 6px 10.5px;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:ltr {
+  border-radius: 0 8px 8px 0;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:rtl {
+  border-radius: 8px 0 0 8px;
+}
+
+.quick-slider {
+  padding: 0 6px;
+}
+
+.quick-slider > StBoxLayout {
+  spacing: 6px;
+}
+
+.quick-slider .slider-bin {
+  min-height: 16px;
+  padding: 6px;
+  border-radius: 9999px;
+}
+
+.quick-slider .slider-bin:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+}
+
+.quick-slider .quick-toggle-icon {
+  icon-size: 16px;
+}
+
+.quick-slider .icon-button {
+  background-color: transparent;
+  color: #363636 !important;
+}
+
+.quick-slider .icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+.quick-slider .icon-button:active {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+.quick-toggle-menu {
+  background-color: rgba(255, 255, 255, 0.95) !important;
+  color: #363636 !important;
+  border-radius: 8px;
+  padding: 12px;
+  margin: 12px 12px 0;
+}
+
+.quick-toggle-menu .popup-menu-item {
+  border-radius: 5px !important;
+  min-height: 20px;
+}
+
+.quick-toggle-menu .popup-menu-item:focus, .quick-toggle-menu .popup-menu-item:hover, .quick-toggle-menu .popup-menu-item.selected {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .popup-menu-item:active {
+  color: #363636 !important;
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.quick-toggle-menu .popup-menu-item > StIcon {
+  -st-icon-style: symbolic;
+}
+
+.quick-toggle-menu .header {
+  spacing-rows: 3px;
+  spacing-columns: 12px;
+  padding-bottom: 12px;
+}
+
+.quick-toggle-menu .header .icon {
+  icon-size: 24px;
+  border-radius: 9999px;
+  padding: 9px;
+  background-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+.quick-toggle-menu .header .icon.active {
+  background-color: #315bef !important;
+  color: white;
+}
+
+.quick-settings-system-item > StBoxLayout {
+  spacing: 12px;
+}
+
+.quick-settings-system-item .icon-button {
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #363636;
+  border-radius: 9999px;
+  min-height: 24px !important;
+  min-width: 24px !important;
+}
+
+.quick-settings-system-item .icon-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button:active {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.quick-settings-system-item .icon-button > StIcon {
+  -st-icon-style: symbolic;
+  icon-size: 16px;
+}
+
+.quick-settings-system-item .power-item {
+  min-height: 0;
+  min-width: 0;
+}
+
+.quick-settings-system-item .power-item:insensitive {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.nm-network-item .wireless-secure-icon {
+  icon-size: 8px;
+}
+
 /* Screen Shield */
 .unlock-dialog-clock {
   color: white;
@@ -2792,12 +3076,12 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .list-search-result:focus, .search-provider-icon:focus, .list-search-result:hover, .search-provider-icon:hover, .list-search-result:selected, .search-provider-icon:selected {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   transition-duration: 200ms;
 }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #searchResultsContent {
@@ -2813,7 +3097,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 
 .search-section .search-section-separator {
   height: 0;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 .search-section-content {
@@ -2822,7 +3106,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 18px;
   border: none;
   box-shadow: none;
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
   text-shadow: none;
   color: rgba(255, 255, 255, 0.85);
 }
@@ -2905,7 +3189,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .controls-manager StScrollBar StBin#trough {
-  background-color: rgba(255, 255, 255, 0.15) !important;
+  background-color: rgba(255, 255, 255, 0.16) !important;
 }
 
 .controls-manager StScrollBar StButton#vhandle, .controls-manager StScrollBar StButton#hhandle {
@@ -2927,9 +3211,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border: none;
   color: rgba(255, 255, 255, 0.5);
   caret-color: rgba(255, 255, 255, 0.85);
-  selection-background-color: rgba(255, 255, 255, 0.3);
+  selection-background-color: rgba(255, 255, 255, 0.26);
   selected-color: rgba(255, 255, 255, 0.85);
-  color: rgba(255, 255, 255, 0.3);
+  color: rgba(255, 255, 255, 0.26);
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
@@ -3165,10 +3449,27 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow {
+.page-navigation-arrow > StIcon {
   margin: 6px;
+  padding: 18px;
   width: 24px;
   height: 24px;
+  border-radius: 9999px;
+}
+
+.page-navigation-arrow:insensitive > StIcon {
+  backround-color: rgba(255, 255, 255, 0.08);
+  color: white;
+}
+
+.page-navigation-arrow:hover > StIcon {
+  backround-color: rgba(255, 255, 255, 0.16);
+  color: white;
+}
+
+.page-navigation-arrow:active > StIcon {
+  backround-color: rgba(255, 255, 255, 0.26);
+  color: white;
 }
 
 #dash {
@@ -3599,7 +3900,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .workspace-thumbnails .workspace-thumbnail {
   color: rgba(255, 255, 255, 0.85);
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: none;
   border-radius: 5px;
 }
@@ -3734,13 +4035,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #dashtodockContainer:overview #dash .show-apps:hover .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:focus .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer:overview #dash .app-well-app:active .overview-icon, #dashtodockContainer:overview #dash .app-well-app:checked .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:active .overview-icon,
 #dashtodockContainer:overview #dash .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.26);
 }
 
 #dashtodockContainer:overview #dash .show-apps, #dashtodockContainer:overview #dash .show-apps .show-apps-icon, #dashtodockContainer:overview #dash .show-apps .overview-icon {
@@ -3748,7 +4049,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #dashtodockContainer:overview #dash .dash-background {
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.16);
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-blue.css b/src/main/gtk-3.0/gtk-Dark-blue.css
index 7aaa5dcb..f770ee9f 100644
--- a/src/main/gtk-3.0/gtk-Dark-blue.css
+++ b/src/main/gtk-3.0/gtk-Dark-blue.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-green.css b/src/main/gtk-3.0/gtk-Dark-green.css
index dd7395f2..1830a81a 100644
--- a/src/main/gtk-3.0/gtk-Dark-green.css
+++ b/src/main/gtk-3.0/gtk-Dark-green.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-grey.css b/src/main/gtk-3.0/gtk-Dark-grey.css
index 81b91aff..58dbfb50 100644
--- a/src/main/gtk-3.0/gtk-Dark-grey.css
+++ b/src/main/gtk-3.0/gtk-Dark-grey.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-orange.css b/src/main/gtk-3.0/gtk-Dark-orange.css
index e4b00fab..f82d7abb 100644
--- a/src/main/gtk-3.0/gtk-Dark-orange.css
+++ b/src/main/gtk-3.0/gtk-Dark-orange.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-pink.css b/src/main/gtk-3.0/gtk-Dark-pink.css
index d4d9ea39..7baaa2db 100644
--- a/src/main/gtk-3.0/gtk-Dark-pink.css
+++ b/src/main/gtk-3.0/gtk-Dark-pink.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-purple.css b/src/main/gtk-3.0/gtk-Dark-purple.css
index d4a980a2..477f78fd 100644
--- a/src/main/gtk-3.0/gtk-Dark-purple.css
+++ b/src/main/gtk-3.0/gtk-Dark-purple.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-red.css b/src/main/gtk-3.0/gtk-Dark-red.css
index 91afa1f1..22a10105 100644
--- a/src/main/gtk-3.0/gtk-Dark-red.css
+++ b/src/main/gtk-3.0/gtk-Dark-red.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-blue.css b/src/main/gtk-3.0/gtk-Dark-solid-blue.css
index 40f9e4fb..1dfcb7b7 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-blue.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-green.css b/src/main/gtk-3.0/gtk-Dark-solid-green.css
index f8a2adfe..14827a2e 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-green.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-green.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-grey.css b/src/main/gtk-3.0/gtk-Dark-solid-grey.css
index a57d932e..c75cff88 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-grey.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-orange.css b/src/main/gtk-3.0/gtk-Dark-solid-orange.css
index 81ceaf4b..8f0c7326 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-orange.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-pink.css b/src/main/gtk-3.0/gtk-Dark-solid-pink.css
index 8eba4ae2..dffc5027 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-pink.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-purple.css b/src/main/gtk-3.0/gtk-Dark-solid-purple.css
index 7f6d1e85..5cf58a3d 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-purple.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-red.css b/src/main/gtk-3.0/gtk-Dark-solid-red.css
index 833653b1..83a6bf89 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-red.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-red.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid-yellow.css b/src/main/gtk-3.0/gtk-Dark-solid-yellow.css
index 0c744631..b643e9b9 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid-yellow.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-solid.css b/src/main/gtk-3.0/gtk-Dark-solid.css
index 80723bc3..dedbe9e2 100644
--- a/src/main/gtk-3.0/gtk-Dark-solid.css
+++ b/src/main/gtk-3.0/gtk-Dark-solid.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark-yellow.css b/src/main/gtk-3.0/gtk-Dark-yellow.css
index 074545c3..a560e15d 100644
--- a/src/main/gtk-3.0/gtk-Dark-yellow.css
+++ b/src/main/gtk-3.0/gtk-Dark-yellow.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Dark.css b/src/main/gtk-3.0/gtk-Dark.css
index be434875..d04a57e4 100644
--- a/src/main/gtk-3.0/gtk-Dark.css
+++ b/src/main/gtk-3.0/gtk-Dark.css
@@ -706,6 +706,7 @@ button separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -718,6 +719,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -797,6 +799,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1107,16 +1110,19 @@ button.font separator, button.file separator {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2197,6 +2203,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -4337,16 +4344,19 @@ row:not(:hover) {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4468,6 +4478,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4638,6 +4649,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4660,6 +4672,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.25);
 }
 
@@ -7254,6 +7267,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7263,6 +7277,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
 }
 
@@ -7334,6 +7349,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7363,6 +7379,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8465,12 +8482,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8731,12 +8750,14 @@ button.flat.-panel-icon-button:checked,
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8747,6 +8768,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8755,6 +8777,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9736,22 +9759,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9812,22 +9839,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9854,6 +9885,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10835,6 +10867,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11198,6 +11231,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11208,6 +11242,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-blue.css b/src/main/gtk-3.0/gtk-Light-blue.css
index b40d2993..39820130 100644
--- a/src/main/gtk-3.0/gtk-Light-blue.css
+++ b/src/main/gtk-3.0/gtk-Light-blue.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-green.css b/src/main/gtk-3.0/gtk-Light-green.css
index 097bb029..6ee153c8 100644
--- a/src/main/gtk-3.0/gtk-Light-green.css
+++ b/src/main/gtk-3.0/gtk-Light-green.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-grey.css b/src/main/gtk-3.0/gtk-Light-grey.css
index 9a41c472..36cd0ee7 100644
--- a/src/main/gtk-3.0/gtk-Light-grey.css
+++ b/src/main/gtk-3.0/gtk-Light-grey.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-orange.css b/src/main/gtk-3.0/gtk-Light-orange.css
index b024db06..41abb12e 100644
--- a/src/main/gtk-3.0/gtk-Light-orange.css
+++ b/src/main/gtk-3.0/gtk-Light-orange.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-pink.css b/src/main/gtk-3.0/gtk-Light-pink.css
index 467fcaa4..1373f9cf 100644
--- a/src/main/gtk-3.0/gtk-Light-pink.css
+++ b/src/main/gtk-3.0/gtk-Light-pink.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-purple.css b/src/main/gtk-3.0/gtk-Light-purple.css
index 85970303..7940a577 100644
--- a/src/main/gtk-3.0/gtk-Light-purple.css
+++ b/src/main/gtk-3.0/gtk-Light-purple.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-red.css b/src/main/gtk-3.0/gtk-Light-red.css
index 316fcabf..4b14225b 100644
--- a/src/main/gtk-3.0/gtk-Light-red.css
+++ b/src/main/gtk-3.0/gtk-Light-red.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-blue.css b/src/main/gtk-3.0/gtk-Light-solid-blue.css
index 03dd9286..e3fd2c8d 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-blue.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-green.css b/src/main/gtk-3.0/gtk-Light-solid-green.css
index 416eb73c..a22f26a8 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-green.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-green.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-grey.css b/src/main/gtk-3.0/gtk-Light-solid-grey.css
index a1d88b2a..4fdd23a3 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-grey.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-orange.css b/src/main/gtk-3.0/gtk-Light-solid-orange.css
index dbc6df93..bfa071db 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-orange.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-pink.css b/src/main/gtk-3.0/gtk-Light-solid-pink.css
index f118fe70..6ec8442e 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-pink.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-purple.css b/src/main/gtk-3.0/gtk-Light-solid-purple.css
index 0fd80e06..b0e1de0a 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-purple.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-red.css b/src/main/gtk-3.0/gtk-Light-solid-red.css
index 63dc24be..072f4c6f 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-red.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-red.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid-yellow.css b/src/main/gtk-3.0/gtk-Light-solid-yellow.css
index acf2dc3d..1db1c64d 100644
--- a/src/main/gtk-3.0/gtk-Light-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-Light-solid-yellow.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-solid.css b/src/main/gtk-3.0/gtk-Light-solid.css
index 088a00f3..894a4d1d 100644
--- a/src/main/gtk-3.0/gtk-Light-solid.css
+++ b/src/main/gtk-3.0/gtk-Light-solid.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light-yellow.css b/src/main/gtk-3.0/gtk-Light-yellow.css
index b3c3529c..7e59a590 100644
--- a/src/main/gtk-3.0/gtk-Light-yellow.css
+++ b/src/main/gtk-3.0/gtk-Light-yellow.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-3.0/gtk-Light.css b/src/main/gtk-3.0/gtk-Light.css
index 15403831..a4ddb86b 100644
--- a/src/main/gtk-3.0/gtk-Light.css
+++ b/src/main/gtk-3.0/gtk-Light.css
@@ -606,6 +606,7 @@ stackswitcher button.text-button.circular, button.circular, .app-notification bu
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -713,6 +714,7 @@ button separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
@@ -725,6 +727,7 @@ button.budgie-menu-launcher:hover:active, .budgie-popover scrolledwindow.sidebar
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.budgie-menu-launcher:checked:hover, .budgie-popover scrolledwindow.sidebar.categories button.flat.category-button:checked:hover, .budgie-popover scrolledwindow.sidebar.categories .raven .raven-header:not(.top) button.category-button:checked:hover, .raven .raven-header:not(.top) .budgie-popover scrolledwindow.sidebar.categories button.category-button:checked:hover, .background grid#CanvasGrid > button:checked:hover:not(.flat), .background tabbox > tab button:checked:hover, button.flat:checked:hover, .raven .raven-header:not(.top) button:checked:hover {
@@ -807,6 +810,7 @@ button:disabled label, button:disabled {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 button.image-button {
@@ -1125,16 +1129,19 @@ button.font separator, button.file separator {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
@@ -2178,6 +2185,7 @@ headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.sugges
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
+  box-shadow: none;
 }
 
 headerbar.windowhandle viewswitcher > box > button:not(.titlebutton):not(.suggested-action):not(.destructive-action):active {
@@ -2852,6 +2860,7 @@ popover button.circular:active, popover button.circular:active:hover {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -4327,16 +4336,19 @@ row:not(:hover) {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):active, .app-notification button:not(.suggested-action):not(.destructive-action):checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:not(.suggested-action):not(.destructive-action):disabled label, .app-notification button:not(.suggested-action):not(.destructive-action):disabled {
@@ -4458,6 +4470,7 @@ messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4625,6 +4638,7 @@ button.sidebar-button:active, button.sidebar-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -4647,6 +4661,7 @@ placessidebar row:selected button.sidebar-button:active, placessidebar row:selec
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.3);
 }
 
@@ -7204,6 +7219,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7213,6 +7229,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -7278,6 +7295,7 @@ popover.background:not(.emoji-picker) > box.vertical button:not(.destructive-act
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport.frame > list.background {
@@ -7308,6 +7326,7 @@ popover.background:not(.emoji-picker) > box.vertical > scrolledwindow > viewport
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical scrolledwindow > viewport.frame {
@@ -8414,12 +8433,14 @@ window.background.chromium headerbar.titlebar button.toggle:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.toggle:checked, window.background.chromium headerbar.titlebar button.toggle:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -8680,12 +8701,14 @@ button.flat.-panel-icon-button:checked,
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:active label {
@@ -8696,6 +8719,7 @@ button.flat.-panel-icon-button:checked,
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .menubar.panel popover button:checked label {
@@ -8704,6 +8728,7 @@ button.flat.-panel-icon-button:checked,
 
 .menubar.panel popover button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .menubar.panel popover button:disabled label, .menubar.panel popover button:disabled {
@@ -9691,22 +9716,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .drop-shadow button:checked, .workspace-switcher .workspace-add-button:checked, .budgie-popover:not(.budgie-menu) button.flat:checked:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:checked:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:checked:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .drop-shadow button:active, .workspace-switcher .workspace-add-button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:active:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:active:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .drop-shadow button:disabled label, .workspace-switcher .workspace-add-button:disabled label, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button) label, .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button) label, .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button) label, .budgie-settings-window buttonbox.inline-toolbar button:disabled label, .drop-shadow button:disabled, .workspace-switcher .workspace-add-button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) .raven .raven-header:not(.top) button:disabled:not(.image-button), .raven .raven-header:not(.top) .budgie-popover:not(.budgie-menu) button:disabled:not(.image-button), .budgie-settings-window buttonbox.inline-toolbar button:disabled {
@@ -9763,22 +9792,26 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .raven button.flat:checked, .raven .raven-header:not(.top) button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
 }
 
 .raven button.flat:active, .raven .raven-header:not(.top) button:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.flat:disabled label, .raven .raven-header:not(.top) button:disabled label, .raven button.flat:disabled, .raven .raven-header:not(.top) button:disabled {
@@ -9805,6 +9838,7 @@ window.budgie-switcher-window .drop-shadow button, .drop-shadow button, .workspa
 
 .raven button.linked:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven button.linked:disabled label, .raven button.linked:disabled {
@@ -10786,6 +10820,7 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled label, .raven scrolledwindow > .frame box.audio-widget stackswitcher.linked > button.text-button.radio:disabled {
@@ -11148,6 +11183,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -11158,6 +11194,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
diff --git a/src/main/gtk-4.0/gtk-Dark-blue.css b/src/main/gtk-4.0/gtk-Dark-blue.css
index 345e4a9a..ca15c591 100644
--- a/src/main/gtk-4.0/gtk-Dark-blue.css
+++ b/src/main/gtk-4.0/gtk-Dark-blue.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-green.css b/src/main/gtk-4.0/gtk-Dark-green.css
index 9913815c..91d16139 100644
--- a/src/main/gtk-4.0/gtk-Dark-green.css
+++ b/src/main/gtk-4.0/gtk-Dark-green.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-grey.css b/src/main/gtk-4.0/gtk-Dark-grey.css
index f7bffcb5..5e1b5882 100644
--- a/src/main/gtk-4.0/gtk-Dark-grey.css
+++ b/src/main/gtk-4.0/gtk-Dark-grey.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-orange.css b/src/main/gtk-4.0/gtk-Dark-orange.css
index a2ebf4a2..be9f873d 100644
--- a/src/main/gtk-4.0/gtk-Dark-orange.css
+++ b/src/main/gtk-4.0/gtk-Dark-orange.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-pink.css b/src/main/gtk-4.0/gtk-Dark-pink.css
index a20b52f3..897032e5 100644
--- a/src/main/gtk-4.0/gtk-Dark-pink.css
+++ b/src/main/gtk-4.0/gtk-Dark-pink.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-purple.css b/src/main/gtk-4.0/gtk-Dark-purple.css
index 3313c573..e58573b6 100644
--- a/src/main/gtk-4.0/gtk-Dark-purple.css
+++ b/src/main/gtk-4.0/gtk-Dark-purple.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-red.css b/src/main/gtk-4.0/gtk-Dark-red.css
index d36002a3..d5bc5b32 100644
--- a/src/main/gtk-4.0/gtk-Dark-red.css
+++ b/src/main/gtk-4.0/gtk-Dark-red.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-blue.css b/src/main/gtk-4.0/gtk-Dark-solid-blue.css
index 621f717d..63fd224d 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-blue.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-blue.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-green.css b/src/main/gtk-4.0/gtk-Dark-solid-green.css
index e73a789f..9287e6bf 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-green.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-green.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-grey.css b/src/main/gtk-4.0/gtk-Dark-solid-grey.css
index 3215617d..493bb239 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-grey.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-grey.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-orange.css b/src/main/gtk-4.0/gtk-Dark-solid-orange.css
index 6f75b5f7..b6ad0b9f 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-orange.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-orange.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-pink.css b/src/main/gtk-4.0/gtk-Dark-solid-pink.css
index ebfac692..349ff027 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-pink.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-pink.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-purple.css b/src/main/gtk-4.0/gtk-Dark-solid-purple.css
index c35205d1..15512a33 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-purple.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-purple.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-red.css b/src/main/gtk-4.0/gtk-Dark-solid-red.css
index 18820050..e4c02543 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-red.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-red.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid-yellow.css b/src/main/gtk-4.0/gtk-Dark-solid-yellow.css
index fdcce8b8..e3a7b83f 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid-yellow.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid-yellow.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-solid.css b/src/main/gtk-4.0/gtk-Dark-solid.css
index efc5304d..8488e36a 100644
--- a/src/main/gtk-4.0/gtk-Dark-solid.css
+++ b/src/main/gtk-4.0/gtk-Dark-solid.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark-yellow.css b/src/main/gtk-4.0/gtk-Dark-yellow.css
index 7c6e8257..ce6e8fc9 100644
--- a/src/main/gtk-4.0/gtk-Dark-yellow.css
+++ b/src/main/gtk-4.0/gtk-Dark-yellow.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Dark.css b/src/main/gtk-4.0/gtk-Dark.css
index 17116480..55de71c0 100644
--- a/src/main/gtk-4.0/gtk-Dark.css
+++ b/src/main/gtk-4.0/gtk-Dark.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #dadada;
-  background-color: #242424;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry-dark.png"), url("assets/entry-dark@2.png"));
+  color: #dadada;
+  background-color: #242424;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(222, 222, 222, 0.35);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1582,6 +1589,18 @@ spinbutton > text:drop(active) {
   box-shadow: inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.15);
+  background-color: #656565;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1669,8 +1688,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2905,15 +2924,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(222, 222, 222, 0.35);
   background-color: rgba(36, 36, 36, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(222, 222, 222, 0.675);
   background-color: rgba(255, 255, 255, 0.05);
   border-color: #444444;
@@ -2921,7 +2941,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #dedede;
   background-color: #373737;
   border-color: #444444;
@@ -4497,16 +4518,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4664,6 +4688,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4698,6 +4723,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4925,6 +4951,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4936,6 +4963,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -4947,6 +4975,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
 }
 
@@ -5889,7 +5918,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #373737;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-blue.css b/src/main/gtk-4.0/gtk-Light-blue.css
index 8a4c2717..944bfeb0 100644
--- a/src/main/gtk-4.0/gtk-Light-blue.css
+++ b/src/main/gtk-4.0/gtk-Light-blue.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-green.css b/src/main/gtk-4.0/gtk-Light-green.css
index 5d42f5eb..9c6700fc 100644
--- a/src/main/gtk-4.0/gtk-Light-green.css
+++ b/src/main/gtk-4.0/gtk-Light-green.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-grey.css b/src/main/gtk-4.0/gtk-Light-grey.css
index 7a6889ad..92fb488c 100644
--- a/src/main/gtk-4.0/gtk-Light-grey.css
+++ b/src/main/gtk-4.0/gtk-Light-grey.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-orange.css b/src/main/gtk-4.0/gtk-Light-orange.css
index f436313d..4802df6c 100644
--- a/src/main/gtk-4.0/gtk-Light-orange.css
+++ b/src/main/gtk-4.0/gtk-Light-orange.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-pink.css b/src/main/gtk-4.0/gtk-Light-pink.css
index 9ce813b8..edb94b3b 100644
--- a/src/main/gtk-4.0/gtk-Light-pink.css
+++ b/src/main/gtk-4.0/gtk-Light-pink.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-purple.css b/src/main/gtk-4.0/gtk-Light-purple.css
index ecd61321..a0f51dea 100644
--- a/src/main/gtk-4.0/gtk-Light-purple.css
+++ b/src/main/gtk-4.0/gtk-Light-purple.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-red.css b/src/main/gtk-4.0/gtk-Light-red.css
index 95bb1141..5dce6654 100644
--- a/src/main/gtk-4.0/gtk-Light-red.css
+++ b/src/main/gtk-4.0/gtk-Light-red.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-blue.css b/src/main/gtk-4.0/gtk-Light-solid-blue.css
index 9b7bb2e4..ea7709ac 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-blue.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-blue.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-green.css b/src/main/gtk-4.0/gtk-Light-solid-green.css
index a4a2a98c..32a15d22 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-green.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-green.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-grey.css b/src/main/gtk-4.0/gtk-Light-solid-grey.css
index ce3fd1dc..d3400919 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-grey.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-grey.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-orange.css b/src/main/gtk-4.0/gtk-Light-solid-orange.css
index 91c55f71..da1c5b93 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-orange.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-orange.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-pink.css b/src/main/gtk-4.0/gtk-Light-solid-pink.css
index 486e23fd..e67b3c78 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-pink.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-pink.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-purple.css b/src/main/gtk-4.0/gtk-Light-solid-purple.css
index 37140bcd..c7346c9b 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-purple.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-purple.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-red.css b/src/main/gtk-4.0/gtk-Light-solid-red.css
index a8254b64..d0ea64e3 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-red.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-red.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid-yellow.css b/src/main/gtk-4.0/gtk-Light-solid-yellow.css
index 05ab5d63..e38ffce5 100644
--- a/src/main/gtk-4.0/gtk-Light-solid-yellow.css
+++ b/src/main/gtk-4.0/gtk-Light-solid-yellow.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-solid.css b/src/main/gtk-4.0/gtk-Light-solid.css
index ba701218..8d184d35 100644
--- a/src/main/gtk-4.0/gtk-Light-solid.css
+++ b/src/main/gtk-4.0/gtk-Light-solid.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light-yellow.css b/src/main/gtk-4.0/gtk-Light-yellow.css
index 2c8872c5..b7016cc8 100644
--- a/src/main/gtk-4.0/gtk-Light-yellow.css
+++ b/src/main/gtk-4.0/gtk-Light-yellow.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/main/gtk-4.0/gtk-Light.css b/src/main/gtk-4.0/gtk-Light.css
index 06e93704..12dc9707 100644
--- a/src/main/gtk-4.0/gtk-Light.css
+++ b/src/main/gtk-4.0/gtk-Light.css
@@ -295,6 +295,8 @@ spinbutton > text, .linked > entry:not(:only-child) {
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.15);
   border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-clip: border-box;
+  background-origin: border-box;
 }
 
 spinbutton > text:focus-within, .linked > entry:focus-within:not(:only-child) {
@@ -318,13 +320,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-  color: #363636;
-  background-color: #ffffff;
-  outline: none;
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry.png"), url("assets/entry@2.png"));
+  color: #363636;
+  background-color: #ffffff;
+  outline: none;
 }
 
 entry.search {
@@ -607,7 +611,7 @@ button separator {
   margin: 4px 1px;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, headerbar.flat button, .toolbar button, button.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button, tabbar tabbox > tab button.tab-close-button, headerbar.flat button, .toolbar button, button.flat {
   min-height: 24px;
   border: none;
   background-color: transparent;
@@ -617,38 +621,41 @@ window.background > contents > toastoverlay > leaflet button.circular.day, windo
   transition: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover, tabbar tabbox > tab button.tab-close-button:hover, headerbar.flat button:hover, .toolbar button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 350ms;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
+window.background > contents > toastoverlay > leaflet button.circular.day:hover:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:hover:active, tabbar tabbox > tab button.tab-close-button:hover:active, headerbar.flat button:hover:active, .toolbar button:hover:active, button.flat:hover:active {
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
+window.background > contents > toastoverlay > leaflet button.circular.day:active, window.background.csd > contents > leaflet.unfolded > box > headerbar button:active, tabbar tabbox > tab button.tab-close-button:active, headerbar.flat button:active, .toolbar button:active, window.background > contents > toastoverlay > leaflet button.circular.day:checked, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked, tabbar tabbox > tab button.tab-close-button:checked, headerbar.flat button:checked, .toolbar button:checked, button.flat:active, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
+window.background > contents > toastoverlay > leaflet button.circular.day:checked:hover, window.background.csd > contents > leaflet.unfolded > box > headerbar button:checked:hover, tabbar tabbox > tab button.tab-close-button:checked:hover, headerbar.flat button:checked:hover, .toolbar button:checked:hover, button.flat:checked:hover {
   background-image: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled, label:disabled > selection.flat {
   background-color: transparent;
+  box-shadow: none;
 }
 
-window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
+window.background > contents > toastoverlay > leaflet button.circular.day:disabled label, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled label, tabbar tabbox > tab button.tab-close-button:disabled label, headerbar.flat button:disabled label, .toolbar button:disabled label, window.background > contents > toastoverlay > leaflet button.circular.day:disabled, window.background.csd > contents > leaflet.unfolded > box > headerbar button:disabled, tabbar tabbox > tab button.tab-close-button:disabled, headerbar.flat button:disabled, .toolbar button:disabled, button.flat:disabled label, label:disabled > selection.flat label, button.flat:disabled, label:disabled > selection.flat {
   color: rgba(36, 36, 36, 0.45);
   opacity: 1;
 }
 
-window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
+window.background > contents > toastoverlay > leaflet button.toggle.popup.circular.day, window.background.csd > contents > leaflet.unfolded > box > headerbar button.toggle.popup, tabbar tabbox > tab button.toggle.popup.tab-close-button, headerbar.flat button.toggle.popup, .toolbar button.toggle.popup, button.flat.toggle.popup {
   min-width: 20px;
 }
 
@@ -1548,6 +1555,18 @@ spinbutton > text:drop(active) {
   box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px #F08437;
 }
 
+spinbutton > button {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.15);
+  border-top-color: rgba(0, 0, 0, 0.15);
+  border-bottom-color: rgba(0, 0, 0, 0.27);
+  background-color: white;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.03), 0 1px 2px 0 rgba(0, 0, 0, 0.01);
+}
+
 spinbutton:not(.vertical) > text {
   padding: 2px 8px;
   min-width: 28px;
@@ -1635,8 +1654,8 @@ combobox {
 
 dropdown button.combo,
 combobox button.combo {
-  padding-left: 12px;
-  padding-right: 12px;
+  padding: 0 12px;
+  min-height: 24px;
 }
 
 dropdown > popover.menu > contents modelbutton,
@@ -2848,15 +2867,16 @@ cursor-handle.bottom {
 }
 
 tabbar tab,
-dnd tab, notebook > header > tabs > tab {
+dnd tab, tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab, notebook > header > tabs > tab {
   color: rgba(36, 36, 36, 0.45);
   background-color: rgba(255, 255, 255, 0);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 }
 
-tabbar tab:hover:not(:checked),
-dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked) {
+tabbar tab:hover:not(:checked):not(:selected),
+dnd tab:hover:not(:checked):not(:selected), notebook > header > tabs > tab:hover:not(:checked):not(:selected) {
   color: rgba(36, 36, 36, 0.725);
   background-color: rgba(255, 255, 255, 0.2);
   border-color: #bfbfbf;
@@ -2864,7 +2884,8 @@ dnd tab:hover:not(:checked), notebook > header > tabs > tab:hover:not(:checked)
 }
 
 tabbar tab:checked,
-dnd tab:checked, notebook > header > tabs > tab:checked {
+dnd tab:checked, notebook > header > tabs > tab:checked, tabbar tab:selected,
+dnd tab:selected, notebook > header > tabs > tab:selected {
   color: #242424;
   background-color: #e5e5e5;
   border-color: #bfbfbf;
@@ -4444,16 +4465,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
 }
 
 .app-notification button:active, .app-notification button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
 }
 
 .app-notification button:disabled {
   background-color: transparent;
+  box-shadow: none;
 }
 
 .app-notification button:disabled label, .app-notification button:disabled {
@@ -4611,6 +4635,7 @@ window.dialog.message .dialog-action-area > button:not(.suggested-action):not(.d
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.15);
   transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
@@ -4642,6 +4667,7 @@ window.dialog.message.csd .dialog-action-area > button:active, window.dialog.mes
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   background-image: none;
 }
 
@@ -4869,6 +4895,7 @@ placessidebar .navigation-sidebar > row button.sidebar-button:active, placesside
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4880,6 +4907,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.62);
 }
 
@@ -4891,6 +4919,7 @@ placessidebar .navigation-sidebar > row:selected button.sidebar-button:active, p
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.75);
 }
 
@@ -5266,6 +5295,7 @@ button.circular:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
@@ -5842,7 +5872,54 @@ indicatorbin.needs-attention > indicator > label {
 }
 
 tabbar .box {
-  min-height: 32px;
+  min-height: 28px;
+}
+
+tabbar tabbox {
+  background-color: #cccccc;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
+}
+
+tabbar tabbox > tabboxchild {
+  margin: 0 -3px;
+  border-radius: 0;
+}
+
+tabbar tabbox > tab,
+tabbar tabbox > tabboxchild > tab {
+  border-top: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0;
+  padding: 0 8px;
+}
+
+tabbar tabbox > tab:checked,
+tabbar tabbox > tabboxchild > tab:checked {
+  border-top-color: #e5e5e5;
+}
+
+tabbar tabbox > tab button.tab-close-button,
+tabbar tabbox > tabboxchild > tab button.tab-close-button {
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+  min-height: 20px;
+  min-width: 20px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+tabbar tabbox > tab button.tab-close-button:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbar tabbox > tab button.tab-close-button:active, tabbar tabbox > tab button.tab-close-button:active:hover,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active,
+tabbar tabbox > tabboxchild > tab button.tab-close-button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
 }
 
 tabbar tabbox > separator.hidden {
diff --git a/src/other/dash-to-dock/stylesheet-Dark.css b/src/other/dash-to-dock/stylesheet-Dark.css
index d4f8b473..751d8b4e 100644
--- a/src/other/dash-to-dock/stylesheet-Dark.css
+++ b/src/other/dash-to-dock/stylesheet-Dark.css
@@ -137,7 +137,7 @@
 }
 
 #dashtodockContainer:overview #dash {
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer.opaque:overview #dash, #dashtodockContainer.transparent:overview #dash {
diff --git a/src/other/dash-to-dock/stylesheet.css b/src/other/dash-to-dock/stylesheet.css
index 2290fe33..cad74d66 100644
--- a/src/other/dash-to-dock/stylesheet.css
+++ b/src/other/dash-to-dock/stylesheet.css
@@ -137,7 +137,7 @@
 }
 
 #dashtodockContainer:overview #dash {
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(255, 255, 255, 0.16);
 }
 
 #dashtodockContainer.opaque:overview #dash, #dashtodockContainer.transparent:overview #dash {
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 96ffda2a..9f2a94a3 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -38,8 +38,9 @@ $light_alt_fg_color:                rgba(white, 0.85);
 $light_hint_fg_color:               rgba(white, 0.50);
 $light_disabled_fg_color:           rgba(white, 0.45);
 $light_alt_disabled_fg_color:       rgba(white, 0.35);
-$light_track_color:                 rgba(white, 0.30);
-$light_divider_color:               rgba(white, 0.15);
+$light_track_color:                 rgba(white, 0.26);
+$light_divider_color:               rgba(white, 0.16);
+$light_fill_color:                  rgba(white, 0.08);
 
 $selected_fg_color:                 $light_fg_color;
 $selected_bg_color:                 theme(color);
diff --git a/src/sass/gnome-shell/_widgets-42-0.scss b/src/sass/gnome-shell/_widgets-42-0.scss
index 330c807f..4bd1922a 100644
--- a/src/sass/gnome-shell/_widgets-42-0.scss
+++ b/src/sass/gnome-shell/_widgets-42-0.scss
@@ -21,6 +21,7 @@
 @import 'common/overview';
 @import 'common/panel';
 @import 'common/popovers';
+@import 'common/quick-settings';
 @import 'common/screen-shield';
 @import 'common/search-results';
 @import 'common/scrollbars';
@@ -30,7 +31,7 @@
 @import 'common/switches';
 @import 'common/tiled-previews';
 @import 'common/workspace-switcher';
-@import 'widgets-40-0/app-grid';
+@import 'widgets-42-0/app-grid';
 @import 'widgets-40-0/dash';
 @import 'widgets-40-0/misc';
 @import 'widgets-40-0/overview';
diff --git a/src/sass/gnome-shell/common/_buttons.scss b/src/sass/gnome-shell/common/_buttons.scss
index 66998d05..3e1962ea 100644
--- a/src/sass/gnome-shell/common/_buttons.scss
+++ b/src/sass/gnome-shell/common/_buttons.scss
@@ -1,8 +1,8 @@
 /* Buttons */
 
 .button {
-  min-height: $medium_size;
-  padding: 0 16px;
+  min-height: 16px;
+  padding: $base_padding $base_padding * 2;
   border-radius: $bt_radius;
   box-shadow: none;
 
@@ -16,6 +16,19 @@
   }
 }
 
+.icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: $base_padding;
+  border-radius: $circular_radius;
+
+  @include button(flat-normal);
+  &:hover { @include button(flat-hover); }
+  &:active { @include button(flat-active); }
+  &:insensitive { @include button(flat-insensitive); }
+  &:focus { @include button(flat-focus); }
+}
+
 %osd_button {
   background-color: transparent;
   border: none;
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index 16aabb27..4a24debd 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -30,15 +30,15 @@ $popop_menuitem_radius: $wm_radius - 4px;
     font-weight: normal;
     border: 1px solid if($variant == 'light', $borders_color, black);
     box-shadow: inset 0 0 0 1px rgba(white, 0.1);
-    padding: 9px 0 !important;
-    margin: 0 !important;
+    padding: 9px 0;
+    margin: 0;
     border-radius: $mn_radius;
     background-color: $menu_bg;
   }
 
   .popup-menu-item {
-    spacing: 12px !important;
-    padding: 6px !important;
+    spacing: 12px;
+    padding: 6px;
     border-radius: 0 !important;
     color: $alt_fg_color !important;
     text-shadow: none;
diff --git a/src/sass/gnome-shell/common/_quick-settings.scss b/src/sass/gnome-shell/common/_quick-settings.scss
new file mode 100644
index 00000000..576419b5
--- /dev/null
+++ b/src/sass/gnome-shell/common/_quick-settings.scss
@@ -0,0 +1,181 @@
+.quick-settings {
+  padding: $base_padding * 2 !important;
+
+  .icon-button, .button {
+    padding: $container_padding;
+  }
+}
+
+.quick-settings-grid {
+  spacing-rows: $base_padding * 2;
+  spacing-columns: $base_padding * 2;
+}
+
+.quick-toggle {
+  border-radius: $mn_radius;
+  min-width: 12em;
+  max-width: 12em;
+  min-height: 40px;
+  border: none;
+  background-color: $fill_color !important;
+
+  &:hover {
+    background-color: $divider_color !important;
+  }
+
+  &:active {
+    background-color: $visit_color !important;
+  }
+
+  &:checked {
+    background-color: $primary_color !important;
+    color: $light_fg_color;
+
+    &:hover {
+      background-color: mix($text_color, $primary_color, 6%) !important;
+      color: $light_fg_color;
+    }
+
+    &:active {
+      background-color: mix($text_color, $primary_color, 15%) !important;
+      color: $light_fg_color;
+    }
+  }
+
+  & > StBoxLayout { spacing: $base_padding; }
+
+  /* Move padding into the box; this is to allow menu arrows
+     to extend to the border */
+  &.button { padding: 0; }
+  & > StBoxLayout { padding: 0 $base_padding * 2; }
+  &:ltr > StBoxLayout { padding-left: $base_padding * 2.5; }
+  &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; }
+
+  .quick-toggle-label { font-weight: bold; }
+  .quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size; }
+}
+
+.quick-menu-toggle {
+  &:ltr > StBoxLayout { padding-right: 0; }
+  &:rtl > StBoxLayout { padding-left: 0; }
+
+  .quick-toggle-arrow {
+    background-color: $fill_color !important;
+    padding: $base_padding $base_padding * 1.75;
+
+    &:active {
+      background-color: $divider_color !important;
+    }
+
+    &:ltr { border-radius: 0 $mn_radius $mn_radius 0; }
+    &:rtl { border-radius: $mn_radius 0 0 $mn_radius; }
+  }
+}
+
+.quick-slider {
+  padding: 0 $base_padding;
+
+  & > StBoxLayout { spacing: $base_padding; }
+
+  .slider-bin {
+    &:focus { @include button(focus); }
+    min-height: 16px; // slider size
+    padding: $base_padding;
+    border-radius: $circular_radius;
+  }
+
+  .quick-toggle-icon {
+    icon-size: $base_icon_size;
+  }
+
+  .icon-button {
+    background-color: transparent;
+    color: $text_color !important;
+
+    &:hover {
+      background-color: $fill_color;
+    }
+
+    &:active {
+      background-color: $divider_color;
+    }
+  }
+}
+
+.quick-toggle-menu {
+  background-color: $menu_bg !important;
+  color: $text_color !important;
+  border-radius: $mn_radius;
+  padding: $base_padding * 2;
+  margin: $base_padding * 2 $base_padding * 2 0;
+
+  .popup-menu-item {
+    border-radius: $bt_radius !important;
+    min-height: 20px;
+
+    &:focus, &:hover, &.selected {
+      color: $text_color !important;
+      background-color: $divider_color !important;
+    }
+
+    &:active {
+      color: $text_color !important;
+      background-color: $track_color !important;
+    }
+
+    > StIcon { -st-icon-style: symbolic; }
+  }
+
+  & .header {
+    spacing-rows: 0.5 * $base_padding;
+    spacing-columns: $base_padding * 2;
+    padding-bottom: 2 * $base_padding;
+
+    & .icon {
+      icon-size: $base_icon_size * 1.5; // a non-standard symbolic size but ok
+      border-radius: $circular_radius;
+      padding: 1.5 * $base_padding;
+      background-color: $divider_color !important;
+
+      &.active {
+        background-color: $primary_color !important;
+        color: $light_fg_color;
+      }
+    }
+  }
+}
+
+.quick-settings-system-item {
+  & > StBoxLayout { spacing: 2 * $base_padding; }
+
+  .icon-button {
+    background-color: $fill_color;
+    color: $text_color;
+    border-radius: $circular_radius;
+    min-height: 24px !important;
+    min-width: 24px !important;
+    // padding: $container_padding;
+
+    &:hover { @include button(flat-hover); }
+    &:active { @include button(flat-active); }
+
+    > StIcon {
+     -st-icon-style: symbolic;
+     icon-size: $base_icon_size;
+    }
+  }
+
+  .power-item {
+    min-height: 0;
+    min-width: 0;
+
+    &:insensitive {
+      @include button(normal);
+      background-color: transparent;
+    }
+  }
+}
+
+.nm-network-item {
+  .wireless-secure-icon { icon-size: 0.5 * $base_icon_size; }
+}
diff --git a/src/sass/gnome-shell/widgets-42-0/_app-grid.scss b/src/sass/gnome-shell/widgets-42-0/_app-grid.scss
new file mode 100644
index 00000000..81d762d5
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-42-0/_app-grid.scss
@@ -0,0 +1,67 @@
+
+$app_icon_size: 96px;
+
+// app icons
+.icon-grid {
+  row-spacing: $base_spacing * 2;
+  column-spacing: $base_spacing * 2;
+  max-row-spacing: $base_spacing * 12;
+  max-column-spacing: $base_spacing * 12;
+  page-padding-top: $base_padding * 4;
+  page-padding-bottom: $base_padding * 4;
+  page-padding-left: $base_padding * 2;
+  page-padding-right: $base_padding * 2;
+}
+
+.apps-scroll-view {
+  padding: 0;
+}
+
+.page-navigation-hint {
+  width: 300px;
+
+  &.dnd {
+    background: rgba(255, 255, 255, 0.1);
+  }
+
+  &.next:ltr,
+  &.previous:rtl {
+    background-gradient-start: rgba(255, 255, 255, 0.05);
+    background-gradient-end: transparent;
+    background-gradient-direction: horizontal;
+    border-radius: 15px 0px 0px 15px;
+  }
+
+  &.previous:ltr,
+  &.next:rtl {
+    background-gradient-start: transparent;
+    background-gradient-end: rgba(255, 255, 255, 0.05);
+    background-gradient-direction: horizontal;
+    border-radius: 0px 15px 15px 0px;
+  }
+}
+
+.page-navigation-arrow {
+  &  > StIcon {
+    margin: $base_padding;
+    padding: $base_padding * 3;
+    width: 24px;
+    height: 24px;
+    border-radius: $circular_radius;
+  }
+
+  &:insensitive > StIcon {
+    backround-color: $light_fill_color;
+    color: $light_fg_color;
+  }
+
+  &:hover > StIcon {
+   backround-color: $light_divider_color;
+   color: $light_fg_color;
+  }
+
+  &:active > StIcon {
+   backround-color: $light_track_color;
+   color: $light_fg_color;
+  }
+}
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 27c0c024..8aac0d76 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -289,6 +289,8 @@ spinner {
   border: 1px solid;
   border-color: if($variant == 'light', $entry_border, $dark_borders_color);
   border-bottom-color: if($variant == 'light', $entry_bottom_border, $dark_borders_color);
+  background-clip: border-box;
+  background-origin: border-box;
 
   &:focus-within {
     @include entry(focus);
@@ -309,15 +311,15 @@ entry {
   padding: 2px 8px;
   border-radius: 7px;
   caret-color: currentColor;
-
-  &.search { border-radius: $bt_radius; }
-
-  @include entry(normal);
-
+  background-clip: padding-box;
+  background-origin: padding-box;
   border-image-width: 6px 6px 6px 6px;
   border-image-slice: 6 6 6 6;
   border-image-repeat: stretch;
   border-image-source: -gtk-scaled(url("assets/entry#{$asset_suffix}.png"),url("assets/entry#{$asset_suffix}@2.png"));
+  @include entry(normal);
+
+  &.search { border-radius: $bt_radius; }
 
   > image { // icons inside the entry
     color: mix($fg_color,$base_color,80%);
@@ -1124,6 +1126,11 @@ spinbutton {
     }
   }
 
+  > button {
+    border: 1px solid $borders_color;
+    @include button(normal);
+  }
+
   &:not(.vertical) {
     > text {
       padding: 2px 8px;
@@ -1194,8 +1201,8 @@ combobox {
   min-height: 24px;
 
   button.combo {
-    padding-left: 12px;
-    padding-right: 12px;
+    padding: 0 12px;
+    min-height: 24px;
   }
 
   // align menu labels with the button label
@@ -2317,14 +2324,14 @@ cursor-handle {
   border: 1px solid transparent;
   transition: all 150ms ease-out;
 
-  &:hover:not(:checked) {
+  &:hover:not(:checked):not(:selected) {
     color: mix($fg_color, $disabled_fg_color, 50%);
     background-color: if($variant == 'light', rgba(white, 0.2), rgba(white, 0.05));
     border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
     box-shadow: none;
   }
 
-  &:checked {
+  &:checked, &:selected {
     color: $fg_color;
     background-color: $header_bg;
     border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index edd3403d..c60c98b0 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -248,7 +248,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     color: darken($fg_color, 10%);
     background-color: if($variant=='light', rgba(black, 0.15), rgba(white, 0.15));
     background-image: none;
-    // border-color: if($variant=='light', rgba(black, 0.15), rgba(white, 0.15));
+    box-shadow: none;
   }
 
   @else if $t==flat-active {
@@ -258,6 +258,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     background-image: none;
     color: $selected_fg_color;
     background-color: if($variant=='light', rgba(black, 0.5), rgba(white, 0.25));
+    box-shadow: none;
   }
 
   @else if $t==flat-checked {
@@ -267,6 +268,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     background-image: none;
     color: $selected_fg_color;
     background-color: if($variant=='light', rgba(black, 0.65), rgba(white, 0.35));
+    box-shadow: none;
   }
 
   @else if $t==flat-insensitive {
@@ -279,6 +281,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     }
 
     background-color: transparent;
+    box-shadow: none;
   }
 
   @else if $t==flat-insensitive-active {
diff --git a/src/sass/gtk/_libadwaita.scss b/src/sass/gtk/_libadwaita.scss
index f7758f9f..e2b7fc76 100644
--- a/src/sass/gtk/_libadwaita.scss
+++ b/src/sass/gtk/_libadwaita.scss
@@ -296,10 +296,50 @@ indicatorbin {
 
 tabbar {
   .box {
-    min-height: $menuitem_size;
+    min-height: 28px;
   }
 
   tabbox {
+    background-color: darken($header_bg, 10%);
+    box-shadow: inset 0 -1px $borders_color;
+
+    > tabboxchild {
+      margin: 0 -3px;
+      border-radius: 0;
+    }
+
+    > tab,
+    > tabboxchild > tab {
+      @extend %tabs_tab;
+      border-top: none;
+      border-top: 1px solid $borders_color;
+      border-radius: 0;
+      padding: 0 8px;
+
+      &:checked { border-top-color: $header_bg; }
+
+      button.tab-close-button {
+        border-radius: 3px;
+        border: none;
+        padding: 0;
+        min-height: 20px;
+        min-width: 20px;
+        margin-top: 2px;
+        margin-bottom: 2px;
+        @extend %flat_button;
+
+        &:hover {
+          color: $fg_color;
+          background-color: rgba($borders_color, 0.1);
+        }
+
+        &:active, &:active:hover {
+          color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
+          background-color: rgba($borders_color, 0.2);
+        }
+      }
+    }
+
     > separator {
       &.hidden {
         opacity: 0;