diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index ccde164..e3f001f 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -1716,8 +1716,8 @@ paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button),
 headerbar button,
 .nemo-window .primary-toolbar button {
   min-width: 22px;
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
-  outline-offset: -3px;
   background-color: rgba(119, 119, 119, 0.6);
   background-image: none;
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1735,6 +1735,7 @@ headerbar button:backdrop,
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:hover:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:hover:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:hover:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:hover:not(.image-button),
 headerbar button:hover,
 .nemo-window .primary-toolbar button:hover {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.9);
   background-image: none;
@@ -1865,8 +1866,8 @@ headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:acti
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button,
 headerbar .linked:not(.vertical).path-bar > button,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
-  outline-offset: -3px;
   background-color: rgba(119, 119, 119, 0.6);
   background-image: none;
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1876,6 +1877,7 @@ headerbar .linked:not(.vertical).path-bar > button,
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
 headerbar .linked:not(.vertical).path-bar > button:hover,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:hover {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.9);
   background-image: none;
@@ -2022,6 +2024,7 @@ headerbar spinbutton:not(.vertical):focus, .nemo-window .primary-toolbar spinbut
 }
 
 headerbar spinbutton:not(.vertical) button, .nemo-window .primary-toolbar spinbutton:not(.vertical) button, headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.9);
   background-image: none;
@@ -4822,6 +4825,7 @@ headerbar button.titlebutton,
 
 headerbar button.titlebutton:hover,
 .titlebar button.titlebutton:hover {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.9);
   background-image: none;
@@ -5141,6 +5145,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 @keyframes needs_attention_keyframes {
   0% {
+    border-color: rgba(255, 255, 255, 0.12);
     color: rgba(221, 213, 213, 0.8);
     background-color: rgba(119, 119, 119, 0.9);
     background-image: none;
@@ -5916,6 +5921,9 @@ window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .l
   -gtk-icon-shadow: none;
 }
 
+/********************
+  * Gnome Calculator *
+  ********************/
 window.background > headerbar.titlebar > button.flat.popup.toggle.text-button.title, window.background > headerbar.titlebar > button.popup.toggle.text-button.title.budgie-menu-launcher, .budgie-panel window.background > headerbar.titlebar > .popup.toggle.text-button.title#tasklist-button, .budgie-panel window.background > headerbar.titlebar > button.popup.toggle.text-button.title.flat.launcher {
   margin: 6px 0;
 }
@@ -5958,6 +5966,9 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   -gtk-icon-shadow: none;
 }
 
+/************
+  * Epiphany *
+  ************/
 headerbar.titlebar.incognito-mode entry {
   border: none;
   color: rgba(225, 219, 219, 0.8);
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 04e3e06..14e034d 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -1716,8 +1716,8 @@ paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button),
 headerbar button,
 .nemo-window .primary-toolbar button {
   min-width: 22px;
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
-  outline-offset: -3px;
   background-color: rgba(119, 119, 119, 0.58);
   background-image: none;
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1735,6 +1735,7 @@ headerbar button:backdrop,
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:hover:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:hover:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:hover:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:hover:not(.image-button),
 headerbar button:hover,
 .nemo-window .primary-toolbar button:hover {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.88);
   background-image: none;
@@ -1865,8 +1866,8 @@ headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:acti
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button,
 headerbar .linked:not(.vertical).path-bar > button,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
-  outline-offset: -3px;
   background-color: rgba(119, 119, 119, 0.58);
   background-image: none;
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1876,6 +1877,7 @@ headerbar .linked:not(.vertical).path-bar > button,
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
 headerbar .linked:not(.vertical).path-bar > button:hover,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:hover {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.88);
   background-image: none;
@@ -2022,6 +2024,7 @@ headerbar spinbutton:not(.vertical):focus, .nemo-window .primary-toolbar spinbut
 }
 
 headerbar spinbutton:not(.vertical) button, .nemo-window .primary-toolbar spinbutton:not(.vertical) button, headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.88);
   background-image: none;
@@ -4822,6 +4825,7 @@ headerbar button.titlebutton,
 
 headerbar button.titlebutton:hover,
 .titlebar button.titlebutton:hover {
+  border-color: rgba(255, 255, 255, 0.12);
   color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.88);
   background-image: none;
