remove custom combobox style

14 files changed, 214 insertions, 238 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 c9d01a8..824f097 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -857,26 +857,22 @@ GtkComboBox {
     color: rgba(211, 218, 227, 0.45); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(211, 218, 227, 0.6);
-    background-color: #2b2e39;
-    border-color: #2b2e39; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #363a47;
-      border-color: #363a47; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8b98b0;
-      background-color: #8b98b0;
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); }
 
 /************
  * Toolbars *
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 f3852bd..ccbfdc0 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -857,26 +857,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
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 ce47778..4c6cc87 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
@@ -857,26 +857,22 @@ GtkComboBox {
     color: rgba(211, 218, 227, 0.45); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(211, 218, 227, 0.6);
-    background-color: #2b2e39;
-    border-color: #2b2e39; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #363a47;
-      border-color: #363a47; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8b98b0;
-      background-color: #8b98b0;
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); }
 
 /************
  * Toolbars *
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 3470145..122bf64 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
@@ -857,26 +857,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
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 c93e5bd..df24f99 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -857,26 +857,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: #5294E2;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 78a2e91..0f6a4e6 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -857,26 +857,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: #5294E2;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index a03fe63..eda6e01 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -928,25 +928,31 @@ GtkComboBox {
   &.combobox-entry .entry {
     @extend %linked;
 
-    border-right-style: none;
-    &:dir(rtl) { border-left-style: none; }
+    &:dir(ltr) {
+      border-right-style: none;
+
+      &:focus { box-shadow: 1px 0 $selected_bg_color; }
+    }
+    &:dir(rtl) {
+      border-left-style: none;
+
+      &:focus { box-shadow: -1px 0 $selected_bg_color; }
+    }
   }
 
   &.combobox-entry .button {
     @extend %linked;
 
-    color: transparentize($fg_color, 0.4);
-    background-color: $button_border;
-    border-color: $button_border;
+    &:dir(ltr) {
+      box-shadow: inset  1px 0 $button_border;
 
-    &:hover {
-      background-color: lighten($button_border, 5%);
-      border-color: lighten($button_border, 5%);
+      &:insensitive { box-shadow: inset 1px 0 transparentize($button_border, 0.45); }
     }
+    &:dir(rtl) {
+      box-shadow: inset -1px 0 $button_border;
 
-    &:active, &:checked { @include button(active); }
-
-    &:insensitive { opacity: 0.5 }
+      &:insensitive { box-shadow: inset -1px 0 transparentize($button_border, 0.45); }
+    }
   }
 }
 
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 2b04430..bb75e66 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -849,24 +849,22 @@ GtkComboBox {
     color: rgba(211, 218, 227, 0.45); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(211, 218, 227, 0.6);
-    background-color: #2b2e39;
-    border-color: #2b2e39; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #363a47;
-      border-color: #363a47; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); }
 
 /************
  * Toolbars *
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 890275e..5258c4c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -849,24 +849,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
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 c4e16cb..d3e4f0e 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
@@ -849,24 +849,22 @@ GtkComboBox {
     color: rgba(211, 218, 227, 0.45); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(211, 218, 227, 0.6);
-    background-color: #2b2e39;
-    border-color: #2b2e39; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #363a47;
-      border-color: #363a47; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #2b2e39; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); }
 
 /************
  * Toolbars *
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 6a648aa..ecd99ac 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
@@ -849,24 +849,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
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 824024f..0648b7f 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -849,24 +849,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 3d8150f..9dbadcd 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -849,24 +849,22 @@ GtkComboBox {
     color: rgba(92, 97, 108, 0.55); }
   GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
-  GtkComboBox.combobox-entry .entry {
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl) {
-      border-left-style: none; }
-  GtkComboBox.combobox-entry .button {
-    color: rgba(92, 97, 108, 0.6);
-    background-color: #cfd6e6;
-    border-color: #cfd6e6; }
-    GtkComboBox.combobox-entry .button:hover {
-      background-color: #e0e4ef;
-      border-color: #e0e4ef; }
-    GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
-      background-color: #5294E2; }
-    GtkComboBox.combobox-entry .button:insensitive {
-      opacity: 0.5; }
+    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+      box-shadow: 1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-left-style: none; }
+    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+      box-shadow: -1px 0 #5294E2; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    box-shadow: inset 1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
+      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    box-shadow: inset -1px 0 #cfd6e6; }
+    GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
+      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
 
 /************
  * Toolbars *
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index c92eec6..7011eac 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -928,25 +928,31 @@ GtkComboBox {
   &.combobox-entry .entry {
     @extend %linked;
 
-    border-right-style: none;
-    &:dir(rtl) { border-left-style: none; }
+    &:dir(ltr) {
+      border-right-style: none;
+
+      &:focus { box-shadow: 1px 0 $selected_bg_color; }
+    }
+    &:dir(rtl) {
+      border-left-style: none;
+
+      &:focus { box-shadow: -1px 0 $selected_bg_color; }
+    }
   }
 
   &.combobox-entry .button {
     @extend %linked;
 
-    color: transparentize($fg_color, 0.4);
-    background-color: $button_border;
-    border-color: $button_border;
+    &:dir(ltr) {
+      box-shadow: inset  1px 0 $button_border;
 
-    &:hover {
-      background-color: lighten($button_border, 5%);
-      border-color: lighten($button_border, 5%);
+      &:insensitive { box-shadow: inset 1px 0 transparentize($button_border, 0.45); }
     }
+    &:dir(rtl) {
+      box-shadow: inset -1px 0 $button_border;
 
-    &:active, &:checked { @include button(active); }
-
-    &:insensitive { opacity: 0.5 }
+      &:insensitive { box-shadow: inset -1px 0 transparentize($button_border, 0.45); }
+    }
   }
 }