diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 1de0e5f..ddc2c88 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -188,7 +188,7 @@ entry {
       color: #FC4138; }
   entry:drop(active):focus, entry:drop(active) {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   .osd entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.35);
@@ -297,7 +297,7 @@ button {
   button:drop(active), combobox:drop(active) button.combo {
     color: #4e9a06;
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   button.osd {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
@@ -510,6 +510,15 @@ button {
 .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #2b2e39; }
 
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #2b2e39; }
+
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #2b2e39; }
@@ -578,6 +587,15 @@ button {
 .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-top-color: #2b2e39; }
 
+.linked.vertical > entry + entry:drop(active):not(:last-child),
+.linked.vertical > entry + entry:drop(active):last-child {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > entry:drop(active):not(:only-child) + entry,
+.linked.vertical > entry:drop(active):not(:only-child) + button,
+.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-top-color: #2b2e39; }
+
 .linked.vertical > entry + entry.warning:focus:not(:last-child),
 .linked.vertical > entry + entry.warning:focus:last-child {
   border-top-color: #2b2e39; }
@@ -727,6 +745,9 @@ modelbutton.flat arrow.right {
 button:link > label, button:visited > label {
   text-decoration-line: underline; }
 
+spinbutton:drop(active) {
+  box-shadow: none; }
+
 spinbutton button:active {
   color: #ffffff; }
 
@@ -755,6 +776,9 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover {
 spinbutton:not(.vertical) > entry:focus + button {
   border-left-color: #2b2e39; }
 
+spinbutton:not(.vertical) > entry:drop(active) + button {
+  border-left-color: #4e9a06; }
+
 spinbutton.vertical button, spinbutton.vertical entry {
   padding-left: 4px;
   padding-right: 4px;
@@ -766,6 +790,9 @@ spinbutton.vertical button.up {
 spinbutton.vertical > entry:focus + button {
   border-top-color: #2b2e39; }
 
+spinbutton.vertical > entry:drop(active) + button {
+  border-top-color: #4e9a06; }
+
 combobox button.combo {
   min-width: 0;
   padding-left: 8px;
@@ -1099,6 +1126,12 @@ headerbar entry, headerbar button, headerbar separator {
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
@@ -2717,7 +2750,6 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima
 
 *:drop(active):focus,
 *:drop(active) {
-  border-color: #4e9a06;
   box-shadow: inset 0 0 0 1px #4e9a06; }
 
 decoration {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index bf6827c..bdf2c26 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -187,7 +187,7 @@ entry {
       color: #FC4138; }
   entry:drop(active):focus, entry:drop(active) {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   .osd entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.35);
@@ -296,7 +296,7 @@ button {
   button:drop(active), combobox:drop(active) button.combo {
     color: #4e9a06;
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   button.osd {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
@@ -509,6 +509,15 @@ button {
 .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #5294E2; }
 
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #4e9a06; }
+
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #4e9a06; }
+
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #F27835; }
@@ -577,6 +586,15 @@ button {
 .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry:drop(active):not(:last-child),
+.linked.vertical > entry + entry:drop(active):last-child {
+  border-top-color: #4e9a06; }
+
+.linked.vertical > entry:drop(active):not(:only-child) + entry,
+.linked.vertical > entry:drop(active):not(:only-child) + button,
+.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-top-color: #4e9a06; }
+
 .linked.vertical > entry + entry.warning:focus:not(:last-child),
 .linked.vertical > entry + entry.warning:focus:last-child {
   border-top-color: #F27835; }
@@ -726,6 +744,9 @@ modelbutton.flat arrow.right {
 button:link > label, button:visited > label {
   text-decoration-line: underline; }
 
+spinbutton:drop(active) {
+  box-shadow: none; }
+
 spinbutton button:active {
   color: #ffffff; }
 
@@ -754,6 +775,9 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover {
 spinbutton:not(.vertical) > entry:focus + button {
   border-left-color: #5294E2; }
 
+spinbutton:not(.vertical) > entry:drop(active) + button {
+  border-left-color: #4e9a06; }
+
 spinbutton.vertical button, spinbutton.vertical entry {
   padding-left: 4px;
   padding-right: 4px;
@@ -765,6 +789,9 @@ spinbutton.vertical button.up {
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
+spinbutton.vertical > entry:drop(active) + button {
+  border-top-color: #4e9a06; }
+
 combobox button.combo {
   min-width: 0;
   padding-left: 8px;
@@ -1098,6 +1125,12 @@ headerbar entry, headerbar button, headerbar separator {
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
@@ -2716,7 +2749,6 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima
 
 *:drop(active):focus,
 *:drop(active) {
-  border-color: #4e9a06;
   box-shadow: inset 0 0 0 1px #4e9a06; }
 
 decoration {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index bdf2752..6f99b87 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -188,7 +188,7 @@ entry {
       color: #FC4138; }
   entry:drop(active):focus, entry:drop(active) {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   .osd entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.4);
@@ -297,7 +297,7 @@ button {
   button:drop(active), combobox:drop(active) button.combo {
     color: #4e9a06;
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   button.osd {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
@@ -510,6 +510,15 @@ button {
 .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #2b2e39; }
 
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #2b2e39; }
+
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #2b2e39; }
@@ -578,6 +587,15 @@ button {
 .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-top-color: #2b2e39; }
 
+.linked.vertical > entry + entry:drop(active):not(:last-child),
+.linked.vertical > entry + entry:drop(active):last-child {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > entry:drop(active):not(:only-child) + entry,
+.linked.vertical > entry:drop(active):not(:only-child) + button,
+.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-top-color: #2b2e39; }
+
 .linked.vertical > entry + entry.warning:focus:not(:last-child),
 .linked.vertical > entry + entry.warning:focus:last-child {
   border-top-color: #2b2e39; }
@@ -727,6 +745,9 @@ modelbutton.flat arrow.right {
 button:link > label, button:visited > label {
   text-decoration-line: underline; }
 
+spinbutton:drop(active) {
+  box-shadow: none; }
+
 spinbutton button:active {
   color: #ffffff; }
 
@@ -755,6 +776,9 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover {
 spinbutton:not(.vertical) > entry:focus + button {
   border-left-color: #2b2e39; }
 
+spinbutton:not(.vertical) > entry:drop(active) + button {
+  border-left-color: #4e9a06; }
+
 spinbutton.vertical button, spinbutton.vertical entry {
   padding-left: 4px;
   padding-right: 4px;
@@ -766,6 +790,9 @@ spinbutton.vertical button.up {
 spinbutton.vertical > entry:focus + button {
   border-top-color: #2b2e39; }
 
+spinbutton.vertical > entry:drop(active) + button {
+  border-top-color: #4e9a06; }
+
 combobox button.combo {
   min-width: 0;
   padding-left: 8px;
@@ -1099,6 +1126,12 @@ headerbar entry, headerbar button, headerbar separator {
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
@@ -2717,7 +2750,6 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima
 
 *:drop(active):focus,
 *:drop(active) {
-  border-color: #4e9a06;
   box-shadow: inset 0 0 0 1px #4e9a06; }
 
 decoration {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 1ecda5d..388a371 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -187,7 +187,7 @@ entry {
       color: #FC4138; }
   entry:drop(active):focus, entry:drop(active) {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   .osd entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.4);
@@ -296,7 +296,7 @@ button {
   button:drop(active), combobox:drop(active) button.combo {
     color: #4e9a06;
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   button.osd {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
@@ -509,6 +509,15 @@ button {
 .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #5294E2; }
 
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #4e9a06; }
+
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #4e9a06; }
+
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #F27835; }
@@ -577,6 +586,15 @@ button {
 .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry:drop(active):not(:last-child),
+.linked.vertical > entry + entry:drop(active):last-child {
+  border-top-color: #4e9a06; }
+
+.linked.vertical > entry:drop(active):not(:only-child) + entry,
+.linked.vertical > entry:drop(active):not(:only-child) + button,
+.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-top-color: #4e9a06; }
+
 .linked.vertical > entry + entry.warning:focus:not(:last-child),
 .linked.vertical > entry + entry.warning:focus:last-child {
   border-top-color: #F27835; }
@@ -726,6 +744,9 @@ modelbutton.flat arrow.right {
 button:link > label, button:visited > label {
   text-decoration-line: underline; }
 
+spinbutton:drop(active) {
+  box-shadow: none; }
+
 spinbutton button:active {
   color: #ffffff; }
 
@@ -754,6 +775,9 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover {
 spinbutton:not(.vertical) > entry:focus + button {
   border-left-color: #5294E2; }
 
+spinbutton:not(.vertical) > entry:drop(active) + button {
+  border-left-color: #4e9a06; }
+
 spinbutton.vertical button, spinbutton.vertical entry {
   padding-left: 4px;
   padding-right: 4px;
@@ -765,6 +789,9 @@ spinbutton.vertical button.up {
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
+spinbutton.vertical > entry:drop(active) + button {
+  border-top-color: #4e9a06; }
+
 combobox button.combo {
   min-width: 0;
   padding-left: 8px;
@@ -1098,6 +1125,12 @@ headerbar entry, headerbar button, headerbar separator {
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
@@ -2716,7 +2749,6 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima
 
 *:drop(active):focus,
 *:drop(active) {
-  border-color: #4e9a06;
   box-shadow: inset 0 0 0 1px #4e9a06; }
 
 decoration {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 1b3301d..8598659 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -187,7 +187,7 @@ entry {
       color: #FC4138; }
   entry:drop(active):focus, entry:drop(active) {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   .osd entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.4);
@@ -296,7 +296,7 @@ button {
   button:drop(active), combobox:drop(active) button.combo {
     color: #4e9a06;
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   button.osd {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
@@ -509,6 +509,15 @@ button {
 .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #5294E2; }
 
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #4e9a06; }
+
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #4e9a06; }
+
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #F27835; }
@@ -577,6 +586,15 @@ button {
 .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry:drop(active):not(:last-child),
+.linked.vertical > entry + entry:drop(active):last-child {
+  border-top-color: #4e9a06; }
+
+.linked.vertical > entry:drop(active):not(:only-child) + entry,
+.linked.vertical > entry:drop(active):not(:only-child) + button,
+.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-top-color: #4e9a06; }
+
 .linked.vertical > entry + entry.warning:focus:not(:last-child),
 .linked.vertical > entry + entry.warning:focus:last-child {
   border-top-color: #F27835; }
@@ -726,6 +744,9 @@ modelbutton.flat arrow.right {
 button:link > label, button:visited > label {
   text-decoration-line: underline; }
 
+spinbutton:drop(active) {
+  box-shadow: none; }
+
 spinbutton button:active {
   color: #ffffff; }
 
@@ -754,6 +775,9 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover {
 spinbutton:not(.vertical) > entry:focus + button {
   border-left-color: #5294E2; }
 
+spinbutton:not(.vertical) > entry:drop(active) + button {
+  border-left-color: #4e9a06; }
+
 spinbutton.vertical button, spinbutton.vertical entry {
   padding-left: 4px;
   padding-right: 4px;
@@ -765,6 +789,9 @@ spinbutton.vertical button.up {
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
+spinbutton.vertical > entry:drop(active) + button {
+  border-top-color: #4e9a06; }
+
 combobox button.combo {
   min-width: 0;
   padding-left: 8px;
@@ -1098,6 +1125,12 @@ headerbar entry, headerbar button, headerbar separator {
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #5294E2; }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #4e9a06; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #4e9a06; }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #F27835; }
 
@@ -2720,7 +2753,6 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima
 
 *:drop(active):focus,
 *:drop(active) {
-  border-color: #4e9a06;
   box-shadow: inset 0 0 0 1px #4e9a06; }
 
 decoration {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 37523cd..d734bf2 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -187,7 +187,7 @@ entry {
       color: #FC4138; }
   entry:drop(active):focus, entry:drop(active) {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   .osd entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.35);
@@ -296,7 +296,7 @@ button {
   button:drop(active), combobox:drop(active) button.combo {
     color: #4e9a06;
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 1px #4e9a06; }
+    box-shadow: none; }
   button.osd {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
@@ -509,6 +509,15 @@ button {
 .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #5294E2; }
 
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #4e9a06; }
+
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #4e9a06; }
+
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child),
 .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #F27835; }
@@ -577,6 +586,15 @@ button {
 .linked.vertical > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry:drop(active):not(:last-child),
+.linked.vertical > entry + entry:drop(active):last-child {
+  border-top-color: #4e9a06; }
+
+.linked.vertical > entry:drop(active):not(:only-child) + entry,
+.linked.vertical > entry:drop(active):not(:only-child) + button,
+.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-top-color: #4e9a06; }
+
 .linked.vertical > entry + entry.warning:focus:not(:last-child),
 .linked.vertical > entry + entry.warning:focus:last-child {
   border-top-color: #F27835; }
@@ -726,6 +744,9 @@ modelbutton.flat arrow.right {
 button:link > label, button:visited > label {
   text-decoration-line: underline; }
 
+spinbutton:drop(active) {
+  box-shadow: none; }
+
 spinbutton button:active {
   color: #ffffff; }
 
@@ -754,6 +775,9 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover {
 spinbutton:not(.vertical) > entry:focus + button {
   border-left-color: #5294E2; }
 
+spinbutton:not(.vertical) > entry:drop(active) + button {
+  border-left-color: #4e9a06; }
+
 spinbutton.vertical button, spinbutton.vertical entry {
   padding-left: 4px;
   padding-right: 4px;
@@ -765,6 +789,9 @@ spinbutton.vertical button.up {
 spinbutton.vertical > entry:focus + button {
   border-top-color: #5294E2; }
 
+spinbutton.vertical > entry:drop(active) + button {
+  border-top-color: #4e9a06; }
+
 combobox button.combo {
   min-width: 0;
   padding-left: 8px;
@@ -1098,6 +1125,12 @@ headerbar entry, headerbar button, headerbar separator {
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
   border-left-color: #5294E2; }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:drop(active):last-child {
+  border-left-color: #4e9a06; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) + combobox > box > button.combo {
+  border-left-color: #4e9a06; }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child {
   border-left-color: #F27835; }
 
@@ -2720,7 +2753,6 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima
 
 *:drop(active):focus,
 *:drop(active) {
-  border-color: #4e9a06;
   box-shadow: inset 0 0 0 1px #4e9a06; }
 
 decoration {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 06e7cfa..4e406d7 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -253,7 +253,7 @@ entry {
   &:drop(active) {
     &:focus, & {
       border-color: $drop_target_color;
-      box-shadow: inset 0 0 0 1px $drop_target_color;
+      box-shadow: none;
     }
   }
 
@@ -396,7 +396,7 @@ button {
   &:drop(active) {
     color: $drop_target_color;
     border-color: $drop_target_color;
-    box-shadow: inset 0 0 0 1px $drop_target_color;
+    box-shadow: none;
   }
 
   // big standalone buttons like in Documents pager
@@ -579,14 +579,15 @@ toolbar.inline-toolbar toolbutton {
 
     > entry.error + entry.warning { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a));}
 
-    @each $e_type, $e_color in ('',$selected_bg_color),
-                               ('.warning', $warning_color),
-                               ('.error', $error_color) {
+    @each $e_type, $e_color in (':focus',$selected_bg_color),
+                               (':drop(active)', $drop_target_color),
+                               ('.warning:focus', $warning_color),
+                               ('.error:focus', $error_color) {
 
-      > entry + entry#{$e_type}:focus:not(:last-child),
-      > entry + entry#{$e_type}:focus:last-child { border-#{$_border}-color: if($var=='light', $e_color, $e_border); }
+      > entry + entry#{$e_type}:not(:last-child),
+      > entry + entry#{$e_type}:last-child { border-#{$_border}-color: if($var=='light', $e_color, $e_border); }
 
-      > entry#{$e_type}:focus:not(:only-child) {
+      > entry#{$e_type}:not(:only-child) {
         + entry,
         + button,
         + combobox > box > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); }
@@ -751,6 +752,8 @@ button:link, button:visited {
 //
 spinbutton {
 
+  &:drop(active) { box-shadow: none; }
+
   button:active { color: $selected_fg_color; }
   &:disabled { color: $insensitive_fg_color; }
 
@@ -772,6 +775,8 @@ spinbutton {
     > entry + button:not(:active):hover { box-shadow: none; }
 
     > entry:focus + button { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+    > entry:drop(active) + button { border-left-color: $drop_target_color; }
   }
   &.vertical {
     button, entry {
@@ -785,6 +790,8 @@ spinbutton {
     button.up { border-radius: 3px 3px 0 0; }
 
     > entry:focus + button { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+    > entry:drop(active) + button { border-top-color: $drop_target_color; }
   }
 }
 
@@ -2936,7 +2943,6 @@ stackswitcher button {
 //
 *:drop(active):focus,
 *:drop(active) {
-  border-color: $drop_target_color;
   box-shadow: inset 0 0 0 1px $drop_target_color;
 }