@@ -5141,6 +5145,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 @keyframes needs_attention_keyframes {
   0% {
+    border-color: rgba(255, 255, 255, 0.12);
     color: rgba(221, 213, 213, 0.8);
     background-color: rgba(119, 119, 119, 0.88);
     background-image: none;
@@ -5916,6 +5921,9 @@ window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .l
   -gtk-icon-shadow: none;
 }
 
+/********************
+  * Gnome Calculator *
+  ********************/
 window.background > headerbar.titlebar > button.flat.popup.toggle.text-button.title, window.background > headerbar.titlebar > button.popup.toggle.text-button.title.budgie-menu-launcher, .budgie-panel window.background > headerbar.titlebar > .popup.toggle.text-button.title#tasklist-button, .budgie-panel window.background > headerbar.titlebar > button.popup.toggle.text-button.title.flat.launcher {
   margin: 6px 0;
 }
@@ -5958,6 +5966,9 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   -gtk-icon-shadow: none;
 }
 
+/************
+  * Epiphany *
+  ************/
 headerbar.titlebar.incognito-mode entry {
   border: none;
   color: rgba(225, 219, 219, 0.8);
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index 7fd3a2c..b6c2fee 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -1716,8 +1716,8 @@ paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button),
 headerbar button,
 .nemo-window .primary-toolbar button {
   min-width: 22px;
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(40, 32, 32, 0.8);
-  outline-offset: -3px;
   background-color: white;
   background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1734,6 +1734,7 @@ headerbar button:backdrop,
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:hover:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:hover:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:hover:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:hover:not(.image-button),
 headerbar button:hover,
 .nemo-window .primary-toolbar button:hover {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -1798,6 +1799,10 @@ headerbar button:disabled:checked,
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
 }
 
+headerbar button.flat.toggle.popup, .nemo-window .primary-toolbar button.flat.toggle.popup, headerbar button.toggle.popup.budgie-menu-launcher, .nemo-window .primary-toolbar button.toggle.popup.budgie-menu-launcher, headerbar .budgie-panel .toggle.popup#tasklist-button, .budgie-panel headerbar .toggle.popup#tasklist-button, .nemo-window .primary-toolbar .budgie-panel .toggle.popup#tasklist-button, .budgie-panel .nemo-window .primary-toolbar .toggle.popup#tasklist-button, headerbar .budgie-panel button.toggle.popup.flat.launcher, .budgie-panel headerbar button.toggle.popup.flat.launcher {
+  border: 1px solid rgba(0, 0, 0, 0.11);
+}
+
 headerbar.selection-mode button, .nemo-window .selection-mode.primary-toolbar button, headerbar.selection-mode button.flat, .nemo-window .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.budgie-menu-launcher, .nemo-window .selection-mode.primary-toolbar button.budgie-menu-launcher, headerbar.selection-mode .budgie-panel #tasklist-button, .budgie-panel headerbar.selection-mode #tasklist-button, .nemo-window .selection-mode.primary-toolbar .budgie-panel #tasklist-button, .budgie-panel .nemo-window .selection-mode.primary-toolbar #tasklist-button, headerbar.selection-mode .budgie-panel button.flat.launcher, .budgie-panel headerbar.selection-mode button.flat.launcher {
   border-color: transparent;
   background-color: transparent;
@@ -1870,8 +1875,8 @@ headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:acti
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button,
 headerbar .linked:not(.vertical).path-bar > button,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(40, 32, 32, 0.8);
