diff --git a/install.sh b/install.sh
index b37d7f8e..9dab52e0 100755
--- a/install.sh
+++ b/install.sh
@@ -97,8 +97,8 @@ install() {
 
   glib-compile-resources --sourcedir=${THEME_DIR}/gtk-3.0 --target=${THEME_DIR}/gtk-3.0/gtk.gresource ${SRC_DIR}/main/gtk-3.0/gtk.gresource.xml
   rm -rf ${THEME_DIR}/gtk-3.0/{assets,windows-assets,gtk.css,gtk-dark.css}
-  echo '@import url("resource:///org/gnome/Mcata-theme/gtk.css");' >>                   ${THEME_DIR}/gtk-3.0/gtk.css
-  echo '@import url("resource:///org/gnome/Mcata-theme/gtk-dark.css");' >>              ${THEME_DIR}/gtk-3.0/gtk-dark.css
+  echo '@import url("resource:///org/gnome/theme/gtk.css");' >>                         ${THEME_DIR}/gtk-3.0/gtk.css
+  echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' >>                    ${THEME_DIR}/gtk-3.0/gtk-dark.css
 
   mkdir -p                                                                              ${THEME_DIR}/metacity-1
   cp -ur ${SRC_DIR}/main/metacity-1/metacity-theme${color}.xml                          ${THEME_DIR}/metacity-1/metacity-theme-1.xml
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 73fb2491..bd28bc7c 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -18,10 +18,6 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
-* {
-  transition-duration: 150ms;
-}
-
 stage {
   font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
@@ -91,8 +87,6 @@ StEntry {
   caret-color: #dedede;
   selection-background-color: #0860f2;
   selected-color: rgba(255, 255, 255, 0.85);
-  font-size: 11.25pt;
-  font-weight: 400;
   background-color: rgba(255, 255, 255, 0.1);
   border-radius: 10px;
   box-shadow: inset 0 0 0 2px transparent;
@@ -1827,7 +1821,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 6px;
   border: none;
   color: #afafaf;
-  background-color: #383838;
+  background-color: transparent;
   margin: 4px;
   box-shadow: none;
   text-shadow: none;
@@ -1835,12 +1829,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .message:hover, .message:focus {
   color: #dedede;
-  background-color: rgba(255, 255, 255, 0.06);
+  background-color: #383838;
 }
 
 .message:active {
   color: #dedede;
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(56, 56, 56, 0.8);
 }
 
 .message .message-icon-bin {
@@ -2422,21 +2416,15 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.15);
 }
 
-.show-apps .show-apps-icon {
-  color: transparent;
-  background-image: url("assets/startup@2.svg");
-  background-size: contain;
-}
-
 .show-apps .overview-icon {
-  color: transparent;
+  color: white;
 }
 
 .show-apps:hover .show-apps-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .show-apps-icon,
 .show-apps:focus .show-apps-icon {
-  color: transparent;
+  color: white;
   transition-duration: 150ms;
 }
 
@@ -3100,11 +3088,16 @@ StWidget.focused .app-well-app-running-dot {
   icon-size: 16px;
 }
 
-.login-dialog .caps-lock-warning-label,
 .login-dialog .login-dialog-message-warning {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  color: #F27835;
+}
+
 .login-dialog-logo-bin {
   padding: 24px 0px;
 }
@@ -3249,12 +3242,34 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 14px;
 }
 
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 40px;
+  height: 40px;
+}
+
 .user-widget.vertical .user-widget-label {
   text-align: center;
   font-weight: normal;
   padding-top: 16px;
 }
 
