fix header-bar comboboxes

14 files changed, 252 insertions, 12 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 6ce7ac3..2446e4e 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -1276,6 +1276,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 0ce2e76..41bb058 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -1276,6 +1276,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index e73b850..f7eb6fd 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -1276,6 +1276,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index 5fca89f..d6b78d7 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -1276,6 +1276,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index cfc638c..063c06f 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -1276,6 +1276,22 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(82, 93, 118, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(82, 93, 118, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 58ac33c..f6c1ffc 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -1276,6 +1276,22 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(82, 93, 118, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(82, 93, 118, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 6a7ed8a..ff8a53c 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -1324,6 +1324,27 @@ GtkComboBox {
       &:hover { @include entry(header-focus); box-shadow: none; }
       &:insensitive { @include entry(header-insensitive); }
     }
+    &.combobox-entry .entry {
+      &:dir(ltr) {
+        &:focus { box-shadow: none; }
+      }
+      &:dir(rtl) {
+        &:focus { box-shadow: none; }
+      }
+    }
+    &.combobox-entry .button {
+
+      &:dir(ltr) {
+        box-shadow: inset  1px 0 $header_button_border;
+
+        &:insensitive { box-shadow: inset 1px 0 transparentize($header_button_border, 0.45); }
+      }
+      &:dir(rtl) {
+        box-shadow: inset -1px 0 $header_button_border;
+
+        &:insensitive { box-shadow: inset -1px 0 transparentize($header_button_border, 0.45); }
+      }
+    }
   }
 
   // Header-bar Switches
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 632aa7d..54914f7 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -1275,6 +1275,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
@@ -2998,9 +3014,10 @@ EphyWindow .floating-bar {
   margin: 2px;
   padding: 4px; }
   .documents-entry-tag:hover {
-    background-color: #639fe5;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #639fe5; }
   .documents-entry-tag:active {
+    color: #ffffff;
     background-color: #4189df; }
   .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button {
     background: none;
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 374ba50..e60fd79 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -1275,6 +1275,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
@@ -2998,9 +3014,10 @@ EphyWindow .floating-bar {
   margin: 2px;
   padding: 4px; }
   .documents-entry-tag:hover {
-    background-color: #639fe5;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #639fe5; }
   .documents-entry-tag:active {
+    color: #ffffff;
     background-color: #4189df; }
   .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button {
     background: none;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index a8c897e..1ac520a 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -1275,6 +1275,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
@@ -2998,9 +3014,10 @@ EphyWindow .floating-bar {
   margin: 2px;
   padding: 4px; }
   .documents-entry-tag:hover {
-    background-color: #639fe5;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #639fe5; }
   .documents-entry-tag:active {
+    color: #ffffff;
     background-color: #4189df; }
   .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button {
     background: none;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index d41c66a..74d2fc0 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -1275,6 +1275,22 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
@@ -2998,9 +3014,10 @@ EphyWindow .floating-bar {
   margin: 2px;
   padding: 4px; }
   .documents-entry-tag:hover {
-    background-color: #639fe5;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #639fe5; }
   .documents-entry-tag:active {
+    color: #ffffff;
     background-color: #4189df; }
   .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button {
     background: none;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index de1d2ca..18abdb6 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -1275,6 +1275,22 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(82, 93, 118, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(82, 93, 118, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
@@ -2998,9 +3014,10 @@ EphyWindow .floating-bar {
   margin: 2px;
   padding: 4px; }
   .documents-entry-tag:hover {
-    background-color: #639fe5;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #639fe5; }
   .documents-entry-tag:active {
+    color: #ffffff;
     background-color: #4189df; }
   .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button {
     background: none;
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index c6623df..a1eacd8 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -1275,6 +1275,22 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+  box-shadow: none; }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+    box-shadow: inset 1px 0 rgba(82, 93, 118, 0); }
+
+.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+    box-shadow: inset -1px 0 rgba(82, 93, 118, 0); }
+
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
 
@@ -2998,9 +3014,10 @@ EphyWindow .floating-bar {
   margin: 2px;
   padding: 4px; }
   .documents-entry-tag:hover {
-    background-color: #639fe5;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #639fe5; }
   .documents-entry-tag:active {
+    color: #ffffff;
     background-color: #4189df; }
   .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button {
     background: none;
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index ae6da28..4ceb343 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -1333,6 +1333,27 @@ GtkComboBox {
       &:hover { @include entry(header-focus); box-shadow: none; }
       &:insensitive { @include entry(header-insensitive); }
     }
+    &.combobox-entry .entry {
+      &:dir(ltr) {
+        &:focus { box-shadow: none; }
+      }
+      &:dir(rtl) {
+        &:focus { box-shadow: none; }
+      }
+    }
+    &.combobox-entry .button {
+
+      &:dir(ltr) {
+        box-shadow: inset  1px 0 $header_button_border;
+
+        &:insensitive { box-shadow: inset 1px 0 transparentize($header_button_border, 0.45); }
+      }
+      &:dir(rtl) {
+        box-shadow: inset -1px 0 $header_button_border;
+
+        &:insensitive { box-shadow: inset -1px 0 transparentize($header_button_border, 0.45); }
+      }
+    }
   }
 
   // Header-bar Switches