-  outline-offset: -3px;
   background-color: white;
   background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1880,6 +1885,7 @@ headerbar .linked:not(.vertical).path-bar > button,
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
 headerbar .linked:not(.vertical).path-bar > button:hover,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:hover {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -2038,6 +2044,7 @@ headerbar spinbutton:not(.vertical):focus, .nemo-window .primary-toolbar spinbut
 }
 
 headerbar spinbutton:not(.vertical) button, .nemo-window .primary-toolbar spinbutton:not(.vertical) button, headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -4842,6 +4849,7 @@ headerbar button.titlebutton,
 
 headerbar button.titlebutton:hover,
 .titlebar button.titlebutton:hover {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -5161,6 +5169,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 @keyframes needs_attention_keyframes {
   0% {
+    border-color: rgba(0, 0, 0, 0.11);
     color: rgba(34, 28, 28, 0.8);
     background-color: #fafafa;
     background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -5411,10 +5420,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   box-shadow: 0px 1px 2px 0px rgba(16, 16, 16, 0.15), 0px 2px 3px 0px rgba(16, 16, 16, 0.1);
 }
 
-paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:not(.image-button) {
-  border: 1px solid rgba(0, 0, 0, 0.11);
-}
-
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button) box > .title, paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:not(.image-button) box > .title, paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:not(.image-button) box > .title, .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:not(.image-button) box > .title {
   padding: 0;
   margin: -2px 0;
@@ -5941,6 +5946,9 @@ window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .l
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
 }
 
+/********************
+  * Gnome Calculator *
+  ********************/
 window.background > headerbar.titlebar > button.flat.popup.toggle.text-button.title, window.background > headerbar.titlebar > button.popup.toggle.text-button.title.budgie-menu-launcher, .budgie-panel window.background > headerbar.titlebar > .popup.toggle.text-button.title#tasklist-button, .budgie-panel window.background > headerbar.titlebar > button.popup.toggle.text-button.title.flat.launcher {
   margin: 6px 0;
 }
@@ -5983,6 +5991,9 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
 }
 
+/************
+  * Epiphany *
+  ************/
 headerbar.titlebar.incognito-mode entry {
   color: rgba(40, 32, 32, 0.8);
   background-color: white;
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 50c449b..806e838 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -1716,8 +1716,8 @@ paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button),
 headerbar button,
 .nemo-window .primary-toolbar button {
   min-width: 22px;
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(40, 32, 32, 0.8);
-  outline-offset: -3px;
   background-color: white;
   background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1734,6 +1734,7 @@ headerbar button:backdrop,
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:hover:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:hover:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:hover:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:hover:not(.image-button),
 headerbar button:hover,
 .nemo-window .primary-toolbar button:hover {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -1798,6 +1799,10 @@ headerbar button:disabled:checked,
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
 }
 
+headerbar button.flat.toggle.popup, .nemo-window .primary-toolbar button.flat.toggle.popup, headerbar button.toggle.popup.budgie-menu-launcher, .nemo-window .primary-toolbar button.toggle.popup.budgie-menu-launcher, headerbar .budgie-panel .toggle.popup#tasklist-button, .budgie-panel headerbar .toggle.popup#tasklist-button, .nemo-window .primary-toolbar .budgie-panel .toggle.popup#tasklist-button, .budgie-panel .nemo-window .primary-toolbar .toggle.popup#tasklist-button, headerbar .budgie-panel button.toggle.popup.flat.launcher, .budgie-panel headerbar button.toggle.popup.flat.launcher {
+  border: 1px solid rgba(0, 0, 0, 0.11);
+}
+
 headerbar.selection-mode button, .nemo-window .selection-mode.primary-toolbar button, headerbar.selection-mode button.flat, .nemo-window .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.budgie-menu-launcher, .nemo-window .selection-mode.primary-toolbar button.budgie-menu-launcher, headerbar.selection-mode .budgie-panel #tasklist-button, .budgie-panel headerbar.selection-mode #tasklist-button, .nemo-window .selection-mode.primary-toolbar .budgie-panel #tasklist-button, .budgie-panel .nemo-window .selection-mode.primary-toolbar #tasklist-button, headerbar.selection-mode .budgie-panel button.flat.launcher, .budgie-panel headerbar.selection-mode button.flat.launcher {
   border-color: transparent;
   background-color: transparent;
@@ -1870,8 +1875,8 @@ headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:acti
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button,
 headerbar .linked:not(.vertical).path-bar > button,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(40, 32, 32, 0.8);
-  outline-offset: -3px;
   background-color: white;
   background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
   box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
