diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 37c55bf..5bb2f12 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1055,6 +1055,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar:not(.libreoffice-toolbar) entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .primary-toolbar:not(.libreoffice-toolbar) entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1300,6 +1301,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
 
 .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -3570,6 +3572,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 25a0378..ad1f2c9 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar:not(.libreoffice-toolbar) entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .primary-toolbar:not(.libreoffice-toolbar) entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1299,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
 
 .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -3569,6 +3571,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.37);
     background-color: rgba(95, 105, 127, 0.22); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
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 9b76d49..bbe5c00 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1055,6 +1055,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar:not(.libreoffice-toolbar) entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .primary-toolbar:not(.libreoffice-toolbar) entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1300,6 +1301,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
 
 .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -3570,6 +3572,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
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 4866dab..bcfd6d4 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar:not(.libreoffice-toolbar) entry:disabled, headerbar entry:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .primary-toolbar:not(.libreoffice-toolbar) entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1299,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
 
 .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -3569,6 +3571,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(207, 218, 231, 0.35);
+    border-color: rgba(21, 23, 28, 0.4);
     background-color: rgba(95, 105, 127, 0.25); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index a3a00f3..6153a58 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar:not(.libreoffice-toolbar) entry:disabled, headerbar entry:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .primary-toolbar:not(.libreoffice-toolbar) entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1299,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
 
 .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -3573,6 +3575,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 85cc5a3..40bd3e3 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1054,6 +1054,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       color: #ffffff; }
   .primary-toolbar:not(.libreoffice-toolbar) entry:disabled, headerbar entry:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .primary-toolbar:not(.libreoffice-toolbar) entry selection:focus, headerbar entry selection:focus {
     background-color: #ffffff;
@@ -1299,6 +1300,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
     box-shadow: none; }
   .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
 
 .primary-toolbar:not(.libreoffice-toolbar) combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) {
@@ -3573,6 +3575,7 @@ panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel butto
     background-color: #5294e2; }
   .marlin-pathbar.pathbar:disabled {
     color: rgba(82, 93, 118, 0.35);
+    border-color: rgba(82, 93, 118, 0.1);
     background-color: rgba(255, 255, 255, 0.75); }
   .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked {
     color: #5294e2; }
diff --git a/common/gtk-3.0/3.20/sass/_drawing.scss b/common/gtk-3.0/3.20/sass/_drawing.scss
index 1f41ddf..120a158 100644
--- a/common/gtk-3.0/3.20/sass/_drawing.scss
+++ b/common/gtk-3.0/3.20/sass/_drawing.scss
@@ -74,6 +74,7 @@
   // insensitive header-bar entry
   //
     color: transparentize($header_fg, 0.45);
+    border-color: $header_entry_border;
     background-color: transparentize($header_entry_bg, 0.15);
   }