button and entry drawing tweaks

21 files changed, 156 insertions, 156 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 8274504..7061cde 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -251,7 +251,7 @@ GtkFlowBox .grid-child {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -338,7 +338,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -375,7 +375,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -399,7 +399,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2129,7 +2129,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3593,7 +3593,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3968,7 +3968,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3989,7 +3989,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 941db95..074e07c 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -250,7 +250,7 @@ GtkFlowBox .grid-child {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3596,7 +3596,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 84ae28e..71f7e2a 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
@@ -251,7 +251,7 @@ GtkFlowBox .grid-child {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -338,7 +338,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -375,7 +375,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -399,7 +399,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2129,7 +2129,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3593,7 +3593,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3968,7 +3968,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3989,7 +3989,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 9391942..254d5b5 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
@@ -250,7 +250,7 @@ GtkFlowBox .grid-child {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3596,7 +3596,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 3c21de8..1f801b8 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -250,7 +250,7 @@ GtkFlowBox .grid-child {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3596,7 +3596,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 2b41590..a07d201 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -250,7 +250,7 @@ GtkFlowBox .grid-child {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2132,7 +2132,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3596,7 +3596,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3961,7 +3961,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3982,7 +3982,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss
index 6e5e43a..ab99a37 100644
--- a/common/gtk-3.0/3.14/sass/_drawing.scss
+++ b/common/gtk-3.0/3.14/sass/_drawing.scss
@@ -106,7 +106,7 @@
   // active osd entry
   //
     color: $selected_fg_color;
-    border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+    border-color: $osd_entry_border;
     background-image: linear-gradient(to bottom, $selected_bg_color);
   }
 
@@ -260,7 +260,7 @@
   //
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: $selected_bg_color;
+    border-color: $osd_button_border;
     background-color: $selected_bg_color;
   }
 
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 70202b1..a38eb96 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -251,7 +251,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -338,7 +338,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -375,7 +375,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -399,7 +399,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2187,7 +2187,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3559,7 +3559,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3911,7 +3911,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3932,7 +3932,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 dcd3fef..e57e5bf 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -250,7 +250,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3562,7 +3562,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 3e3141b..80bd21f 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
@@ -251,7 +251,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -338,7 +338,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -375,7 +375,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -399,7 +399,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2187,7 +2187,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3559,7 +3559,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3911,7 +3911,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3932,7 +3932,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 02e949b..bb0841b 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
@@ -250,7 +250,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3562,7 +3562,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
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 e49f787..ff99ac8 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -250,7 +250,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3562,7 +3562,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 232e0b1..5acf60b 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -250,7 +250,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -337,7 +337,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -374,7 +374,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -398,7 +398,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2190,7 +2190,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3562,7 +3562,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3904,7 +3904,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -3925,7 +3925,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss
index 6e5e43a..ab99a37 100644
--- a/common/gtk-3.0/3.16/sass/_drawing.scss
+++ b/common/gtk-3.0/3.16/sass/_drawing.scss
@@ -106,7 +106,7 @@
   // active osd entry
   //
     color: $selected_fg_color;
-    border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+    border-color: $osd_entry_border;
     background-image: linear-gradient(to bottom, $selected_bg_color);
   }
 
@@ -260,7 +260,7 @@
   //
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: $selected_bg_color;
+    border-color: $osd_button_border;
     background-color: $selected_bg_color;
   }
 
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index fbc31b9..f516296 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -217,7 +217,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -304,7 +304,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -341,7 +341,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -365,7 +365,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2319,7 +2319,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3762,7 +3762,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3898,7 +3898,7 @@ NautilusWindow .sidebar-button.button {
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
@@ -4116,7 +4116,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -4137,7 +4137,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 6ec1299..888b382 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -216,7 +216,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -340,7 +340,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -364,7 +364,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2322,7 +2322,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3765,7 +3765,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3891,7 +3891,7 @@ NautilusWindow .sidebar-button.button {
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
@@ -4109,7 +4109,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -4130,7 +4130,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index 005cbc8..76021a8 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -217,7 +217,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -304,7 +304,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -341,7 +341,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -365,7 +365,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2319,7 +2319,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3762,7 +3762,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3898,7 +3898,7 @@ NautilusWindow .sidebar-button.button {
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
@@ -4116,7 +4116,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -4137,7 +4137,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index b18fb0d..43402eb 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -216,7 +216,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: transparent;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -340,7 +340,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -364,7 +364,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2322,7 +2322,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3765,7 +3765,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3891,7 +3891,7 @@ NautilusWindow .sidebar-button.button {
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
@@ -4109,7 +4109,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -4130,7 +4130,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: transparent;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 37a5420..0e1914c 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -216,7 +216,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -340,7 +340,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -364,7 +364,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2326,7 +2326,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.4);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3769,7 +3769,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3895,7 +3895,7 @@ NautilusWindow .sidebar-button.button {
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
@@ -4113,7 +4113,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-color: #5294E2; }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -4134,7 +4134,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.4);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 6e5b03d..1feae06 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -216,7 +216,7 @@ GtkTextView {
       color: inherit; }
     .osd .entry:focus {
       color: #ffffff;
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-image: linear-gradient(to bottom, #5294E2); }
     .osd .entry:insensitive {
       color: rgba(186, 195, 207, 0.55);
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .button.osd:insensitive {
       color: #5d626e;
@@ -340,7 +340,7 @@ GtkSearchEntry.entry {
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .osd .button:insensitive {
       color: #5d626e;
@@ -364,7 +364,7 @@ GtkSearchEntry.entry {
       .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
+        border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
@@ -2326,7 +2326,7 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5294E2;
+      border-color: rgba(26, 28, 34, 0.35);
       background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
@@ -3769,7 +3769,7 @@ GtkListBox .h4 {
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
     color: #5d626e;
@@ -3895,7 +3895,7 @@ NautilusWindow .sidebar-button.button {
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
@@ -4113,7 +4113,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditFileBrowserWidget .hori
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-color: #5294E2; }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditFileBrowserWidget .horizontal .button:insensitive {
@@ -4134,7 +4134,7 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
     color: #ffffff;
-    border-color: #5294E2;
+    border-color: rgba(26, 28, 34, 0.35);
     background-image: linear-gradient(to bottom, #5294E2); }
   GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss
index 6e5e43a..ab99a37 100644
--- a/common/gtk-3.0/3.18/sass/_drawing.scss
+++ b/common/gtk-3.0/3.18/sass/_drawing.scss
@@ -106,7 +106,7 @@
   // active osd entry
   //
     color: $selected_fg_color;
-    border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+    border-color: $osd_entry_border;
     background-image: linear-gradient(to bottom, $selected_bg_color);
   }
 
@@ -260,7 +260,7 @@
   //
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: $selected_bg_color;
+    border-color: $osd_button_border;
     background-color: $selected_bg_color;
   }