+.user-widget.vertical .user-icon {
+  icon-size: 96px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
 .login-dialog-prompt-entry {
   height: 1.5em;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 90b96b5b..dda84622 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -18,10 +18,6 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
-* {
-  transition-duration: 150ms;
-}
-
 stage {
   font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
@@ -91,8 +87,6 @@ StEntry {
   caret-color: #dedede;
   selection-background-color: #0860f2;
   selected-color: rgba(255, 255, 255, 0.85);
-  font-size: 11.25pt;
-  font-weight: 400;
   background-color: rgba(255, 255, 255, 0.1);
   border-radius: 10px;
   box-shadow: inset 0 0 0 2px transparent;
@@ -1827,7 +1821,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 6px;
   border: none;
   color: #afafaf;
-  background-color: #383838;
+  background-color: transparent;
   margin: 4px;
   box-shadow: none;
   text-shadow: none;
@@ -1835,12 +1829,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .message:hover, .message:focus {
   color: #dedede;
-  background-color: rgba(255, 255, 255, 0.06);
+  background-color: #383838;
 }
 
 .message:active {
   color: #dedede;
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(56, 56, 56, 0.8);
 }
 
 .message .message-icon-bin {
@@ -2422,21 +2416,15 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.15);
 }
 
-.show-apps .show-apps-icon {
-  color: transparent;
-  background-image: url("assets/startup@2.svg");
-  background-size: contain;
-}
-
 .show-apps .overview-icon {
-  color: transparent;
+  color: white;
 }
 
 .show-apps:hover .show-apps-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .show-apps-icon,
 .show-apps:focus .show-apps-icon {
-  color: transparent;
+  color: white;
   transition-duration: 150ms;
 }
 
@@ -3100,11 +3088,16 @@ StWidget.focused .app-well-app-running-dot {
   icon-size: 16px;
 }
 
-.login-dialog .caps-lock-warning-label,
 .login-dialog .login-dialog-message-warning {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  color: #F27835;
+}
+
 .login-dialog-logo-bin {
   padding: 24px 0px;
 }
@@ -3249,12 +3242,34 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 14px;
 }
 
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 40px;
+  height: 40px;
+}
+
 .user-widget.vertical .user-widget-label {
   text-align: center;
   font-weight: normal;
   padding-top: 16px;
 }
 
+.user-widget.vertical .user-icon {
+  icon-size: 96px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
 .login-dialog-prompt-entry {
   height: 1.5em;
 }
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index cb676e9a..7d92d80d 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -18,10 +18,6 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
-* {
-  transition-duration: 150ms;
-}
-
 stage {
   font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
@@ -91,8 +87,6 @@ StEntry {
   caret-color: #242424;
   selection-background-color: #0860f2;
   selected-color: rgba(255, 255, 255, 0.85);
-  font-size: 11.25pt;
-  font-weight: 400;
   background-color: rgba(0, 0, 0, 0.1);
   border-radius: 10px;
   box-shadow: inset 0 0 0 2px transparent;
@@ -1827,7 +1821,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 6px;
   border: none;
   color: #424242;
-  background-color: #ffffff;
+  background-color: transparent;
   margin: 4px;
   box-shadow: none;
   text-shadow: none;
@@ -1835,12 +1829,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .message:hover, .message:focus {
   color: #242424;
-  background-color: rgba(0, 0, 0, 0.12);
+  background-color: #ffffff;
 }
 
 .message:active {
   color: #242424;
-  background-color: rgba(0, 0, 0, 0.2);
+  background-color: rgba(255, 255, 255, 0.8);
 }
 
 .message .message-icon-bin {
@@ -2422,21 +2416,15 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.15);
 }
 
-.show-apps .show-apps-icon {
-  color: transparent;
-  background-image: url("assets/startup@2.svg");
-  background-size: contain;
-}
-
 .show-apps .overview-icon {
-  color: transparent;
+  color: white;
 }
 
 .show-apps:hover .show-apps-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .show-apps-icon,
 .show-apps:focus .show-apps-icon {
-  color: transparent;
+  color: white;
   transition-duration: 150ms;
 }
 
@@ -3100,11 +3088,16 @@ StWidget.focused .app-well-app-running-dot {
   icon-size: 16px;
 }
 
-.login-dialog .caps-lock-warning-label,
 .login-dialog .login-dialog-message-warning {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  color: #F27835;
+}
+
 .login-dialog-logo-bin {
   padding: 24px 0px;
 }
@@ -3249,12 +3242,34 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 14px;
 }
 
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 40px;
+  height: 40px;
+}
+
 .user-widget.vertical .user-widget-label {
   text-align: center;
   font-weight: normal;
   padding-top: 16px;
 }
 
+.user-widget.vertical .user-icon {
+  icon-size: 96px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
 .login-dialog-prompt-entry {
   height: 1.5em;
 }
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 62aa90c4..1dfaddbd 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -18,10 +18,6 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
-* {
-  transition-duration: 150ms;
-}
-
 stage {
   font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
@@ -91,8 +87,6 @@ StEntry {
   caret-color: #242424;
   selection-background-color: #0860f2;
   selected-color: rgba(255, 255, 255, 0.85);
-  font-size: 11.25pt;
-  font-weight: 400;
   background-color: rgba(0, 0, 0, 0.1);
   border-radius: 10px;
   box-shadow: inset 0 0 0 2px transparent;
@@ -1827,7 +1821,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 6px;
   border: none;
   color: #424242;
-  background-color: #ffffff;
+  background-color: transparent;
   margin: 4px;
   box-shadow: none;
   text-shadow: none;
@@ -1835,12 +1829,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .message:hover, .message:focus {
   color: #242424;
-  background-color: rgba(0, 0, 0, 0.12);
+  background-color: #ffffff;
 }
 
 .message:active {
   color: #242424;
-  background-color: rgba(0, 0, 0, 0.2);
+  background-color: rgba(255, 255, 255, 0.8);
 }
 
 .message .message-icon-bin {
@@ -2422,21 +2416,15 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.15);
 }
 
-.show-apps .show-apps-icon {
-  color: transparent;
-  background-image: url("assets/startup@2.svg");
-  background-size: contain;
-}
-
 .show-apps .overview-icon {
-  color: transparent;
+  color: white;
 }
 
 .show-apps:hover .show-apps-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .show-apps-icon,
 .show-apps:focus .show-apps-icon {
-  color: transparent;
+  color: white;
   transition-duration: 150ms;
 }
 
@@ -3100,11 +3088,16 @@ StWidget.focused .app-well-app-running-dot {
   icon-size: 16px;
 }
 
-.login-dialog .caps-lock-warning-label,
 .login-dialog .login-dialog-message-warning {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  color: #F27835;
+}
+
 .login-dialog-logo-bin {
   padding: 24px 0px;
 }
@@ -3249,12 +3242,34 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 14px;
 }
 
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 40px;
+  height: 40px;
+}
+
 .user-widget.vertical .user-widget-label {
   text-align: center;
   font-weight: normal;
   padding-top: 16px;
 }
 
+.user-widget.vertical .user-icon {
+  icon-size: 96px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
 .login-dialog-prompt-entry {
   height: 1.5em;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 5c202bb0..3e6692aa 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -204,6 +204,7 @@ spinner:checked:disabled, label:disabled selection:checked {
 entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
   border: none;
 }
 
@@ -211,6 +212,7 @@ entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
   box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
+  transition-duration: 300ms;
 }
 
 entry.contacts-postal-entry:disabled, spinbutton entry:disabled, .linked > entry:disabled:not(:only-child) {
@@ -226,6 +228,7 @@ entry {
   caret-color: currentColor;
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 entry.search {
@@ -253,10 +256,18 @@ entry image.right {
   border-radius: 0;
 }
 
+entry:hover {
+  color: #dadada;
+  background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 entry:focus {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
   box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
+  transition-duration: 300ms;
 }
 
 entry:disabled {
@@ -1084,8 +1095,6 @@ spinbutton:disabled {
 }
 
 spinbutton entry {
-  padding-top: 2px;
-  padding-bottom: 2px;
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
@@ -1105,6 +1114,10 @@ spinbutton:not(.vertical) entry {
   min-width: 28px;
 }
 
+spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
+  min-height: 20px;
+}
+
 spinbutton:not(.vertical):dir(ltr) entry, spinbutton:not(.vertical):dir(rtl) button.up {
   border-radius: 6px 0 0 6px;
 }
@@ -1308,25 +1321,6 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
   border-width: 0 0 0 1px;
 }
 
-.inline-toolbar:not(.inline-toolbar) switch,
-.inline-toolbar:not(.inline-toolbar) scale,
-.inline-toolbar:not(.inline-toolbar) entry,
-.inline-toolbar:not(.inline-toolbar) spinbutton,
-.inline-toolbar:not(.inline-toolbar) button, toolbar:not(.inline-toolbar) switch,
-toolbar:not(.inline-toolbar) scale,
-toolbar:not(.inline-toolbar) entry,
-toolbar:not(.inline-toolbar) spinbutton,
-toolbar:not(.inline-toolbar) button {
-  margin-right: 1px;
-  margin-bottom: 1px;
-}
-
-.inline-toolbar:not(.inline-toolbar) .linked > button,
-.inline-toolbar:not(.inline-toolbar) .linked > entry, toolbar:not(.inline-toolbar) .linked > button,
-toolbar:not(.inline-toolbar) .linked > entry {
-  margin-right: 0;
-}
-
 .primary-toolbar:not(.libreoffice-toolbar) {
   color: #dadada;
   background-color: transparent;
@@ -1430,7 +1424,7 @@ headerbar stackswitcher.linked.stack-switcher:not(.vertical) > button {
 headerbar .linked:not(.vertical) > entry {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   margin: 8px 3px;
   padding: 0 8px;
   border-radius: 6px;
@@ -1690,7 +1684,7 @@ headerbar entry, .titlebar entry {
   min-height: 22px;
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .nemo-window .primary-toolbar entry image, headerbar entry image, headerbar entry image:hover {
@@ -1702,6 +1696,13 @@ headerbar entry, .titlebar entry {
   background-image: none;
 }
 
+.nemo-window .primary-toolbar entry:hover, headerbar entry:hover {
+  color: #FDFDFD;
+  background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 .nemo-window .primary-toolbar entry:focus, headerbar entry:focus {
   background-image: none;
   background-color: rgba(255, 255, 255, 0.05);
@@ -2304,22 +2305,6 @@ notebook.frame {
   border: 1px solid #474747;
 }
 
-notebook.frame > header.top tabs > tab:first-child, notebook.frame > header.bottom tabs > tab:first-child {
-  border-left-style: none;
-}
-
-notebook.frame > header.top tabs > tab:last-child, notebook.frame > header.bottom tabs > tab:last-child {
-  border-right-style: solid;
-}
-
-notebook.frame > header.left tabs > tab:first-child, notebook.frame > header.right tabs > tab:first-child {
-  border-top-style: none;
-}
-
-notebook.frame > header.left tabs > tab:last-child, notebook.frame > header.right tabs > tab:last-child {
-  border-bottom-style: solid;
-}
-
 notebook > stack:not(:only-child) {
   background-color: #242424;
 }
@@ -5388,7 +5373,7 @@ omnibar.linked > entry:not(:only-child) {
   margin-right: 1px;
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   border-left: none;
 }
 
@@ -5399,7 +5384,7 @@ omnibar.linked > entry:not(:only-child) image, omnibar.linked > entry:not(:only-
 omnibar.linked > entry:not(:only-child):backdrop {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   opacity: 0.65;
 }
 
@@ -5908,28 +5893,18 @@ stack#titlebar_container.titlebar > stack > headerbar {
   border: none;
 }
 
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry {
-  box-shadow: inset 0 0 0 2px transparent;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:hover {
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.03), inset 0 0 0 2px transparent;
-  transition-duration: 200ms;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:focus {
-  box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
-  transition-duration: 300ms;
-}
-
 notebook.main-notebook > header.top {
   margin-top: 0;
 }
 
-notebook.main-notebook > header.top tabs > tab:checked {
+notebook.main-notebook > header.top > tabs > tab:checked {
   border-top-color: #373737;
 }
 
+notebook.main-notebook > header.top > tabs > tab:first-child {
+  border-left-width: 0;
+}
+
 stack.view.polari-entry-area {
   background-color: #333333;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
@@ -6186,7 +6161,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 headerbar.titlebar.incognito-mode entry {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode entry image:hover {
@@ -6211,7 +6186,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 .background headerbar entry.starred, .background headerbar entry.non-starred {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .background headerbar entry.starred image, .background headerbar entry.starred image:hover, .background headerbar entry.non-starred image, .background headerbar entry.non-starred image:hover {
@@ -7273,6 +7248,38 @@ window.background.csd > box.horizontal > stack > box.vertical > notebook > stack
   border-bottom-right-radius: 14px;
 }
 
+toolbar#SubToolBox {
+  min-height: 36px;
+}
+
+toolbar#SubToolBox entry, toolbar#SubToolBox button {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+toolbar#SubToolBox > toolbutton > button.flat, .raven .raven-header:not(.top) toolbar#SubToolBox > toolbutton > button {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+widget#ToolboxCommon button.flat:active, widget#ToolboxCommon .raven .raven-header:not(.top) button:active, .raven .raven-header:not(.top) widget#ToolboxCommon button:active {
+  background-color: rgba(222, 222, 222, 0.25);
+}
+
+widget#ToolboxCommon button.flat:checked, widget#ToolboxCommon .raven .raven-header:not(.top) button:checked, .raven .raven-header:not(.top) widget#ToolboxCommon button:checked {
+  background-color: rgba(222, 222, 222, 0.15);
+}
+
+widget#ToolboxCommon > toolbar > toolbutton > button.flat, .raven .raven-header:not(.top) widget#ToolboxCommon > toolbar > toolbutton > button {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+box#DesktopStatusBar spinbutton, box#DesktopStatusBar button.combo {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
 window > box.vertical > box.horizontal > toolbar {
   background-color: transparent;
   box-shadow: none;
@@ -7581,7 +7588,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
   padding-right: 4px;
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .marlin-pathbar.pathbar image, .marlin-pathbar.pathbar image:hover {
@@ -8648,12 +8655,14 @@ filechooser actionbar button:active, filechooser actionbar button:checked {
 filechooser actionbar entry {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 filechooser actionbar entry:focus {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
   box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
+  transition-duration: 300ms;
 }
 
 
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 42ca3210..3dc07eee 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -204,6 +204,7 @@ spinner:checked:disabled, label:disabled selection:checked {
 entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
   border: none;
 }
 
@@ -211,6 +212,7 @@ entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
   box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
+  transition-duration: 300ms;
 }
 
 entry.contacts-postal-entry:disabled, spinbutton entry:disabled, .linked > entry:disabled:not(:only-child) {
@@ -226,6 +228,7 @@ entry {
   caret-color: currentColor;
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 entry.search {
@@ -253,10 +256,18 @@ entry image.right {
   border-radius: 0;
 }
 
+entry:hover {
+  color: #dadada;
+  background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 entry:focus {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
   box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
+  transition-duration: 300ms;
 }
 
 entry:disabled {
@@ -1084,8 +1095,6 @@ spinbutton:disabled {
 }
 
 spinbutton entry {
-  padding-top: 2px;
-  padding-bottom: 2px;
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
@@ -1105,6 +1114,10 @@ spinbutton:not(.vertical) entry {
   min-width: 28px;
 }
 
+spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
+  min-height: 20px;
+}
+
 spinbutton:not(.vertical):dir(ltr) entry, spinbutton:not(.vertical):dir(rtl) button.up {
   border-radius: 6px 0 0 6px;
 }
@@ -1308,25 +1321,6 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
   border-width: 0 0 0 1px;
 }
 
-.inline-toolbar:not(.inline-toolbar) switch,
-.inline-toolbar:not(.inline-toolbar) scale,
-.inline-toolbar:not(.inline-toolbar) entry,
-.inline-toolbar:not(.inline-toolbar) spinbutton,
-.inline-toolbar:not(.inline-toolbar) button, toolbar:not(.inline-toolbar) switch,
-toolbar:not(.inline-toolbar) scale,
-toolbar:not(.inline-toolbar) entry,
-toolbar:not(.inline-toolbar) spinbutton,
-toolbar:not(.inline-toolbar) button {
-  margin-right: 1px;
-  margin-bottom: 1px;
-}
-
-.inline-toolbar:not(.inline-toolbar) .linked > button,
-.inline-toolbar:not(.inline-toolbar) .linked > entry, toolbar:not(.inline-toolbar) .linked > button,
-toolbar:not(.inline-toolbar) .linked > entry {
-  margin-right: 0;
-}
-
 .primary-toolbar:not(.libreoffice-toolbar) {
   color: #dadada;
   background-color: transparent;
@@ -1430,7 +1424,7 @@ headerbar stackswitcher.linked.stack-switcher:not(.vertical) > button {
 headerbar .linked:not(.vertical) > entry {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   margin: 8px 3px;
   padding: 0 8px;
   border-radius: 6px;
@@ -1690,7 +1684,7 @@ headerbar entry, .titlebar entry {
   min-height: 22px;
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .nemo-window .primary-toolbar entry image, headerbar entry image, headerbar entry image:hover {
@@ -1702,6 +1696,13 @@ headerbar entry, .titlebar entry {
   background-image: none;
 }
 
+.nemo-window .primary-toolbar entry:hover, headerbar entry:hover {
+  color: #FDFDFD;
+  background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 .nemo-window .primary-toolbar entry:focus, headerbar entry:focus {
   background-image: none;
   background-color: rgba(255, 255, 255, 0.05);
@@ -2304,22 +2305,6 @@ notebook.frame {
   border: 1px solid #474747;
 }
 
-notebook.frame > header.top tabs > tab:first-child, notebook.frame > header.bottom tabs > tab:first-child {
-  border-left-style: none;
-}
-
-notebook.frame > header.top tabs > tab:last-child, notebook.frame > header.bottom tabs > tab:last-child {
-  border-right-style: solid;
-}
-
-notebook.frame > header.left tabs > tab:first-child, notebook.frame > header.right tabs > tab:first-child {
-  border-top-style: none;
-}
-
-notebook.frame > header.left tabs > tab:last-child, notebook.frame > header.right tabs > tab:last-child {
-  border-bottom-style: solid;
-}
-
 notebook > stack:not(:only-child) {
   background-color: #242424;
 }
@@ -5388,7 +5373,7 @@ omnibar.linked > entry:not(:only-child) {
   margin-right: 1px;
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   border-left: none;
 }
 
@@ -5399,7 +5384,7 @@ omnibar.linked > entry:not(:only-child) image, omnibar.linked > entry:not(:only-
 omnibar.linked > entry:not(:only-child):backdrop {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   opacity: 0.65;
 }
 
@@ -5908,28 +5893,18 @@ stack#titlebar_container.titlebar > stack > headerbar {
   border: none;
 }
 
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry {
-  box-shadow: inset 0 0 0 2px transparent;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:hover {
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.03), inset 0 0 0 2px transparent;
-  transition-duration: 200ms;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:focus {
-  box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
-  transition-duration: 300ms;
-}
-
 notebook.main-notebook > header.top {
   margin-top: 0;
 }
 
-notebook.main-notebook > header.top tabs > tab:checked {
+notebook.main-notebook > header.top > tabs > tab:checked {
   border-top-color: #373737;
 }
 
+notebook.main-notebook > header.top > tabs > tab:first-child {
+  border-left-width: 0;
+}
+
 stack.view.polari-entry-area {
   background-color: #333333;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
@@ -6186,7 +6161,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 headerbar.titlebar.incognito-mode entry {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode entry image:hover {
@@ -6211,7 +6186,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 .background headerbar entry.starred, .background headerbar entry.non-starred {
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .background headerbar entry.starred image, .background headerbar entry.starred image:hover, .background headerbar entry.non-starred image, .background headerbar entry.non-starred image:hover {
@@ -7273,6 +7248,38 @@ window.background.csd > box.horizontal > stack > box.vertical > notebook > stack
   border-bottom-right-radius: 14px;
 }
 
+toolbar#SubToolBox {
+  min-height: 36px;
+}
+
+toolbar#SubToolBox entry, toolbar#SubToolBox button {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+toolbar#SubToolBox > toolbutton > button.flat, .raven .raven-header:not(.top) toolbar#SubToolBox > toolbutton > button {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+widget#ToolboxCommon button.flat:active, widget#ToolboxCommon .raven .raven-header:not(.top) button:active, .raven .raven-header:not(.top) widget#ToolboxCommon button:active {
+  background-color: rgba(222, 222, 222, 0.25);
+}
+
+widget#ToolboxCommon button.flat:checked, widget#ToolboxCommon .raven .raven-header:not(.top) button:checked, .raven .raven-header:not(.top) widget#ToolboxCommon button:checked {
+  background-color: rgba(222, 222, 222, 0.15);
+}
+
+widget#ToolboxCommon > toolbar > toolbutton > button.flat, .raven .raven-header:not(.top) widget#ToolboxCommon > toolbar > toolbutton > button {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+box#DesktopStatusBar spinbutton, box#DesktopStatusBar button.combo {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
 window > box.vertical > box.horizontal > toolbar {
   background-color: transparent;
   box-shadow: none;
@@ -7581,7 +7588,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
   padding-right: 4px;
   color: #FDFDFD;
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .marlin-pathbar.pathbar image, .marlin-pathbar.pathbar image:hover {
@@ -8648,12 +8655,14 @@ filechooser actionbar button:active, filechooser actionbar button:checked {
 filechooser actionbar entry {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 filechooser actionbar entry:focus {
   color: #dadada;
   background-color: rgba(255, 255, 255, 0.05);
   box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75);
+  transition-duration: 300ms;
 }
 
 
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 224e9e9a..3eb1f4cd 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -204,6 +204,7 @@ spinner:checked:disabled, label:disabled selection:checked {
 entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
   border: none;
 }
 
@@ -211,6 +212,7 @@ entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
+  transition-duration: 300ms;
 }
 
 entry.contacts-postal-entry:disabled, spinbutton entry:disabled, .linked > entry:disabled:not(:only-child) {
@@ -226,6 +228,7 @@ entry {
   caret-color: currentColor;
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 entry.search {
@@ -253,10 +256,18 @@ entry image.right {
   border-radius: 0;
 }
 
+entry:hover {
+  color: #363636;
+  background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 entry:focus {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
+  transition-duration: 300ms;
 }
 
 entry:disabled {
@@ -1095,8 +1106,6 @@ spinbutton:disabled {
 }
 
 spinbutton entry {
-  padding-top: 2px;
-  padding-bottom: 2px;
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
@@ -1116,6 +1125,10 @@ spinbutton:not(.vertical) entry {
   min-width: 28px;
 }
 
+spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
+  min-height: 20px;
+}
+
 spinbutton:not(.vertical):dir(ltr) entry, spinbutton:not(.vertical):dir(rtl) button.up {
   border-radius: 6px 0 0 6px;
 }
@@ -1320,25 +1333,6 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
   border-width: 0 0 0 1px;
 }
 
-.inline-toolbar:not(.inline-toolbar) switch,
-.inline-toolbar:not(.inline-toolbar) scale,
-.inline-toolbar:not(.inline-toolbar) entry,
-.inline-toolbar:not(.inline-toolbar) spinbutton,
-.inline-toolbar:not(.inline-toolbar) button, toolbar:not(.inline-toolbar) switch,
-toolbar:not(.inline-toolbar) scale,
-toolbar:not(.inline-toolbar) entry,
-toolbar:not(.inline-toolbar) spinbutton,
-toolbar:not(.inline-toolbar) button {
-  margin-right: 1px;
-  margin-bottom: 1px;
-}
-
-.inline-toolbar:not(.inline-toolbar) .linked > button,
-.inline-toolbar:not(.inline-toolbar) .linked > entry, toolbar:not(.inline-toolbar) .linked > button,
-toolbar:not(.inline-toolbar) .linked > entry {
-  margin-right: 0;
-}
-
 .primary-toolbar:not(.libreoffice-toolbar) {
   color: #363636;
   background-color: transparent;
@@ -1442,7 +1436,7 @@ headerbar stackswitcher.linked.stack-switcher:not(.vertical) > button {
 headerbar .linked:not(.vertical) > entry {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   margin: 8px 3px;
   padding: 0 8px;
   border-radius: 6px;
@@ -1702,7 +1696,7 @@ headerbar entry, .titlebar entry {
   min-height: 22px;
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .nemo-window .primary-toolbar entry image, headerbar entry image, headerbar entry image:hover {
@@ -1714,6 +1708,13 @@ headerbar entry, .titlebar entry {
   background-image: none;
 }
 
+.nemo-window .primary-toolbar entry:hover, headerbar entry:hover {
+  color: #575757;
+  background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 .nemo-window .primary-toolbar entry:focus, headerbar entry:focus {
   background-image: none;
   background-color: rgba(0, 0, 0, 0.05);
@@ -2316,22 +2317,6 @@ notebook.frame {
   border: 1px solid #d6d6d6;
 }
 
-notebook.frame > header.top tabs > tab:first-child, notebook.frame > header.bottom tabs > tab:first-child {
-  border-left-style: none;
-}
-
-notebook.frame > header.top tabs > tab:last-child, notebook.frame > header.bottom tabs > tab:last-child {
-  border-right-style: solid;
-}
-
-notebook.frame > header.left tabs > tab:first-child, notebook.frame > header.right tabs > tab:first-child {
-  border-top-style: none;
-}
-
-notebook.frame > header.left tabs > tab:last-child, notebook.frame > header.right tabs > tab:last-child {
-  border-bottom-style: solid;
-}
-
 notebook > stack:not(:only-child) {
   background-color: #ffffff;
 }
@@ -5413,7 +5398,7 @@ omnibar.linked > entry:not(:only-child) {
   margin-right: 1px;
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   border-left: none;
 }
 
@@ -5424,7 +5409,7 @@ omnibar.linked > entry:not(:only-child) image, omnibar.linked > entry:not(:only-
 omnibar.linked > entry:not(:only-child):backdrop {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   opacity: 0.65;
 }
 
@@ -5933,28 +5918,18 @@ stack#titlebar_container.titlebar > stack > headerbar {
   border: none;
 }
 
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry {
-  box-shadow: inset 0 0 0 2px transparent;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:hover {
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.03), inset 0 0 0 2px transparent;
-  transition-duration: 200ms;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:focus {
-  box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
-  transition-duration: 300ms;
-}
-
 notebook.main-notebook > header.top {
   margin-top: 0;
 }
 
-notebook.main-notebook > header.top tabs > tab:checked {
+notebook.main-notebook > header.top > tabs > tab:checked {
   border-top-color: #ffffff;
 }
 
+notebook.main-notebook > header.top > tabs > tab:first-child {
+  border-left-width: 0;
+}
+
 stack.view.polari-entry-area {
   background-color: #f5f5f5;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
@@ -6204,7 +6179,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 headerbar.titlebar.incognito-mode entry {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode entry image:hover {
@@ -6229,7 +6204,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 .background headerbar entry.starred, .background headerbar entry.non-starred {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .background headerbar entry.starred image, .background headerbar entry.starred image:hover, .background headerbar entry.non-starred image, .background headerbar entry.non-starred image:hover {
@@ -7303,6 +7278,38 @@ window.background.csd > box.horizontal > stack > box.vertical > notebook > stack
   border-bottom-right-radius: 14px;
 }
 
+toolbar#SubToolBox {
+  min-height: 36px;
+}
+
+toolbar#SubToolBox entry, toolbar#SubToolBox button {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+toolbar#SubToolBox > toolbutton > button.flat, .raven .raven-header:not(.top) toolbar#SubToolBox > toolbutton > button {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+widget#ToolboxCommon button.flat:active, widget#ToolboxCommon .raven .raven-header:not(.top) button:active, .raven .raven-header:not(.top) widget#ToolboxCommon button:active {
+  background-color: rgba(36, 36, 36, 0.25);
+}
+
+widget#ToolboxCommon button.flat:checked, widget#ToolboxCommon .raven .raven-header:not(.top) button:checked, .raven .raven-header:not(.top) widget#ToolboxCommon button:checked {
+  background-color: rgba(36, 36, 36, 0.15);
+}
+
+widget#ToolboxCommon > toolbar > toolbutton > button.flat, .raven .raven-header:not(.top) widget#ToolboxCommon > toolbar > toolbutton > button {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+box#DesktopStatusBar spinbutton, box#DesktopStatusBar button.combo {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
 window > box.vertical > box.horizontal > toolbar {
   background-color: transparent;
   box-shadow: none;
@@ -7613,7 +7620,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
   padding-right: 4px;
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .marlin-pathbar.pathbar image, .marlin-pathbar.pathbar image:hover {
@@ -8692,12 +8699,14 @@ filechooser actionbar button:active, filechooser actionbar button:checked {
 filechooser actionbar entry {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 filechooser actionbar entry:focus {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
+  transition-duration: 300ms;
 }
 
 
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index aacfe224..9c73e0ec 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -204,6 +204,7 @@ spinner:checked:disabled, label:disabled selection:checked {
 entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
   border: none;
 }
 
@@ -211,6 +212,7 @@ entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
+  transition-duration: 300ms;
 }
 
 entry.contacts-postal-entry:disabled, spinbutton entry:disabled, .linked > entry:disabled:not(:only-child) {
@@ -226,6 +228,7 @@ entry {
   caret-color: currentColor;
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 entry.search {
@@ -253,10 +256,18 @@ entry image.right {
   border-radius: 0;
 }
 
+entry:hover {
+  color: #363636;
+  background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 entry:focus {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
+  transition-duration: 300ms;
 }
 
 entry:disabled {
@@ -1095,8 +1106,6 @@ spinbutton:disabled {
 }
 
 spinbutton entry {
-  padding-top: 2px;
-  padding-bottom: 2px;
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
@@ -1116,6 +1125,10 @@ spinbutton:not(.vertical) entry {
   min-width: 28px;
 }
 
+spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry {
+  min-height: 20px;
+}
+
 spinbutton:not(.vertical):dir(ltr) entry, spinbutton:not(.vertical):dir(rtl) button.up {
   border-radius: 6px 0 0 6px;
 }
@@ -1320,25 +1333,6 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
   border-width: 0 0 0 1px;
 }
 
-.inline-toolbar:not(.inline-toolbar) switch,
-.inline-toolbar:not(.inline-toolbar) scale,
-.inline-toolbar:not(.inline-toolbar) entry,
-.inline-toolbar:not(.inline-toolbar) spinbutton,
-.inline-toolbar:not(.inline-toolbar) button, toolbar:not(.inline-toolbar) switch,
-toolbar:not(.inline-toolbar) scale,
-toolbar:not(.inline-toolbar) entry,
-toolbar:not(.inline-toolbar) spinbutton,
-toolbar:not(.inline-toolbar) button {
-  margin-right: 1px;
-  margin-bottom: 1px;
-}
-
-.inline-toolbar:not(.inline-toolbar) .linked > button,
-.inline-toolbar:not(.inline-toolbar) .linked > entry, toolbar:not(.inline-toolbar) .linked > button,
-toolbar:not(.inline-toolbar) .linked > entry {
-  margin-right: 0;
-}
-
 .primary-toolbar:not(.libreoffice-toolbar) {
   color: #363636;
   background-color: transparent;
@@ -1442,7 +1436,7 @@ headerbar stackswitcher.linked.stack-switcher:not(.vertical) > button {
 headerbar .linked:not(.vertical) > entry {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   margin: 8px 3px;
   padding: 0 8px;
   border-radius: 6px;
@@ -1702,7 +1696,7 @@ headerbar entry, .titlebar entry {
   min-height: 22px;
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .nemo-window .primary-toolbar entry image, headerbar entry image, headerbar entry image:hover {
@@ -1714,6 +1708,13 @@ headerbar entry, .titlebar entry {
   background-image: none;
 }
 
+.nemo-window .primary-toolbar entry:hover, headerbar entry:hover {
+  color: #575757;
+  background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), inset 0 0 0 2px transparent;
+  transition-duration: 200ms;
+}
+
 .nemo-window .primary-toolbar entry:focus, headerbar entry:focus {
   background-image: none;
   background-color: rgba(0, 0, 0, 0.05);
@@ -2316,22 +2317,6 @@ notebook.frame {
   border: 1px solid #d6d6d6;
 }
 
-notebook.frame > header.top tabs > tab:first-child, notebook.frame > header.bottom tabs > tab:first-child {
-  border-left-style: none;
-}
-
-notebook.frame > header.top tabs > tab:last-child, notebook.frame > header.bottom tabs > tab:last-child {
-  border-right-style: solid;
-}
-
-notebook.frame > header.left tabs > tab:first-child, notebook.frame > header.right tabs > tab:first-child {
-  border-top-style: none;
-}
-
-notebook.frame > header.left tabs > tab:last-child, notebook.frame > header.right tabs > tab:last-child {
-  border-bottom-style: solid;
-}
-
 notebook > stack:not(:only-child) {
   background-color: #ffffff;
 }
@@ -5413,7 +5398,7 @@ omnibar.linked > entry:not(:only-child) {
   margin-right: 1px;
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   border-left: none;
 }
 
@@ -5424,7 +5409,7 @@ omnibar.linked > entry:not(:only-child) image, omnibar.linked > entry:not(:only-
 omnibar.linked > entry:not(:only-child):backdrop {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
   opacity: 0.65;
 }
 
@@ -5933,28 +5918,18 @@ stack#titlebar_container.titlebar > stack > headerbar {
   border: none;
 }
 
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry {
-  box-shadow: inset 0 0 0 2px transparent;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:hover {
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.03), inset 0 0 0 2px transparent;
-  transition-duration: 200ms;
-}
-
-stack#titlebar_container.titlebar > stack > headerbar entry.suggestion.url_entry:focus {
-  box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
-  transition-duration: 300ms;
-}
-
 notebook.main-notebook > header.top {
   margin-top: 0;
 }
 
-notebook.main-notebook > header.top tabs > tab:checked {
+notebook.main-notebook > header.top > tabs > tab:checked {
   border-top-color: #ffffff;
 }
 
+notebook.main-notebook > header.top > tabs > tab:first-child {
+  border-left-width: 0;
+}
+
 stack.view.polari-entry-area {
   background-color: #f5f5f5;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
@@ -6204,7 +6179,7 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
 headerbar.titlebar.incognito-mode entry {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode entry image:hover {
@@ -6229,7 +6204,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar
 .background headerbar entry.starred, .background headerbar entry.non-starred {
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .background headerbar entry.starred image, .background headerbar entry.starred image:hover, .background headerbar entry.non-starred image, .background headerbar entry.non-starred image:hover {
@@ -7303,6 +7278,38 @@ window.background.csd > box.horizontal > stack > box.vertical > notebook > stack
   border-bottom-right-radius: 14px;
 }
 
+toolbar#SubToolBox {
+  min-height: 36px;
+}
+
+toolbar#SubToolBox entry, toolbar#SubToolBox button {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+toolbar#SubToolBox > toolbutton > button.flat, .raven .raven-header:not(.top) toolbar#SubToolBox > toolbutton > button {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+widget#ToolboxCommon button.flat:active, widget#ToolboxCommon .raven .raven-header:not(.top) button:active, .raven .raven-header:not(.top) widget#ToolboxCommon button:active {
+  background-color: rgba(36, 36, 36, 0.25);
+}
+
+widget#ToolboxCommon button.flat:checked, widget#ToolboxCommon .raven .raven-header:not(.top) button:checked, .raven .raven-header:not(.top) widget#ToolboxCommon button:checked {
+  background-color: rgba(36, 36, 36, 0.15);
+}
+
+widget#ToolboxCommon > toolbar > toolbutton > button.flat, .raven .raven-header:not(.top) widget#ToolboxCommon > toolbar > toolbutton > button {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+box#DesktopStatusBar spinbutton, box#DesktopStatusBar button.combo {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
 window > box.vertical > box.horizontal > toolbar {
   background-color: transparent;
   box-shadow: none;
@@ -7613,7 +7620,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
   padding-right: 4px;
   color: #575757;
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: none;
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 .marlin-pathbar.pathbar image, .marlin-pathbar.pathbar image:hover {
@@ -8692,12 +8699,14 @@ filechooser actionbar button:active, filechooser actionbar button:checked {
 filechooser actionbar entry {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 0 0 2px transparent;
 }
 
 filechooser actionbar entry:focus {
   color: #363636;
   background-color: rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75);
+  transition-duration: 300ms;
 }
 
 
diff --git a/src/main/gtk-3.0/gtk.gresource.xml b/src/main/gtk-3.0/gtk.gresource.xml
index e196d398..9ebf72e9 100644
--- a/src/main/gtk-3.0/gtk.gresource.xml
+++ b/src/main/gtk-3.0/gtk.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/Mcata-theme">
+  <gresource prefix="/org/gnome/theme">
     <file>assets/checkbox-checked.png</file>
     <file>assets/checkbox-checked@2.png</file>
     <file>assets/checkbox-checked-insensitive.png</file>
diff --git a/src/main/gtk-3.0/make_gresource_xml.sh b/src/main/gtk-3.0/make_gresource_xml.sh
index c69322ab..4a928708 100755
--- a/src/main/gtk-3.0/make_gresource_xml.sh
+++ b/src/main/gtk-3.0/make_gresource_xml.sh
@@ -9,7 +9,7 @@ fi
 
 echo '<?xml version="1.0" encoding="UTF-8"?>' >> gtk.gresource.xml
 echo "<gresources>" >> gtk.gresource.xml
-echo '  <gresource prefix="/org/gnome/Mcata-theme">' >> gtk.gresource.xml
+echo '  <gresource prefix="/org/gnome/theme">' >> gtk.gresource.xml
 
 for i in `cat $INDEX`
 do
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index 95738dc3..9d35cb41 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -36,9 +36,9 @@ $wm_radius: 14px;
 $mn_radius: 10px;
 
 // durations
-$shorter_duration: 200ms / 2;
-$longer_duration: 300ms / 2;
-$ripple_duration: 500ms / 2;
+$shorter_duration: 100ms;
+$longer_duration: 150ms;
+$ripple_duration: 250ms;
 
 // timing functions
 $standard_curve: cubic-bezier(0.4, 0.0, 0.2, 1);
@@ -57,11 +57,11 @@ $backdrop_transition: $longer_duration ease-out;
 // Shadow
 $shadow_0: 0 1px 2px 0 rgba(black, 0.1), 0 2px 2px 0 rgba(black, 0.05);     // Slider hover shadow
 $shadow_1: 0 1px 1px 0 rgba(black, 0.12), 0 1px 2px 0 rgba(black, 0.06);    // Header-button shadow
-$shadow_2: 0 1px 1px 0 rgba(black, 0.1), 0 1px 2px 0 rgba(black, 0.05);  // Slider normal shadow
+$shadow_2: 0 1px 1px 0 rgba(black, 0.1), 0 1px 2px 0 rgba(black, 0.05);     // Slider normal shadow
 $shadow_3: 0 1px 1px 0 rgba(black, 0.03), 0 1px 2px 0 rgba(black, 0.01);    // Normal button shadow
 $shadow_4: 0 2px 3px 0 rgba(black, 0.2), 0 3px 5px 0 rgba(black, 0.15);     // Switch-slider hover shadow
 $shadow_5: 0 1px 2px 0 rgba(black, 0.15), 0 2px 3px 0 rgba(black, 0.1);     // Switch-slider normal shadow
 $shadow_6: 0 0 8px rgba(black, 0.2), 0 0 4px rgba(black, 0.3);              // Switch-slider normal shadow
 $text_shadow: 0 -1px rgba(white, 0.04), -1px 0 rgba(black, 0.05),
               1px 0 rgba(black, 0.05), 0 1px rgba(black, 0.3),
-              0 2px rgba(black, 0.05);                                        // text and icon shadow
+              0 2px rgba(black, 0.05);                                      // text and icon shadow
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 444e645e..5498f84e 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -25,10 +25,10 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
 
 
 /* GLOBALS */
-* {
-  // transition-timing-function: $deceleration_curve;
-  transition-duration: $longer_duration;
-}
+// * {
+//   // transition-timing-function: $deceleration_curve;
+//   transition-duration: $longer_duration;
+// }
 
 stage {
   font-family: $font-family;
@@ -63,7 +63,7 @@ StEntry {
   caret-color: $fg_color;
   selection-background-color: $primary_color;
   selected-color: $light_alt_fg_color;
-  @include font(subheading);
+  // @include font(subheading);
   @include entry(normal);
   &:hover { @include entry(hover);}
   &:focus { @include entry(focus);}
@@ -1561,14 +1561,20 @@ $message_bg: if($variant == 'light', #ffffff, #383838);
   border-radius: $bt_radius;
   border: none;
   color: $alt_fg_color;
-  background-color: $message_bg;
+  background-color: transparent;
   margin: 4px;
   box-shadow: none;
   text-shadow: none;
 
-  &:hover, &:focus { color: $fg_color; background-color: $divider_color; }
+  &:hover, &:focus {
+    color: $fg_color;
+    background-color: $message_bg;
+  }
 
-  &:active { color: $fg_color; background-color: $track_color; }
+  &:active {
+    color: $fg_color;
+    background-color: rgba($message_bg, 0.8);
+  }
 
   // icon container
   .message-icon-bin {
@@ -2075,21 +2081,21 @@ StWidget.focused .app-well-app-running-dot {
   background-color: $light_divider_color;
 }
 
-.show-apps .show-apps-icon {
-  color: transparent;
-  background-image: url("assets/startup@2.svg");
-  background-size: contain;
-}
+// .show-apps .show-apps-icon {
+//   color: transparent;
+//   background-image: url("assets/startup@2.svg");
+//   background-size: contain;
+// }
 
 .show-apps .overview-icon {
-  color: transparent;
+  color: $light_fg_color;
 }
 
 .show-apps:hover .show-apps-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .show-apps-icon,
 .show-apps:focus .show-apps-icon {
-  color: transparent;
+  color: $light_fg_color;
   transition-duration: $longer_duration;
 }
 
@@ -2590,12 +2596,18 @@ $login_entry_bg: if($variant == 'dark', rgba(black, 0.1), rgba(white, 0.1));
     StIcon { icon-size: 16px; }
   }
 
-  .caps-lock-warning-label,
   .login-dialog-message-warning {
     color: $light_alt_fg_color;
   }
 }
 
+// Caps-lock warning
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  color: $warning_color;
+}
+
 .login-dialog-logo-bin { padding: 24px 0px; }
 .login-dialog-banner { color: $light_alt_fg_color; }
 .login-dialog-button-box { spacing: 5px; }
@@ -2666,20 +2678,46 @@ $login_entry_bg: if($variant == 'dark', rgba(black, 0.1), rgba(white, 0.1));
   color: $light_alt_fg_color;
 }
 
-.user-widget.horizontal .user-widget-label {
-  // @include font(title);
-  font-weight: bold;
-  text-align: left;
-  padding-left: 15px;
+.user-widget.horizontal {
+  .user-widget-label {
+    // @include font(title);
+    font-weight: bold;
+    text-align: left;
+    padding-left: 15px;
 
-  &:ltr { padding-left: 14px; }
-  &:rtl { padding-right: 14px; }
+    &:ltr { padding-left: 14px; }
+    &:rtl { padding-right: 14px; }
+  }
+
+  .user-icon {
+    icon-size: 64px; // 64px
+
+    & StIcon {
+      padding: 12px; // 12px
+      width: 40px;
+      height: 40px; // 40px;
+    }
+  }
 }
 
-.user-widget.vertical .user-widget-label {
-  text-align: center;
-  font-weight: normal;
-  padding-top: 16px;
+.user-widget.vertical {
+  .user-widget-label {
+    text-align: center;
+    font-weight: normal;
+    padding-top: 16px;
+  }
+
+  .user-icon {
+    icon-size: 96px; // 128px
+
+    & StIcon {
+      padding: 20px; // 20px
+      padding-top: 18px; // 18 px
+      padding-bottom: 22px; // 22px
+      width: 88px;
+      height: 88px; // 88px;
+    }
+  }
 }
 
 .login-dialog-prompt-entry {
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 3bfce930..bc28fe98 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -1468,19 +1468,7 @@ stack#titlebar_container.titlebar {
   > stack > headerbar {
     border: none;
 
-    entry.suggestion.url_entry {
-      box-shadow: inset 0 0 0 2px transparent;
-
-      &:hover {
-        box-shadow: inset 0 0 0 1px rgba($borders_color, 0.03), inset 0 0 0 2px transparent;
-        transition-duration: 200ms;
-      }
-
-      &:focus {
-        box-shadow: inset 0 0 0 2px $entry_highlight;
-        transition-duration: 300ms;
-      }
-    }
+    // entry.suggestion.url_entry {}
   }
 }
 
@@ -1488,10 +1476,14 @@ notebook.main-notebook {
   > header.top {
     margin-top: 0;
 
-    tabs > tab {
+    > tabs > tab {
       &:checked {
         border-top-color: $header_bg;
       }
+
+      &:first-child { //Not use
+        border-left-width: 0;
+      }
     }
   }
 }
@@ -2891,13 +2883,58 @@ window.background.csd {
 }
 
 //
-// Pamac
+// Inkscape
 //
+toolbar#SubToolBox {
+  min-height: 36px;
 
+  // > toolitem#select-x {
+  //   spinbutton {
+  //     entry {
+  //       min-width: 0;
+  //     }
+  //   }
+  // }
 
-// /************
-//  * Synaptic *
-//  ************/
+  entry, button {
+    margin-top: 6px;
+    margin-bottom: 6px;
+  }
+
+  > toolbutton > button.flat {
+    margin-left: 2px;
+    margin-right: 2px;
+  }
+}
+
+widget#ToolboxCommon {
+  button.flat {
+    &:active {
+      background-color: rgba($fg_color, 0.25);
+    }
+
+    &:checked {
+      background-color: rgba($fg_color, 0.15);
+    }
+  }
+
+  // > toolbar > toolitem > button.flat, // Left side
+  > toolbar > toolbutton > button.flat { // Right side
+    margin-top: 2px;
+    margin-bottom: 2px;
+  }
+}
+
+box#DesktopStatusBar {
+  spinbutton, button.combo {
+    margin-top: 6px;
+    margin-bottom: 6px;
+  }
+}
+
+//
+//  Synaptic
+//
 window > box.vertical > box.horizontal {
   > toolbar {
     background-color: transparent;
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index bb5bd6a2..6df5f0cc 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -246,6 +246,10 @@ entry {
     }
   }
 
+  &:hover {
+    @include entry(hover);
+  }
+
   &:focus {
     @include entry(focus);
   }
@@ -897,8 +901,6 @@ spinbutton {
   &:disabled { color: $disabled_fg_color; }
 
   entry {
-    padding-top: 2px;
-    padding-bottom: 2px;
     @extend %Linked_entrys;
     border: 1px solid $borders_color;
 
@@ -922,7 +924,7 @@ spinbutton {
       min-width: 28px;
     }
 
-    button, entry { @extend %linked; }
+    button, entry { @extend %linked; min-height: 20px; }
 
     &:dir(ltr) entry,
     &:dir(rtl) button.up { border-radius: $bt_radius 0 0 $bt_radius; }
@@ -1111,19 +1113,19 @@ combobox {
     &.right { border-width: 0 0 0 1px; }
   }
 
-  &:not(.inline-toolbar) {
-    switch,
-    scale,
-    entry,
-    spinbutton,
-    button {
-      margin-right: 1px;
-      margin-bottom: 1px;
-    }
-
-    .linked > button,
-    .linked > entry { margin-right:0; }
-  }
+  // &:not(.inline-toolbar) {
+  //   switch,
+  //   scale,
+  //   entry,
+  //   spinbutton,
+  //   button {
+  //     margin-right: 1px;
+  //     margin-bottom: 1px;
+  //   }
+  //
+  //   .linked > button,
+  //   .linked > entry { margin-right:0; }
+  // }
 }
 
 .primary-toolbar:not(.libreoffice-toolbar) {  // LO messes up the toolbar styling, so exclude LO toolbars
@@ -1548,6 +1550,10 @@ headerbar, .titlebar {
 
   &:backdrop { opacity: 0.65; background-image: none; }
 
+  &:hover {
+    @include entry(header-hover);
+  }
+
   &:focus {
     @include entry(header-focus);
   }
@@ -2060,24 +2066,6 @@ notebook {
 
   &.frame {
     border: 1px solid $solid_borders_color;
-
-    > header {
-      &.top,
-      &.bottom {
-        tabs > tab {
-          &:first-child { border-left-style: none; }
-          &:last-child { border-right-style: solid; }
-        }
-      }
-
-      &.left,
-      &.right {
-        tabs > tab {
-          &:first-child { border-top-style: none; }
-          &:last-child { border-bottom-style: solid; }
-        }
-      }
-    }
   }
 
   > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
@@ -2219,10 +2207,6 @@ notebook {
       }
     }
 
-    &.top {
-
-    }
-
     tabs > tab {
       color: $disabled_fg_color;
       background-color: transparentize($base_color, 1);
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index ccdca91f..7dbcdb72 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -51,6 +51,17 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
     color: $text_color;
     background-color: $entry_bg;
+    box-shadow: inset 0 0 0 2px transparent;
+  }
+
+  @if $t==hover {
+  //
+  // hover entry
+  //
+    color: $text_color;
+    background-color: $entry_bg;
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05), inset 0 0 0 2px transparent;
+    transition-duration: $shorter_duration * 2;
   }
 
   @if $t==focus {
@@ -60,6 +71,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
     color: $text_color;
     background-color: $entry_bg;
     box-shadow: inset 0 0 0 2px $entry_highlight;
+    transition-duration: $longer_duration * 2;
   }
 
   @if $t==insensitive {
@@ -76,11 +88,21 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
     color: $header_fg;
     background-color: $entry_bg;
-    box-shadow: none;
+    box-shadow: inset 0 0 0 2px transparent;
 
     image, image:hover { color: inherit; }
   }
 
+  @if $t==header-hover {
+  //
+  // header-hover entry
+  //
+    color: $header_fg;
+    background-color: $entry_bg;
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05), inset 0 0 0 2px transparent;
+    transition-duration: $shorter_duration * 2;
+  }
+
   @if $t==header-focus {
   //
   // focused header-bar entry