3 files changed, 10 insertions, 5 deletions
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index e55cea3..90c6063 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -932,12 +932,12 @@ GtkComboBox {
     &:dir(ltr) {
       border-right-style: none;
 
-      &:focus { box-shadow: 1px 0 $selected_bg_color; }
+      @if $variant=='light' { &:focus { box-shadow: 1px 0 $selected_bg_color; } }
     }
     &:dir(rtl) {
       border-left-style: none;
 
-      &:focus { box-shadow: -1px 0 $selected_bg_color; }
+      @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } }
     }
   }
 
diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss
index 1e54c38..2b24642 100644
--- a/common/gtk-3.0/3.16/sass/_drawing.scss
+++ b/common/gtk-3.0/3.16/sass/_drawing.scss
@@ -37,9 +37,14 @@
   // focused entry
   //
     color: $text_color;
-    border-color: $selected_bg_color;
+    border-color: if($variant=='light', $selected_bg_color, $button_border);
     background-color: $entry_bg;
     background-image: linear-gradient(to bottom, $entry_bg);
+
+    @if $variant == 'dark' {
+      box-shadow: inset 1px 1px $selected_bg_color,
+                  inset -1px -1px $selected_bg_color;
+    }
   }
 
   @if $t==insensitive {
@@ -148,7 +153,7 @@
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
 
-    border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+    border-color: if($variant=='light', $selected_bg_color, $button_border);
     background-color: $selected_bg_color;
   }
 
diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss
index 89439d2..c0b9060 100644
--- a/common/gtk-3.0/3.16/sass/_unity.scss
+++ b/common/gtk-3.0/3.16/sass/_unity.scss
@@ -47,7 +47,7 @@ UnityPanelWidget,
   color: lighten($panel_fg, 20%);
   box-shadow: none;
 
-  &:backdrop { color: darken($panel_fg, 5%); }
+  &:backdrop { color: lighten($panel_fg, 1%); }
 }
 
 .unity-panel.menubar.menuitem:hover,