@@ -1880,6 +1885,7 @@ headerbar .linked:not(.vertical).path-bar > button,
 headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
 headerbar .linked:not(.vertical).path-bar > button:hover,
 .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:hover {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -2038,6 +2044,7 @@ headerbar spinbutton:not(.vertical):focus, .nemo-window .primary-toolbar spinbut
 }
 
 headerbar spinbutton:not(.vertical) button, .nemo-window .primary-toolbar spinbutton:not(.vertical) button, headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -4842,6 +4849,7 @@ headerbar button.titlebutton,
 
 headerbar button.titlebutton:hover,
 .titlebar button.titlebutton:hover {
+  border-color: rgba(0, 0, 0, 0.11);
   color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
   background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -5161,6 +5169,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 @keyframes needs_attention_keyframes {
   0% {
+    border-color: rgba(0, 0, 0, 0.11);
     color: rgba(34, 28, 28, 0.8);
     background-color: #fafafa;
     background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
@@ -5411,10 +5420,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   box-shadow: 0px 1px 2px 0px rgba(16, 16, 16, 0.15), 0px 2px 3px 0px rgba(16, 16, 16, 0.1);
 }
 
-paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:not(.image-button) {
-  border: 1px solid rgba(0, 0, 0, 0.11);
-}
-
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:not(.image-button) box > .title, paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:not(.image-button) box > .title, paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:not(.image-button) box > .title, .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:not(.image-button) box > .title {
   padding: 0;
   margin: -2px 0;
@@ -5941,6 +5946,9 @@ window.background > box.vertical > .primary-toolbar.inline-toolbar toolitem > .l
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
 }
 
+/********************
+  * Gnome Calculator *
+  ********************/
 window.background > headerbar.titlebar > button.flat.popup.toggle.text-button.title, window.background > headerbar.titlebar > button.popup.toggle.text-button.title.budgie-menu-launcher, .budgie-panel window.background > headerbar.titlebar > .popup.toggle.text-button.title#tasklist-button, .budgie-panel window.background > headerbar.titlebar > button.popup.toggle.text-button.title.flat.launcher {
   margin: 6px 0;
 }
@@ -5983,6 +5991,9 @@ window.background > grid.vertical > box.vertical grid.math-buttons button:not(.s
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
 }
 
+/************
+  * Epiphany *
+  ************/
 headerbar.titlebar.incognito-mode entry {
   color: rgba(40, 32, 32, 0.8);
   background-color: white;
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index f4a12ac..fdf5d6f 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -403,7 +403,6 @@ paned.titlebar.horizontal {
   headerbar {
     button.flat.toggle.popup:not(.image-button) { // left-pane header button
       @extend %headerbar_buttons;
-      @if $variant == 'light' { border: 1px solid $borders_color; }
 
       box > .title {
         padding: 0; // remove lateral padding
@@ -986,9 +985,9 @@ window.background > box.vertical > toolbar.primary-toolbar {
   }
 }
 
-// /********************
-//  * Gnome-Calculator *
-//  ********************/
+ /********************
+  * Gnome Calculator *
+  ********************/
 
 window.background {
   > headerbar.titlebar { // mode-selector button
@@ -1022,9 +1021,9 @@ window.background {
   }
 }
 
-// /************
-//  * Epiphany *
-//  ************/
+ /************
+  * Epiphany *
+  ************/
 
 $question_bg_color: #FFEA00;
 
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 2662fde..57caeea 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -1376,6 +1376,8 @@ headerbar {
 //    &.text-button.image-button label { padding-left: 6px; padding-right: 6px; }
   }
 
+  button.flat.toggle.popup { @if $variant == 'light' { border: 1px solid $borders_color; } }
+
   &.selection-mode button {
 
     &, &.flat {
diff --git a/src/gtk-3.0/sass/_drawing.scss b/src/gtk-3.0/sass/_drawing.scss
index b1584c9..d64d79a 100644
--- a/src/gtk-3.0/sass/_drawing.scss
+++ b/src/gtk-3.0/sass/_drawing.scss
@@ -286,8 +286,8 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
   // normal header-bar button
   //
+    border-color: $borders_color;
     color: $header_fg;
-    outline-offset: -3px;
     background-color: $header_button_bg;
     background-image: if($variant=='light', linear-gradient( 0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%), none);
     box-shadow: $shadow_3;
@@ -300,6 +300,7 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
   // hovered header-bar button
   //
+    border-color: $borders_color;
     color: darken($header_fg, 2%);
     background-color: $header_button_hover_bg;
     background-image: if($variant=='light', linear-gradient( 0deg, #f8f8f8 0%, #ffffff 100%), none);